Attachment 26824 Details for Bug 22035 – please try the patch in KMS mode, thanks

please try the patch in KMS mode, thanks

0005-tv_detection.patch (text/plain), 2.53 KB, created by MaLing on 2009-06-15 22:39:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: MaLing

Created: 2009-06-15 22:39:10 UTC

Size: 2.53 KB

patch

obsolete

>Subject: [PATCH] drm/i915: set TV detection mode when tv is connected.
>
>We use load_detect_temp flag to determin whether to
>set tv as test mode, it works fine at first time.
>However if currently TV is connected, when we check
>current status again, load_detect_temp will be set false,
>and flowing detection will bypass test-mode process,
>, so detection will shows disconnected incorrectly.
>
>It fixed freedesktop.org bug #22035
>
>Signed-off-by: Ma Ling <ling.ma@intel.com>
>---
> drivers/gpu/drm/i915/intel_tv.c |   55 +++++++++++++++++++--------------------
> 1 files changed, 27 insertions(+), 28 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c
>index c7d9ef0..40e9648 100644
>--- a/drivers/gpu/drm/i915/intel_tv.c
>+++ b/drivers/gpu/drm/i915/intel_tv.c
>@@ -1383,34 +1383,33 @@ intel_tv_detect_type (struct drm_crtc *crtc, struct intel_output *intel_output)
> 	/*
> 	 * Detect TV by polling)
> 	 */
>-	if (intel_output->load_detect_temp) {
>-		/* TV not currently running, prod it with destructive detect */
>-		save_tv_dac = tv_dac;
>-		tv_ctl = I915_READ(TV_CTL);
>-		save_tv_ctl = tv_ctl;
>-		tv_ctl &= ~TV_ENC_ENABLE;
>-		tv_ctl &= ~TV_TEST_MODE_MASK;
>-		tv_ctl |= TV_TEST_MODE_MONITOR_DETECT;
>-		tv_dac &= ~TVDAC_SENSE_MASK;
>-		tv_dac &= ~DAC_A_MASK;
>-		tv_dac &= ~DAC_B_MASK;
>-		tv_dac &= ~DAC_C_MASK;
>-		tv_dac |= (TVDAC_STATE_CHG_EN |
>-			   TVDAC_A_SENSE_CTL |
>-			   TVDAC_B_SENSE_CTL |
>-			   TVDAC_C_SENSE_CTL |
>-			   DAC_CTL_OVERRIDE |
>-			   DAC_A_0_7_V |
>-			   DAC_B_0_7_V |
>-			   DAC_C_0_7_V);
>-		I915_WRITE(TV_CTL, tv_ctl);
>-		I915_WRITE(TV_DAC, tv_dac);
>-		intel_wait_for_vblank(dev);
>-		tv_dac = I915_READ(TV_DAC);
>-		I915_WRITE(TV_DAC, save_tv_dac);
>-		I915_WRITE(TV_CTL, save_tv_ctl);
>-		intel_wait_for_vblank(dev);
>-	}
>+	/* TV not currently running, prod it with destructive detect */
>+	save_tv_dac = tv_dac;
>+	tv_ctl = I915_READ(TV_CTL);
>+	save_tv_ctl = tv_ctl;
>+	tv_ctl &= ~TV_ENC_ENABLE;
>+	tv_ctl &= ~TV_TEST_MODE_MASK;
>+	tv_ctl |= TV_TEST_MODE_MONITOR_DETECT;
>+	tv_dac &= ~TVDAC_SENSE_MASK;
>+	tv_dac &= ~DAC_A_MASK;
>+	tv_dac &= ~DAC_B_MASK;
>+	tv_dac &= ~DAC_C_MASK;
>+	tv_dac |= (TVDAC_STATE_CHG_EN |
>+		   TVDAC_A_SENSE_CTL |
>+		   TVDAC_B_SENSE_CTL |
>+		   TVDAC_C_SENSE_CTL |
>+		   DAC_CTL_OVERRIDE |
>+		   DAC_A_0_7_V |
>+		   DAC_B_0_7_V |
>+		   DAC_C_0_7_V);
>+	I915_WRITE(TV_CTL, tv_ctl);
>+	I915_WRITE(TV_DAC, tv_dac);
>+	intel_wait_for_vblank(dev);
>+	tv_dac = I915_READ(TV_DAC);
>+	I915_WRITE(TV_DAC, save_tv_dac);
>+	I915_WRITE(TV_CTL, save_tv_ctl);
>+	intel_wait_for_vblank(dev);
>+
> 	/*
> 	 *  A B C
> 	 *  0 1 1 Composite
>-- 
>1.5.4.4
>

Actions: View

Attachments on bug 22035: 26578 | 26612 | 26613 | 26650 | 26690 | 26824

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.