[patch 022/100] drm/i915: fix TV mode setting in property change

Chris Wright
2009-04-23T07:34:37Z

[-- Attachment #1: drm-i915-fix-tv-mode-setting-in-property-change.patch --]
[-- Type: text/plain, Size: 1359 bytes --]

-stable review patch. If anyone has any objections, please let us know.
---------------------

From: Zhenyu Wang <zhenyu.z.wang@intel.com>

upstream commit: 7d6ff7851c23740c3813bdf457be638381774b69

Only set TV DAC in property change seems doesn't work, we have to
setup whole crtc pipe which assigned to TV alone.

Signed-off-by: Zhenyu Wang <zhenyu.z.wang@intel.com>
[anholt: Note that this should also fix the oops at startup with new 2D]
Signed-off-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
---
drivers/gpu/drm/i915/intel_tv.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)

--- a/drivers/gpu/drm/i915/intel_tv.c
+++ b/drivers/gpu/drm/i915/intel_tv.c
@@ -1558,6 +1558,8 @@ intel_tv_set_property(struct drm_connect
struct drm_device *dev = connector->dev;
struct intel_output *intel_output = to_intel_output(connector);
struct intel_tv_priv *tv_priv = intel_output->dev_priv;
+ struct drm_encoder *encoder = &intel_output->enc;
+ struct drm_crtc *crtc = encoder->crtc;
int ret = 0;
bool changed = false;

@@ -1596,8 +1598,9 @@ intel_tv_set_property(struct drm_connect
goto out;
}

- if (changed)
- intel_tv_mode_set(&intel_output->enc, NULL, NULL);
+ if (changed && crtc)
+ drm_crtc_helper_set_mode(crtc, &crtc->mode, crtc->x,
+ crtc->y, crtc->fb);
out:
return ret;
}