Browse Source

Revert "drm/i915: Configure the TV sense state correctly on GM45 to make TV detection reliable"

Eric mentioned on irc this patch was bad, so revert it.

This reverts commit fb8b5a39b6310379d7b54c0c7113703a8eaf4a57.

Acked-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Dave Airlie 15 years ago
parent
commit
d4b74bf078
1 changed files with 0 additions and 9 deletions
  1. 0 9
      drivers/gpu/drm/i915/intel_tv.c

+ 0 - 9
drivers/gpu/drm/i915/intel_tv.c

@@ -1263,15 +1263,6 @@ intel_tv_detect_type (struct drm_crtc *crtc, struct intel_encoder *intel_encoder
 		   DAC_A_0_7_V |
 		   DAC_B_0_7_V |
 		   DAC_C_0_7_V);
-
-	/*
-	 * The TV sense state should be cleared to zero on cantiga platform. Otherwise
-	 * the TV is misdetected. This is hardware requirement.
-	 */
-	if (IS_GM45(dev))
-		tv_dac &= ~(TVDAC_STATE_CHG_EN | TVDAC_A_SENSE_CTL |
-			    TVDAC_B_SENSE_CTL | TVDAC_C_SENSE_CTL);
-
 	I915_WRITE(TV_CTL, tv_ctl);
 	I915_WRITE(TV_DAC, tv_dac);
 	intel_wait_for_vblank(dev);