From: Daniel Vetter Date: Fri, 20 Apr 2012 19:25:04 +0000 (+0200) Subject: drm/i915: fixup tv load-detect on enabled but not active crtc X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=38de45c5fc61a4a6b2f0b4b7c9ae9f32f058f420;p=openwrt%2Fstaging%2Fblogic.git drm/i915: fixup tv load-detect on enabled but not active crtc When fixing up the crt load detect code I've failed to notice the same problem in the tv load detect code. Again, unconditionally use the load detect pipe infrastructure, it gets things right. Reviewed-by: Chris Wilson Signed-Off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c index 67f444d632fb..2e626b861cd8 100644 --- a/drivers/gpu/drm/i915/intel_tv.c +++ b/drivers/gpu/drm/i915/intel_tv.c @@ -1251,9 +1251,7 @@ intel_tv_detect(struct drm_connector *connector, bool force) mode = reported_modes[0]; drm_mode_set_crtcinfo(&mode, 0); - if (intel_tv->base.base.crtc && intel_tv->base.base.crtc->enabled) { - type = intel_tv_detect_type(intel_tv, connector); - } else if (force) { + if (force) { struct intel_load_detect_pipe tmp; if (intel_get_load_detect_pipe(&intel_tv->base, connector,