summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/i915
diff options
context:
space:
mode:
authorMaarten Lankhorst <maarten.lankhorst@linux.intel.com>2015-06-12 12:15:41 +0300
committerJani Nikula <jani.nikula@intel.com>2015-06-12 15:10:59 +0300
commitb8b7fadec3c797d7babb3c7fec484971e1604978 (patch)
tree825c65eded1b3413cddb160442f0b5d49fbbc414 /drivers/gpu/drm/i915
parent02e0efb5b40b42f06668ba38f39654c57feaacdb (diff)
downloadlinux-b8b7fadec3c797d7babb3c7fec484971e1604978.tar.xz
drm/i915: Set hwmode during readout.
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>
Diffstat (limited to 'drivers/gpu/drm/i915')
-rw-r--r--drivers/gpu/drm/i915/intel_display.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index cdf6549c8e74..14ccf49b9067 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -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);