diff options
author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2013-12-01 11:47:14 +0000 |
---|---|---|
committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2013-12-01 11:47:14 +0000 |
commit | 483949b471e3a9d9cb668b0f697e08635dc74ebb (patch) | |
tree | e630188fd5e7dc345d1dfc3df82f98b38eff4608 /sys/dev/pci/drm/i915/i915_trace.h | |
parent | fa811ab193cd676f4596308968456c6f42d65c25 (diff) |
Bring back the DRM_IOCTL_I915_GEM_WAIT diff now that I've figured out what
made it fail (WARN_ON() was evaluating its argument multiple times).
This time, also advertise support through I915_PARAM_HAS_WAIT_TIMEOUT.
Diffstat (limited to 'sys/dev/pci/drm/i915/i915_trace.h')
-rw-r--r-- | sys/dev/pci/drm/i915/i915_trace.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/sys/dev/pci/drm/i915/i915_trace.h b/sys/dev/pci/drm/i915/i915_trace.h index b84bf3a264c..15503b4e632 100644 --- a/sys/dev/pci/drm/i915/i915_trace.h +++ b/sys/dev/pci/drm/i915/i915_trace.h @@ -1,4 +1,4 @@ -/* $OpenBSD: i915_trace.h,v 1.8 2013/11/30 20:13:36 kettenis Exp $ */ +/* $OpenBSD: i915_trace.h,v 1.9 2013/12/01 11:47:13 kettenis Exp $ */ /* * Copyright (c) 2013 Mark Kettenis <kettenis@openbsd.org> * @@ -31,6 +31,16 @@ trace_i915_gem_request_retire(struct intel_ring_buffer *ring, u32 seqno) } static inline void +trace_i915_gem_request_wait_begin(struct intel_ring_buffer *ring, u32 seqno) +{ +} + +static inline void +trace_i915_gem_request_wait_end(struct intel_ring_buffer *ring, u32 seqno) +{ +} + +static inline void trace_i915_gem_object_change_domain(struct drm_i915_gem_object *obj, u32 old_read, u32 old_write) { |