summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVille Syrjälä <ville.syrjala@linux.intel.com>2013-10-09 17:24:57 +0300
committerDaniel Vetter <daniel.vetter@ffwll.ch>2013-10-10 12:47:13 +0200
commite5b611fd4493d09eb5164f5244ac0a5325346895 (patch)
treeed58889cf92472d593c6ed91993ab885ec71456e
parent4a28ae58c0abad2d45a45db21e86c7166b2b4462 (diff)
downloadop-kernel-dev-e5b611fd4493d09eb5164f5244ac0a5325346895.zip
op-kernel-dev-e5b611fd4493d09eb5164f5244ac0a5325346895.tar.gz
drm/i915: Populate primary_disabled in intel_modeset_readout_hw_state()
Make sure our primary_disabled matches our expectations after driver init. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=70270 Tested-by: Paulo Zanoni <paulo.r.zanoni@intel.com> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Tested-by: shui yangwei <yangweix.shui@intel.com> Reviewed-by: Jani Nikula <jani.nikula@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-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 f5126b8..b54a4cf 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -10706,6 +10706,7 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev)
&crtc->config);
crtc->base.enabled = crtc->active;
+ crtc->primary_disabled = !crtc->active;
DRM_DEBUG_KMS("[CRTC:%d] hw state readout: %s\n",
crtc->base.base.id,
OpenPOWER on IntegriCloud