Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d4b74bf0 authored by Dave Airlie's avatar Dave Airlie
Browse files

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 fb8b5a39.

Acked-by: default avatarEric Anholt <eric@anholt.net>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 7547a917

drivers/gpu/drm/i915/intel_tv.c

+0 −9
Original line number Diff line number Diff line
@@ -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);