diff options
| author | Keith Packard <keithp@keithp.com> | 2009-06-06 03:19:56 +0200 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2009-06-10 00:20:55 +0200 |
| commit | 03d6069912babc07a3da20e715dd6a5dc8f0f867 (patch) | |
| tree | f12ea01a80573b4bd88a30b7da44ec1012f371be /drivers/gpu/drm/i915 | |
| parent | drm/i915: NOMEM->NOSPC (diff) | |
| download | linux-03d6069912babc07a3da20e715dd6a5dc8f0f867.tar.xz linux-03d6069912babc07a3da20e715dd6a5dc8f0f867.zip | |
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>
Diffstat (limited to 'drivers/gpu/drm/i915')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index a87eeffc2c8d..b32a51f2a91d 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -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); |