From 7e2bafda440190a406236e1fe1a0c07fa3f001c7 Mon Sep 17 00:00:00 2001
From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Wed, 15 Feb 2012 23:50:25 +0100
Subject: [PATCH] --- yaml --- r: 306971 b: refs/heads/master c:
 777ee96f50d8c3ac4ff3dde9ad69c22779ac88cb h: refs/heads/master i:   306969:
 672e91499ab229f5ff30508346e9f5b3160a3567   306967:
 4f152b52f4dbe6644406581f53d95db0f8807a6a v: v3

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

diff --git a/[refs] b/[refs]
index 34b9e0191e5b..e6f6c9418f22 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0ebb98299357e1dbeeea470eec29241263c8f244
+refs/heads/master: 777ee96f50d8c3ac4ff3dde9ad69c22779ac88cb
diff --git a/trunk/drivers/gpu/drm/i915/i915_dma.c b/trunk/drivers/gpu/drm/i915/i915_dma.c
index 3c086d707a91..fdff0097cf2b 100644
--- a/trunk/drivers/gpu/drm/i915/i915_dma.c
+++ b/trunk/drivers/gpu/drm/i915/i915_dma.c
@@ -790,6 +790,9 @@ static int i915_getparam(struct drm_device *dev, void *data,
 	case I915_PARAM_HAS_LLC:
 		value = HAS_LLC(dev);
 		break;
+	case I915_PARAM_HAS_ALIASING_PPGTT:
+		value = dev_priv->mm.aliasing_ppgtt ? 1 : 0;
+		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 da929bb5b788..f3f82242bf1d 100644
--- a/trunk/include/drm/i915_drm.h
+++ b/trunk/include/drm/i915_drm.h
@@ -296,7 +296,8 @@ typedef struct drm_i915_irq_wait {
 #define I915_PARAM_HAS_EXEC_CONSTANTS	 14
 #define I915_PARAM_HAS_RELAXED_DELTA	 15
 #define I915_PARAM_HAS_GEN7_SOL_RESET	 16
-#define I915_PARAM_HAS_LLC     	 17
+#define I915_PARAM_HAS_LLC     	 	 17
+#define I915_PARAM_HAS_ALIASING_PPGTT	 18
 
 typedef struct drm_i915_getparam {
 	int param;