drm/i915: Undo gtt scratch pte unmapping again
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 26 Mar 2014 19:10:09 +0000 (20:10 +0100)
committerDave Airlie <airlied@redhat.com>
Fri, 28 Mar 2014 02:33:50 +0000 (12:33 +1000)
commit8ee661b505613ef2747b350ca2871a31b3781bee
treeb000442236a2a6316911ae095a9ca3ae785793e9
parentc53c6beddc0ebb6feb5d64488c2c0cd23dd7f43d
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>
Signed-off-by: Dave Airlie <airlied@redhat.com>
drivers/gpu/drm/i915/i915_gem_gtt.c