Skip to content

Commit

Permalink
drm/i915: Hook connector to encoder during load detection (fixes tv/v…
Browse files Browse the repository at this point in the history
…ga detect)

With the DRM-driven DPMS code, encoders are considered idle unless a
connector is hooked to them, so mode setting is skipped. This makes load
detection fail as none of the hardware is enabled.

Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
  • Loading branch information
Keith Packard authored and Eric Anholt committed Jun 9, 2009
1 parent 2939e1f commit 03d6069
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions drivers/gpu/drm/i915/intel_display.c
Original file line number Diff line number Diff line change
Expand Up @@ -2136,6 +2136,7 @@ struct drm_crtc *intel_get_load_detect_pipe(struct intel_output *intel_output,
}

encoder->crtc = crtc;
intel_output->base.encoder = encoder;
intel_output->load_detect_temp = true;

intel_crtc = to_intel_crtc(crtc);
Expand Down Expand Up @@ -2171,6 +2172,7 @@ void intel_release_load_detect_pipe(struct intel_output *intel_output, int dpms_

if (intel_output->load_detect_temp) {
encoder->crtc = NULL;
intel_output->base.encoder = NULL;
intel_output->load_detect_temp = false;
crtc->enabled = drm_helper_crtc_in_use(crtc);
drm_helper_disable_unused_functions(dev);
Expand Down

0 comments on commit 03d6069

Please sign in to comment.