diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-04-20 21:25:04 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-05-03 11:18:02 +0200 |
| commit | 38de45c5fc61a4a6b2f0b4b7c9ae9f32f058f420 (patch) | |
| tree | cc99dcf01064e04bec12b42d007bf0bc59baa303 /drivers/gpu/drm/i915/intel_tv.c | |
| parent | 63c62275ec484a0f6da6a600d9b44ee0279c0900 (diff) | |
| download | op-kernel-dev-38de45c5fc61a4a6b2f0b4b7c9ae9f32f058f420.zip op-kernel-dev-38de45c5fc61a4a6b2f0b4b7c9ae9f32f058f420.tar.gz | |
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 <chris@chris-wilson.co.uk>
Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_tv.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_tv.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c index 67f444d..2e626b8 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, |
