mirror of
https://github.com/torvalds/linux.git
synced 2024-11-01 17:51:43 +00:00
drm/i915: Hook connector to encoder during load detection (fixes tv/vga 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>
This commit is contained in:
parent
2939e1f533
commit
03d6069912
@ -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);
|
||||
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user