Commit b11bf614 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915: pass dev_priv explicitly to TGL_DP_TP_STATUS 



Avoid the implicit dev_priv local variable use, and pass dev_priv
explicitly to the TGL_DP_TP_STATUS register macro.

Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/c7aaf0e981324bfc5b3aec31f30a7b1a158ba568.1717514638.git.jani.nikula@intel.com


Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 3cd5a36d

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

+2 −1
Original line number Diff line number Diff line
@@ -2196,7 +2196,8 @@ i915_reg_t dp_tp_status_reg(struct intel_encoder *encoder, 
	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);



	if (DISPLAY_VER(dev_priv) >= 12)

		return TGL_DP_TP_STATUS(tgl_dp_tp_transcoder(crtc_state));

		return TGL_DP_TP_STATUS(dev_priv,

					tgl_dp_tp_transcoder(crtc_state));

	else

		return DP_TP_STATUS(encoder->port);

}

drivers/gpu/drm/i915/i915_reg.h

+1 −1
Original line number Diff line number Diff line
@@ -3967,7 +3967,7 @@ enum skl_power_gate { 
#define _DP_TP_STATUS_B			0x64144

#define _TGL_DP_TP_STATUS_A		0x60544

#define DP_TP_STATUS(port) _MMIO_PORT(port, _DP_TP_STATUS_A, _DP_TP_STATUS_B)

#define TGL_DP_TP_STATUS(tran) _MMIO_TRANS2(dev_priv, (tran), _TGL_DP_TP_STATUS_A)

#define TGL_DP_TP_STATUS(dev_priv, tran) _MMIO_TRANS2(dev_priv, (tran), _TGL_DP_TP_STATUS_A)

#define  DP_TP_STATUS_FEC_ENABLE_LIVE		(1 << 28)

#define  DP_TP_STATUS_IDLE_DONE			(1 << 25)

#define  DP_TP_STATUS_ACT_SENT			(1 << 24)