Merge branch 'drm-intel-fixes' into drm-intel-next

Immediate merge for the conflicting introduction of HAS_COHERENT_RINGS.

Conflicts:
	drivers/gpu/drm/i915/i915_dma.c
	include/drm/i915_drm.h

1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c
index 8cf600cdac06..326ca2ef06b5 100644
--- a/drivers/char/agp/intel-gtt.c
+++ b/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;