summaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2014-03-26 20:08:20 +0100
committerDaniel Vetter <daniel.vetter@ffwll.ch>2014-03-28 18:33:13 +0100
commite568af1c626031925465a5caaab7cca1303d55c7 (patch)
treeefb5e84928ea6a5b04d54eccd730bf3656f8f27a /drivers/gpu
parent64f962e3e38bf6f40bbd2462f8380dee0369e1bf (diff)
downloadlinux-stable-e568af1c626031925465a5caaab7cca1303d55c7.tar.gz
linux-stable-e568af1c626031925465a5caaab7cca1303d55c7.tar.bz2
linux-stable-e568af1c626031925465a5caaab7cca1303d55c7.zip
drm/i915: Undo gtt scratch pte unmapping again
It apparently blows up on some machines. This functionally reverts commit 828c79087cec61eaf4c76bb32c222fbe35ac3930 Author: Ben Widawsky <benjamin.widawsky@intel.com> Date: Wed Oct 16 09:21:30 2013 -0700 drm/i915: Disable GGTT PTEs on GEN6+ suspend Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=64841 Reported-and-Tested-by: Brad Jackson <bjackson0971@gmail.com> Cc: stable@vger.kernel.org Cc: Takashi Iwai <tiwai@suse.de> Cc: Paulo Zanoni <paulo.r.zanoni@intel.com> Cc: Todd Previte <tprevite@gmail.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/i915/i915_gem_gtt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
index ee535514aa41..ae6919c8c522 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -1339,7 +1339,7 @@ void i915_gem_suspend_gtt_mappings(struct drm_device *dev)
dev_priv->gtt.base.clear_range(&dev_priv->gtt.base,
dev_priv->gtt.base.start,
dev_priv->gtt.base.total,
- false);
+ true);
}
void i915_gem_restore_gtt_mappings(struct drm_device *dev)