From: Ville Syrjälä Date: Mon, 16 Sep 2013 14:38:33 +0000 (+0300) Subject: drm/i915: Redisable VGA before the modeset on resume X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7d0bc1ea50e7b3fb1c7a52918611baba8750177d;p=linux-beck.git drm/i915: Redisable VGA before the modeset on resume The VGA plane needs to be disabled before we start doing any modeset operations on resume. This should also guarantee that the power well will be enabled when we call i915_redisable_vga() since it gets explicitly powered on during resume, and will get powered back off during the modeset operation if no longer needed. Signed-off-by: Ville Syrjälä Reviewed-by: Paulo Zanoni Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 6aaa84d56624..dd61700a40c1 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -10684,6 +10684,8 @@ void intel_modeset_setup_hw_state(struct drm_device *dev, } if (force_restore) { + i915_redisable_vga(dev); + /* * We need to use raw interfaces for restoring state to avoid * checking (bogus) intermediate states. @@ -10697,8 +10699,6 @@ void intel_modeset_setup_hw_state(struct drm_device *dev, } list_for_each_entry(plane, &dev->mode_config.plane_list, head) intel_plane_restore(plane); - - i915_redisable_vga(dev); } else { intel_modeset_update_staged_output_state(dev); }