From 119f6cea654daa21e872edc0df2df30ac0dbcec9 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sun, 5 Dec 2010 10:43:39 +0000
Subject: [PATCH] --- yaml --- r: 228783 b: refs/heads/master c:
 5aa7d52aebfc11760bbc5b081ed621227bb77981 h: refs/heads/master i:   228781:
 693804c3e04048bd8d911fe08b86d0ca65a1f4fe   228779:
 176fdc0c6b98d6e19d2bcfb117c66a25c74318d2   228775:
 f4acefe163bb6a361834735dedb6a9c638bedec0   228767:
 96888c20e5bed6f2131ea0a531d3c640db27aefd v: v3

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

diff --git a/[refs] b/[refs]
index 1a7d41307573..007604dbdb65 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 382ab78c0e4866eb9a812e9ba20d0f876d9634d6
+refs/heads/master: 5aa7d52aebfc11760bbc5b081ed621227bb77981
diff --git a/trunk/drivers/char/agp/intel-gtt.c b/trunk/drivers/char/agp/intel-gtt.c
index 8cf600cdac06..326ca2ef06b5 100644
--- a/trunk/drivers/char/agp/intel-gtt.c
+++ b/trunk/drivers/char/agp/intel-gtt.c
@@ -721,8 +721,10 @@ static int intel_fake_agp_fetch_size(void)
 
 static void i830_cleanup(void)
 {
-	kunmap(intel_private.i8xx_page);
-	intel_private.i8xx_flush_page = NULL;
+	if (intel_private.i8xx_flush_page) {
+		kunmap(intel_private.i8xx_flush_page);
+		intel_private.i8xx_flush_page = NULL;
+	}
 
 	__free_page(intel_private.i8xx_page);
 	intel_private.i8xx_page = NULL;
diff --git a/trunk/drivers/gpu/drm/i915/i915_dma.c b/trunk/drivers/gpu/drm/i915/i915_dma.c
index 664300986fb4..e9fb8953c606 100644
--- a/trunk/drivers/gpu/drm/i915/i915_dma.c
+++ b/trunk/drivers/gpu/drm/i915/i915_dma.c
@@ -775,6 +775,9 @@ static int i915_getparam(struct drm_device *dev, void *data,
 	case I915_PARAM_HAS_RELAXED_FENCING:
 		value = 1;
 		break;
+	case I915_PARAM_HAS_COHERENT_RINGS:
+		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 b20dbb2d7174..a2776e2807a4 100644
--- a/trunk/include/drm/i915_drm.h
+++ b/trunk/include/drm/i915_drm.h
@@ -288,6 +288,7 @@ typedef struct drm_i915_irq_wait {
 #define I915_PARAM_HAS_BSD		 10
 #define I915_PARAM_HAS_BLT		 11
 #define I915_PARAM_HAS_RELAXED_FENCING	 12
+#define I915_PARAM_HAS_COHERENT_RINGS	 13
 
 typedef struct drm_i915_getparam {
 	int param;