diff options
author | Ben Widawsky <ben@bwidawsk.net> | 2012-06-05 18:24:25 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-06-06 06:28:40 -0400 |
commit | 172cf15d18889313bf2c3bfb81fcea08369274ef (patch) | |
tree | e1d2c75b53548db0d4cf9385dbbd2949986f9e36 | |
parent | eac1f14fd1e7243aa782ef85f2a217e0c3a709ad (diff) |
drm/i915: Add wait render timeout get param
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r-- | drivers/gpu/drm/i915/i915_dma.c | 3 | ||||
-rw-r--r-- | include/drm/i915_drm.h | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index 262a74d1f852..97a5a5857f5b 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c | |||
@@ -1006,6 +1006,9 @@ static int i915_getparam(struct drm_device *dev, void *data, | |||
1006 | case I915_PARAM_HAS_ALIASING_PPGTT: | 1006 | case I915_PARAM_HAS_ALIASING_PPGTT: |
1007 | value = dev_priv->mm.aliasing_ppgtt ? 1 : 0; | 1007 | value = dev_priv->mm.aliasing_ppgtt ? 1 : 0; |
1008 | break; | 1008 | break; |
1009 | case I915_PARAM_HAS_WAIT_TIMEOUT: | ||
1010 | value = 1; | ||
1011 | break; | ||
1009 | default: | 1012 | default: |
1010 | DRM_DEBUG_DRIVER("Unknown parameter %d\n", | 1013 | DRM_DEBUG_DRIVER("Unknown parameter %d\n", |
1011 | param->param); | 1014 | param->param); |
diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h index aae346e7f635..5c28ee1d1911 100644 --- a/include/drm/i915_drm.h +++ b/include/drm/i915_drm.h | |||
@@ -300,6 +300,7 @@ typedef struct drm_i915_irq_wait { | |||
300 | #define I915_PARAM_HAS_GEN7_SOL_RESET 16 | 300 | #define I915_PARAM_HAS_GEN7_SOL_RESET 16 |
301 | #define I915_PARAM_HAS_LLC 17 | 301 | #define I915_PARAM_HAS_LLC 17 |
302 | #define I915_PARAM_HAS_ALIASING_PPGTT 18 | 302 | #define I915_PARAM_HAS_ALIASING_PPGTT 18 |
303 | #define I915_PARAM_HAS_WAIT_TIMEOUT 19 | ||
303 | 304 | ||
304 | typedef struct drm_i915_getparam { | 305 | typedef struct drm_i915_getparam { |
305 | int param; | 306 | int param; |