From 83fbafa008b96d45fecea2ed49c19c7e817dae7e Mon Sep 17 00:00:00 2001
From: Ben Widawsky <ben@bwidawsk.net>
Date: Tue, 5 Jun 2012 15:24:25 -0700
Subject: [PATCH] --- yaml --- r: 318566 b: refs/heads/master c:
 172cf15d18889313bf2c3bfb81fcea08369274ef h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/gpu/drm/i915/i915_dma.c | 3 +++
 trunk/include/drm/i915_drm.h          | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f44699a94928..2a358833fd23 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eac1f14fd1e7243aa782ef85f2a217e0c3a709ad
+refs/heads/master: 172cf15d18889313bf2c3bfb81fcea08369274ef
diff --git a/trunk/drivers/gpu/drm/i915/i915_dma.c b/trunk/drivers/gpu/drm/i915/i915_dma.c
index 262a74d1f852..97a5a5857f5b 100644
--- a/trunk/drivers/gpu/drm/i915/i915_dma.c
+++ b/trunk/drivers/gpu/drm/i915/i915_dma.c
@@ -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);
diff --git a/trunk/include/drm/i915_drm.h b/trunk/include/drm/i915_drm.h
index aae346e7f635..5c28ee1d1911 100644
--- a/trunk/include/drm/i915_drm.h
+++ b/trunk/include/drm/i915_drm.h
@@ -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;