Messages in this thread Patch in this message | | | Date | Thu, 13 Aug 2009 12:49:53 -0700 | From | Greg KH <> | Subject | [patch 18/74] drm/i915: Hook connector to encoder during load detection (fixes tv/vga detect) |
| |
2.6.30-stable review patch. If anyone has any objections, please let us know.
------------------
From: Keith Packard <keithp@keithp.com>
(cherry picked from commit 03d6069912babc07a3da20e715dd6a5dc8f0f867)
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> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- drivers/gpu/drm/i915/intel_display.c | 2 ++ 1 file changed, 2 insertions(+)
--- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -1590,6 +1590,7 @@ struct drm_crtc *intel_get_load_detect_p } encoder->crtc = crtc; + intel_output->base.encoder = encoder; intel_output->load_detect_temp = true; intel_crtc = to_intel_crtc(crtc); @@ -1625,6 +1626,7 @@ void intel_release_load_detect_pipe(stru 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);
| |