From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sat, 27 Nov 2010 17:38:29 +0000 (+0000)
Subject: drm/i915: Release fenced GTT mapping on suspend
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=7d2cb39c332146b0906651a8567f8b81af4b1584;p=deliverable%2Flinux.git

drm/i915: Release fenced GTT mapping on suspend

... so that upon first use after resume we will reacquire the fence reg.

Reported-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index a090acdf3bd5..eae52de75a4c 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -1794,8 +1794,15 @@ static void i915_gem_reset_fences(struct drm_device *dev)
 
 	for (i = 0; i < 16; i++) {
 		struct drm_i915_fence_reg *reg = &dev_priv->fence_regs[i];
-		if (reg->obj)
-			i915_gem_clear_fence_reg(reg->obj);
+		struct drm_i915_gem_object *obj = reg->obj;
+
+		if (!obj)
+			continue;
+
+		if (obj->tiling_mode)
+			i915_gem_release_mmap(obj);
+
+		i915_gem_clear_fence_reg(obj);
 	}
 }