From b9831cf6881a6a90f989a454d2233216146d661d Mon Sep 17 00:00:00 2001 From: Zhenyu Wang Date: Tue, 24 Mar 2009 00:45:13 +0800 Subject: [PATCH] --- yaml --- r: 139843 b: refs/heads/master c: 7d6ff7851c23740c3813bdf457be638381774b69 h: refs/heads/master i: 139841: 72ea9ed0f1ec766ca997c8e42b22239da4e81d6d 139839: 1bf8253cbd0483cf20438f58bca78336dd717a06 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/intel_tv.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 909b3791043a..4bbcda51d7d1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ebcc8f2eade76946dbb5d5c545b91f8157051aa8 +refs/heads/master: 7d6ff7851c23740c3813bdf457be638381774b69 diff --git a/trunk/drivers/gpu/drm/i915/intel_tv.c b/trunk/drivers/gpu/drm/i915/intel_tv.c index 5d9ca779ce25..d2c32983242d 100644 --- a/trunk/drivers/gpu/drm/i915/intel_tv.c +++ b/trunk/drivers/gpu/drm/i915/intel_tv.c @@ -1570,6 +1570,8 @@ intel_tv_set_property(struct drm_connector *connector, struct drm_property *prop 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; @@ -1608,8 +1610,9 @@ intel_tv_set_property(struct drm_connector *connector, struct drm_property *prop 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; }