Skip to content

Commit

Permalink
drm/i915: fixup tv load-detect on enabled but not active crtc
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Daniel Vetter committed May 3, 2012
1 parent 63c6227 commit 38de45c
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions drivers/gpu/drm/i915/intel_tv.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 38de45c

Please sign in to comment.