---

yaml --- r: 174554 b: refs/heads/master c: c1b5dea h: refs/heads/master v: v3
git-mirror · Dec 1, 2009 · 1e4dddd · 1e4dddd
1 parent 27e7639
commit 1e4dddd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 69341a5e01897714f968b7dccb94f57137acf45f
+refs/heads/master: c1b5dea097258b3d3d570d5ccc8f4bf5accb3f29
diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c
@@ -4588,6 +4588,11 @@ void intel_modeset_cleanup(struct drm_device *dev)
 		dev_priv->display.disable_fbc(dev);
 
 	if (dev_priv->pwrctx) {
+		struct drm_i915_gem_object *obj_priv;
+
+		obj_priv = dev_priv->pwrctx->driver_private;
+		I915_WRITE(PWRCTXA, obj_priv->gtt_offset &~ PWRCTX_EN);
+		I915_READ(PWRCTXA);
 		i915_gem_object_unpin(dev_priv->pwrctx);
 		drm_gem_object_unreference(dev_priv->pwrctx);
 	}