aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaulo Zanoni <paulo.r.zanoni@intel.com>2013-01-25 13:59:13 -0500
committerDaniel Vetter <daniel.vetter@ffwll.ch>2013-01-26 11:56:16 -0500
commit56e5a3f043f0440cc0cce288e71134d1cb1b44a7 (patch)
treef42444320e08163a2ac70e2fd62f71c6af229d94
parentfa42e23c1055a4549c433ac56ff869e441c973c8 (diff)
drm/i915: only disable enabled planes on intel_fb_restore_mode
We should avoid touching registers that are on the power down well when we don't need to, because if we touch these registers when the power well is disabled we'll get tons of "unclaimed register" messages. This commit fixes some of these messages. Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r--drivers/gpu/drm/i915/intel_fb.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_fb.c b/drivers/gpu/drm/i915/intel_fb.c
index ce5f54498426..6591029ac0d7 100644
--- a/drivers/gpu/drm/i915/intel_fb.c
+++ b/drivers/gpu/drm/i915/intel_fb.c
@@ -304,7 +304,8 @@ void intel_fb_restore_mode(struct drm_device *dev)
304 304
305 /* Be sure to shut off any planes that may be active */ 305 /* Be sure to shut off any planes that may be active */
306 list_for_each_entry(plane, &config->plane_list, head) 306 list_for_each_entry(plane, &config->plane_list, head)
307 plane->funcs->disable_plane(plane); 307 if (plane->enabled)
308 plane->funcs->disable_plane(plane);
308 309
309 mutex_unlock(&dev->mode_config.mutex); 310 mutex_unlock(&dev->mode_config.mutex);
310} 311}