Skip to content

Commit 38de45c

Browse files
committed
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 <[email protected]> Signed-Off-by: Daniel Vetter <[email protected]>
1 parent 63c6227 commit 38de45c

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

drivers/gpu/drm/i915/intel_tv.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1251,9 +1251,7 @@ intel_tv_detect(struct drm_connector *connector, bool force)
12511251
mode = reported_modes[0];
12521252
drm_mode_set_crtcinfo(&mode, 0);
12531253

1254-
if (intel_tv->base.base.crtc && intel_tv->base.base.crtc->enabled) {
1255-
type = intel_tv_detect_type(intel_tv, connector);
1256-
} else if (force) {
1254+
if (force) {
12571255
struct intel_load_detect_pipe tmp;
12581256

12591257
if (intel_get_load_detect_pipe(&intel_tv->base, connector,

0 commit comments

Comments
 (0)