renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-25 21:54:06 +08:00
Code

drm/i915/tv: Poll for DAC state change

Browse Source 
Instead of sleeping for an arbitrary length of time (the documentation
fails to specify how long to wait for) wait until the load detection has
changed state (or at most the 20ms as before).

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2010-09-05 00:44:20 +01:00
parent b8ed2a4f12
commit 974b93315b
1 changed files with 33 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
drivers/gpu/drm/i915/intel_tv.c
View File

@ -1234,9 +1234,7 @@ intel_tv_detect_type (struct intel_tv *intel_tv)
unsigned long irqflags; unsigned long irqflags;
u32 tv_ctl, save_tv_ctl; u32 tv_ctl, save_tv_ctl;
u32 tv_dac, save_tv_dac; u32 tv_dac, save_tv_dac;
int type = DRM_MODE_CONNECTOR_Unknown; int type;
tv_dac = I915_READ(TV_DAC);
/* Disable TV interrupts around load detect or we'll recurse */ /* Disable TV interrupts around load detect or we'll recurse */
spin_lock_irqsave(&dev_priv->user_irq_lock, irqflags); spin_lock_irqsave(&dev_priv->user_irq_lock, irqflags);
@ -1244,19 +1242,14 @@ intel_tv_detect_type (struct intel_tv *intel_tv)
PIPE_HOTPLUG_TV_INTERRUPT_ENABLE); PIPE_HOTPLUG_TV_INTERRUPT_ENABLE);
spin_unlock_irqrestore(&dev_priv->user_irq_lock, irqflags); spin_unlock_irqrestore(&dev_priv->user_irq_lock, irqflags);
/* save_tv_dac = tv_dac = I915_READ(TV_DAC);
* Detect TV by polling) save_tv_ctl = tv_ctl = I915_READ(TV_CTL);
*/
save_tv_dac = tv_dac; /* Poll for TV detection */
tv_ctl = I915_READ(TV_CTL); tv_ctl &= ~(TV_ENC_ENABLE | TV_TEST_MODE_MASK);
save_tv_ctl = tv_ctl;
tv_ctl &= ~TV_ENC_ENABLE;
tv_ctl &= ~TV_TEST_MODE_MASK;
tv_ctl |= TV_TEST_MODE_MONITOR_DETECT; tv_ctl |= TV_TEST_MODE_MONITOR_DETECT;
tv_dac &= ~TVDAC_SENSE_MASK;
tv_dac &= ~DAC_A_MASK; tv_dac &= ~(TVDAC_SENSE_MASK | DAC_A_MASK | DAC_B_MASK | DAC_C_MASK);
tv_dac &= ~DAC_B_MASK;
tv_dac &= ~DAC_C_MASK;
tv_dac |= (TVDAC_STATE_CHG_EN | tv_dac |= (TVDAC_STATE_CHG_EN |
TVDAC_A_SENSE_CTL | TVDAC_A_SENSE_CTL |
TVDAC_B_SENSE_CTL | TVDAC_B_SENSE_CTL |
@ -1265,37 +1258,37 @@ intel_tv_detect_type (struct intel_tv *intel_tv)
DAC_A_0_7_V | DAC_A_0_7_V |
DAC_B_0_7_V | DAC_B_0_7_V |
DAC_C_0_7_V); DAC_C_0_7_V);
I915_WRITE(TV_CTL, tv_ctl); I915_WRITE(TV_CTL, tv_ctl);
I915_WRITE(TV_DAC, tv_dac); I915_WRITE(TV_DAC, tv_dac);
POSTING_READ(TV_DAC); POSTING_READ(TV_DAC);
msleep(20);
tv_dac = I915_READ(TV_DAC); type = -1;
I915_WRITE(TV_DAC, save_tv_dac); if (wait_for((tv_dac = I915_READ(TV_DAC)) & TVDAC_STATE_CHG, 20) == 0) {
I915_WRITE(TV_CTL, save_tv_ctl); /*
POSTING_READ(TV_CTL); * A B C
msleep(20); * 0 1 1 Composite
* 1 0 X svideo
/* * 0 0 0 Component
* A B C */
* 0 1 1 Composite if ((tv_dac & TVDAC_SENSE_MASK) == (TVDAC_B_SENSE | TVDAC_C_SENSE)) {
* 1 0 X svideo DRM_DEBUG_KMS("Detected Composite TV connection\n");
* 0 0 0 Component type = DRM_MODE_CONNECTOR_Composite;
*/ } else if ((tv_dac & (TVDAC_A_SENSE|TVDAC_B_SENSE)) == TVDAC_A_SENSE) {
if ((tv_dac & TVDAC_SENSE_MASK) == (TVDAC_B_SENSE | TVDAC_C_SENSE)) { DRM_DEBUG_KMS("Detected S-Video TV connection\n");
DRM_DEBUG_KMS("Detected Composite TV connection\n"); type = DRM_MODE_CONNECTOR_SVIDEO;
type = DRM_MODE_CONNECTOR_Composite; } else if ((tv_dac & TVDAC_SENSE_MASK) == 0) {
} else if ((tv_dac & (TVDAC_A_SENSE|TVDAC_B_SENSE)) == TVDAC_A_SENSE) { DRM_DEBUG_KMS("Detected Component TV connection\n");
DRM_DEBUG_KMS("Detected S-Video TV connection\n"); type = DRM_MODE_CONNECTOR_Component;
type = DRM_MODE_CONNECTOR_SVIDEO; } else {
} else if ((tv_dac & TVDAC_SENSE_MASK) == 0) { DRM_DEBUG_KMS("Unrecognised TV connection: %x\n",
DRM_DEBUG_KMS("Detected Component TV connection\n"); tv_dac);
type = DRM_MODE_CONNECTOR_Component; }
} else {
DRM_DEBUG_KMS("No TV connection detected\n");
type = -1;
} }
I915_WRITE(TV_DAC, save_tv_dac & ~TVDAC_STATE_CHG_EN);
I915_WRITE(TV_CTL, save_tv_ctl);
/* Restore interrupt config */ /* Restore interrupt config */
spin_lock_irqsave(&dev_priv->user_irq_lock, irqflags); spin_lock_irqsave(&dev_priv->user_irq_lock, irqflags);
i915_enable_pipestat(dev_priv, 0, PIPE_HOTPLUG_INTERRUPT_ENABLE | i915_enable_pipestat(dev_priv, 0, PIPE_HOTPLUG_INTERRUPT_ENABLE |