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

Commit 8ed9a5bc authored by ling.ma@intel.com's avatar ling.ma@intel.com Committed by Eric Anholt
Browse files

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: default avatarMa Ling <ling.ma@intel.com>
Signed-off-by: default avatarEric Anholt <eric@anholt.net>
parent 921809a5

drivers/gpu/drm/i915/intel_tv.c

+25 −28
Original line number Diff line number Diff line
@@ -1383,8 +1383,6 @@ 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;
@@ -1410,7 +1408,6 @@ intel_tv_detect_type (struct drm_crtc *crtc, struct intel_output *intel_output) 
	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