diff options
| author | ling.ma@intel.com <ling.ma@intel.com> | 2009-06-22 10:08:35 -0400 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2009-06-22 23:27:47 -0400 |
| commit | 8ed9a5bc9c9425ef93a1b03b418300a5e18b2361 (patch) | |
| tree | 9e37fe1bbae0b60654a4b0f77d76c5f145aa9718 /drivers/gpu | |
| parent | 921809a5831821eaf86e799c4b3d7c666ee352b1 (diff) | |
drm/i915: set TV detection mode when tv is already connected
We used load_detect_temp flag to determine whether to set tv to the test
mode. However if the TV already has a mode set, we still need to set the
test mode to determine connection. This results in blinking, but there is
no other reliable way to determine TV connection.
freedesktop.org bug #22035
Signed-off-by: Ma Ling <ling.ma@intel.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_tv.c | 53 |
1 files changed, 25 insertions, 28 deletions
diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c index ea68992e4416..a43c98e3f077 100644 --- a/drivers/gpu/drm/i915/intel_tv.c +++ b/drivers/gpu/drm/i915/intel_tv.c | |||
| @@ -1383,34 +1383,31 @@ intel_tv_detect_type (struct drm_crtc *crtc, struct intel_output *intel_output) | |||
| 1383 | /* | 1383 | /* |
| 1384 | * Detect TV by polling) | 1384 | * Detect TV by polling) |
| 1385 | */ | 1385 | */ |
| 1386 | if (intel_output->load_detect_temp) { | 1386 | save_tv_dac = tv_dac; |
| 1387 | /* TV not currently running, prod it with destructive detect */ | 1387 | tv_ctl = I915_READ(TV_CTL); |
| 1388 | save_tv_dac = tv_dac; | 1388 | save_tv_ctl = tv_ctl; |
| 1389 | tv_ctl = I915_READ(TV_CTL); | 1389 | tv_ctl &= ~TV_ENC_ENABLE; |
| 1390 | save_tv_ctl = tv_ctl; | 1390 | tv_ctl &= ~TV_TEST_MODE_MASK; |
| 1391 | tv_ctl &= ~TV_ENC_ENABLE; | 1391 | tv_ctl |= TV_TEST_MODE_MONITOR_DETECT; |
| 1392 | tv_ctl &= ~TV_TEST_MODE_MASK; | 1392 | tv_dac &= ~TVDAC_SENSE_MASK; |
| 1393 | tv_ctl |= TV_TEST_MODE_MONITOR_DETECT; | 1393 | tv_dac &= ~DAC_A_MASK; |
| 1394 | tv_dac &= ~TVDAC_SENSE_MASK; | 1394 | tv_dac &= ~DAC_B_MASK; |
| 1395 | tv_dac &= ~DAC_A_MASK; | 1395 | tv_dac &= ~DAC_C_MASK; |
| 1396 | tv_dac &= ~DAC_B_MASK; | 1396 | tv_dac |= (TVDAC_STATE_CHG_EN | |
| 1397 | tv_dac &= ~DAC_C_MASK; | 1397 | TVDAC_A_SENSE_CTL | |
| 1398 | tv_dac |= (TVDAC_STATE_CHG_EN | | 1398 | TVDAC_B_SENSE_CTL | |
| 1399 | TVDAC_A_SENSE_CTL | | 1399 | TVDAC_C_SENSE_CTL | |
| 1400 | TVDAC_B_SENSE_CTL | | 1400 | DAC_CTL_OVERRIDE | |
| 1401 | TVDAC_C_SENSE_CTL | | 1401 | DAC_A_0_7_V | |
| 1402 | DAC_CTL_OVERRIDE | | 1402 | DAC_B_0_7_V | |
| 1403 | DAC_A_0_7_V | | 1403 | DAC_C_0_7_V); |
| 1404 | DAC_B_0_7_V | | 1404 | I915_WRITE(TV_CTL, tv_ctl); |
| 1405 | DAC_C_0_7_V); | 1405 | I915_WRITE(TV_DAC, tv_dac); |
| 1406 | I915_WRITE(TV_CTL, tv_ctl); | 1406 | intel_wait_for_vblank(dev); |
| 1407 | I915_WRITE(TV_DAC, tv_dac); | 1407 | tv_dac = I915_READ(TV_DAC); |
| 1408 | intel_wait_for_vblank(dev); | 1408 | I915_WRITE(TV_DAC, save_tv_dac); |
| 1409 | tv_dac = I915_READ(TV_DAC); | 1409 | I915_WRITE(TV_CTL, save_tv_ctl); |
| 1410 | I915_WRITE(TV_DAC, save_tv_dac); | 1410 | intel_wait_for_vblank(dev); |
| 1411 | I915_WRITE(TV_CTL, save_tv_ctl); | ||
| 1412 | intel_wait_for_vblank(dev); | ||
| 1413 | } | ||
| 1414 | /* | 1411 | /* |
| 1415 | * A B C | 1412 | * A B C |
| 1416 | * 0 1 1 Composite | 1413 | * 0 1 1 Composite |