Commit 6b844685 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/dsi: fix DSS CTL register offsets for TGL+ 

On TGL+ the DSS control registers are at different offsets, and there's
one per pipe. Fix the offsets to fix dual link DSI for TGL+.

There would be helpers for this in the DSC code, but just do the quick
fix now for DSI. Long term, we should probably move all the DSS handling
into intel_vdsc.c, so exporting the helpers seems counter-productive.

Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/8232


Cc: Ville Syrjala <ville.syrjala@linux.intel.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230301151409.1581574-1-jani.nikula@intel.com
(cherry picked from commit 1a62dd98)
parent 09a9639e

drivers/gpu/drm/i915/display/icl_dsi.c

+16 −4
Original line number Diff line number Diff line
@@ -300,9 +300,21 @@ static void configure_dual_link_mode(struct intel_encoder *encoder, 
{

	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);

	struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder);

	i915_reg_t dss_ctl1_reg, dss_ctl2_reg;

	u32 dss_ctl1;



	dss_ctl1 = intel_de_read(dev_priv, DSS_CTL1);

	/* FIXME: Move all DSS handling to intel_vdsc.c */

	if (DISPLAY_VER(dev_priv) >= 12) {

		struct intel_crtc *crtc = to_intel_crtc(pipe_config->uapi.crtc);



		dss_ctl1_reg = ICL_PIPE_DSS_CTL1(crtc->pipe);

		dss_ctl2_reg = ICL_PIPE_DSS_CTL2(crtc->pipe);

	} else {

		dss_ctl1_reg = DSS_CTL1;

		dss_ctl2_reg = DSS_CTL2;

	}



	dss_ctl1 = intel_de_read(dev_priv, dss_ctl1_reg);

	dss_ctl1 |= SPLITTER_ENABLE;

	dss_ctl1 &= ~OVERLAP_PIXELS_MASK;

	dss_ctl1 |= OVERLAP_PIXELS(intel_dsi->pixel_overlap);
@@ -323,16 +335,16 @@ static void configure_dual_link_mode(struct intel_encoder *encoder, 


		dss_ctl1 &= ~LEFT_DL_BUF_TARGET_DEPTH_MASK;

		dss_ctl1 |= LEFT_DL_BUF_TARGET_DEPTH(dl_buffer_depth);

		dss_ctl2 = intel_de_read(dev_priv, DSS_CTL2);

		dss_ctl2 = intel_de_read(dev_priv, dss_ctl2_reg);

		dss_ctl2 &= ~RIGHT_DL_BUF_TARGET_DEPTH_MASK;

		dss_ctl2 |= RIGHT_DL_BUF_TARGET_DEPTH(dl_buffer_depth);

		intel_de_write(dev_priv, DSS_CTL2, dss_ctl2);

		intel_de_write(dev_priv, dss_ctl2_reg, dss_ctl2);

	} else {

		/* Interleave */

		dss_ctl1 |= DUAL_LINK_MODE_INTERLEAVE;

	}



	intel_de_write(dev_priv, DSS_CTL1, dss_ctl1);

	intel_de_write(dev_priv, dss_ctl1_reg, dss_ctl1);

}



/* aka DSI 8X clock */