drm/i915: Set hwmode during readout.
authorMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Fri, 12 Jun 2015 09:15:41 +0000 (11:15 +0200)
committerJani Nikula <jani.nikula@intel.com>
Fri, 12 Jun 2015 12:10:59 +0000 (15:10 +0300)
This was introduced after converting hw readout to atomic,
so it should have been part of the revert too.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90929
Reported-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Tested-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/intel_display.c

index cdf6549c8e748c940687344e74fed3c3fe9cb056..14ccf49b9067b37396decc175dc42db8eb1320ad 100644 (file)
@@ -15357,6 +15357,7 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev)
                crtc->base.state->enable = crtc->active;
                crtc->base.state->active = crtc->active;
                crtc->base.enabled = crtc->active;
+               crtc->base.hwmode = crtc->config->base.adjusted_mode;
 
                plane_state = to_intel_plane_state(primary->state);
                plane_state->visible = primary_get_hw_state(crtc);