From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Wed, 8 Dec 2010 14:28:54 +0000 (+0000)
Subject: drm/i915/gtt: Clear the cachelines upon resume
X-Git-Tag: v2.6.38-rc1~419^2~23^2~19
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a8e93126a6f10d0a14ba8407ec112b1b3a5e2e97;p=karo-tx-linux.git

drm/i915/gtt: Clear the cachelines upon resume

Required for my pineview system to not barf after resuming.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---

diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
index 71c2b0f3747b..86673e77d7cb 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -35,6 +35,8 @@ void i915_gem_restore_gtt_mappings(struct drm_device *dev)
 	struct drm_i915_gem_object *obj;
 
 	list_for_each_entry(obj, &dev_priv->mm.gtt_list, gtt_list) {
+		i915_gem_clflush_object(obj);
+
 		if (dev_priv->mm.gtt->needs_dmar) {
 			BUG_ON(!obj->sg_list);
 
@@ -51,7 +53,6 @@ void i915_gem_restore_gtt_mappings(struct drm_device *dev)
 					       obj->agp_type);
 	}
 
-	/* Be paranoid and flush the chipset cache. */
 	intel_gtt_chipset_flush();
 }