]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
drm/i915: Add wait render timeout get param
authorBen Widawsky <ben@bwidawsk.net>
Tue, 5 Jun 2012 22:24:25 +0000 (15:24 -0700)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 6 Jun 2012 10:28:40 +0000 (12:28 +0200)
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>
drivers/gpu/drm/i915/i915_dma.c
include/drm/i915_drm.h

index 262a74d1f852f98ee1e7357eba67e0d35b7c7179..97a5a5857f5b46d31d8602da97fd2044ba740226 100644 (file)
@@ -1006,6 +1006,9 @@ static int i915_getparam(struct drm_device *dev, void *data,
        case I915_PARAM_HAS_ALIASING_PPGTT:
                value = dev_priv->mm.aliasing_ppgtt ? 1 : 0;
                break;
+       case I915_PARAM_HAS_WAIT_TIMEOUT:
+               value = 1;
+               break;
        default:
                DRM_DEBUG_DRIVER("Unknown parameter %d\n",
                                 param->param);
index aae346e7f6359e8323f6dfe270673a3336797346..5c28ee1d19118e3398e40efa7b2f85e740bc8ba6 100644 (file)
@@ -300,6 +300,7 @@ typedef struct drm_i915_irq_wait {
 #define I915_PARAM_HAS_GEN7_SOL_RESET   16
 #define I915_PARAM_HAS_LLC                      17
 #define I915_PARAM_HAS_ALIASING_PPGTT   18
+#define I915_PARAM_HAS_WAIT_TIMEOUT     19
 
 typedef struct drm_i915_getparam {
        int param;