summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_fb.c
diff options
context:
space:
mode:
authorPaulo Zanoni2013-01-25 19:59:13 +0100
committerDaniel Vetter2013-01-26 17:56:16 +0100
commit56e5a3f043f0440cc0cce288e71134d1cb1b44a7 (patch)
treef42444320e08163a2ac70e2fd62f71c6af229d94 /drivers/gpu/drm/i915/intel_fb.c
parentdrm/i915: fix intel_init_power_wells (diff)
downloadkernel-qcow2-linux-56e5a3f043f0440cc0cce288e71134d1cb1b44a7.tar.gz
kernel-qcow2-linux-56e5a3f043f0440cc0cce288e71134d1cb1b44a7.tar.xz
kernel-qcow2-linux-56e5a3f043f0440cc0cce288e71134d1cb1b44a7.zip
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>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_fb.c')
-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)
/* Be sure to shut off any planes that may be active */
list_for_each_entry(plane, &config->plane_list, head)
- plane->funcs->disable_plane(plane);
+ if (plane->enabled)
+ plane->funcs->disable_plane(plane);
mutex_unlock(&dev->mode_config.mutex);
}