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

Commit 75770564 authored by Jesse Barnes's avatar Jesse Barnes Committed by Keith Packard
Browse files

drm/i915: use transcoder select bits on VGA and HDMI on CPT 



Required for 3 pipe functionality.

Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Tested-By: default avatarEugeni Dodonov <eugeni.dodonov@intel.com>
Reviewed-By: default avatarEugeni Dodonov <eugeni.dodonov@intel.com>
Signed-off-by: default avatarKeith Packard <keithp@keithp.com>
parent d9d444cb

drivers/gpu/drm/i915/intel_crt.c

+7 −11
Original line number Diff line number Diff line
@@ -152,17 +152,13 @@ static void intel_crt_mode_set(struct drm_encoder *encoder, 
	if (adjusted_mode->flags & DRM_MODE_FLAG_PVSYNC)

		adpa |= ADPA_VSYNC_ACTIVE_HIGH;



	if (intel_crtc->pipe == 0) {

	/* For CPT allow 3 pipe config, for others just use A or B */

	if (HAS_PCH_CPT(dev))

			adpa |= PORT_TRANS_A_SEL_CPT;

		else

		adpa |= PORT_TRANS_SEL_CPT(intel_crtc->pipe);

	else if (intel_crtc->pipe == 0)

		adpa |= ADPA_PIPE_A_SELECT;

	} else {

		if (HAS_PCH_CPT(dev))

			adpa |= PORT_TRANS_B_SEL_CPT;

	else

		adpa |= ADPA_PIPE_B_SELECT;

	}



	if (!HAS_PCH_SPLIT(dev))

		I915_WRITE(BCLRPAT(intel_crtc->pipe), 0);

drivers/gpu/drm/i915/intel_hdmi.c

+4 −6
Original line number Diff line number Diff line
@@ -252,12 +252,10 @@ static void intel_hdmi_mode_set(struct drm_encoder *encoder, 
		intel_write_eld(encoder, adjusted_mode);

	}



	if (intel_crtc->pipe == 1) {

	if (HAS_PCH_CPT(dev))

			sdvox |= PORT_TRANS_B_SEL_CPT;

		else

		sdvox |= PORT_TRANS_SEL_CPT(intel_crtc->pipe);

	else if (intel_crtc->pipe == 1)

		sdvox |= SDVO_PIPE_B_SELECT;

	}



	I915_WRITE(intel_hdmi->sdvox_reg, sdvox);

	POSTING_READ(intel_hdmi->sdvox_reg);