diff options
author | Paulo Zanoni | 2013-05-03 17:15:40 +0200 |
---|---|---|
committer | Daniel Vetter | 2013-05-10 21:56:32 +0200 |
commit | c77bf5659deb9405ef61080c148e47d2c8ee31e5 (patch) | |
tree | 149db81adc03161c5bf6c67d961f11e03745680c /drivers/gpu/drm/i915/intel_display.c | |
parent | drm/i915: check the power well on i915_pipe_enabled (diff) | |
download | kernel-qcow2-linux-c77bf5659deb9405ef61080c148e47d2c8ee31e5.tar.gz kernel-qcow2-linux-c77bf5659deb9405ef61080c148e47d2c8ee31e5.tar.xz kernel-qcow2-linux-c77bf5659deb9405ef61080c148e47d2c8ee31e5.zip |
drm/i915: only disable DDI sound if intel_crtc->eld_vld
We already have the same check on intel_enable_ddi. This patch
prevents "unclaimed register" messages when the power well is
disabled.
V2: Reset intel_crtc->eld_vld to false after the mode_set function.
V3: Add both "type != INTEL_OUTPUT_EDP" requested.
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 544d766f6ef3..d0c5ecff6948 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -3864,8 +3864,8 @@ static void intel_crtc_disable(struct drm_crtc *crtc) /* crtc should still be enabled when we disable it. */ WARN_ON(!crtc->enabled); - intel_crtc->eld_vld = false; dev_priv->display.crtc_disable(crtc); + intel_crtc->eld_vld = false; intel_crtc_update_sarea(crtc, false); dev_priv->display.off(crtc); |