Commit 093acd13 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915: pass dev_priv explicitly to HSW_TVIDEO_DIP_GCP 



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

Reviewed-by: default avatarChaitanya Kumar Borah <chaitanya.kumar.borah@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/36f0b90f07c7aa78e88fadb375359df39ecd0a77.1716808214.git.jani.nikula@intel.com


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

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

+2 −2
Original line number Diff line number Diff line
@@ -986,7 +986,7 @@ static bool intel_hdmi_set_gcp_infoframe(struct intel_encoder *encoder, 
		return false;



	if (HAS_DDI(dev_priv))

		reg = HSW_TVIDEO_DIP_GCP(crtc_state->cpu_transcoder);

		reg = HSW_TVIDEO_DIP_GCP(dev_priv, crtc_state->cpu_transcoder);

	else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv))

		reg = VLV_TVIDEO_DIP_GCP(crtc->pipe);

	else if (HAS_PCH_SPLIT(dev_priv))
@@ -1011,7 +1011,7 @@ void intel_hdmi_read_gcp_infoframe(struct intel_encoder *encoder, 
		return;



	if (HAS_DDI(dev_priv))

		reg = HSW_TVIDEO_DIP_GCP(crtc_state->cpu_transcoder);

		reg = HSW_TVIDEO_DIP_GCP(dev_priv, crtc_state->cpu_transcoder);

	else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv))

		reg = VLV_TVIDEO_DIP_GCP(crtc->pipe);

	else if (HAS_PCH_SPLIT(dev_priv))

drivers/gpu/drm/i915/i915_reg.h

+1 −1
Original line number Diff line number Diff line
@@ -3476,7 +3476,7 @@ 
#define _ICL_VIDEO_DIP_PPS_ECC_B	0x613D4



#define HSW_TVIDEO_DIP_CTL(dev_priv, trans)		_MMIO_TRANS2(dev_priv, trans, _HSW_VIDEO_DIP_CTL_A)

#define HSW_TVIDEO_DIP_GCP(trans)		_MMIO_TRANS2(dev_priv, trans, _HSW_VIDEO_DIP_GCP_A)

#define HSW_TVIDEO_DIP_GCP(dev_priv, trans)		_MMIO_TRANS2(dev_priv, trans, _HSW_VIDEO_DIP_GCP_A)

#define HSW_TVIDEO_DIP_AVI_DATA(trans, i)	_MMIO_TRANS2(dev_priv, trans, _HSW_VIDEO_DIP_AVI_DATA_A + (i) * 4)

#define HSW_TVIDEO_DIP_VS_DATA(trans, i)	_MMIO_TRANS2(dev_priv, trans, _HSW_VIDEO_DIP_VS_DATA_A + (i) * 4)

#define HSW_TVIDEO_DIP_SPD_DATA(trans, i)	_MMIO_TRANS2(dev_priv, trans, _HSW_VIDEO_DIP_SPD_DATA_A + (i) * 4)

drivers/gpu/drm/i915/intel_gvt_mmio_table.c

+3 −3
Original line number Diff line number Diff line
@@ -1235,9 +1235,9 @@ static int iterate_bxt_mmio(struct intel_gvt_mmio_table_iter *iter) 
	MMIO_D(BXT_DSI_PLL_ENABLE);

	MMIO_D(GEN9_CLKGATE_DIS_0);

	MMIO_D(GEN9_CLKGATE_DIS_4);

	MMIO_D(HSW_TVIDEO_DIP_GCP(TRANSCODER_A));

	MMIO_D(HSW_TVIDEO_DIP_GCP(TRANSCODER_B));

	MMIO_D(HSW_TVIDEO_DIP_GCP(TRANSCODER_C));

	MMIO_D(HSW_TVIDEO_DIP_GCP(dev_priv, TRANSCODER_A));

	MMIO_D(HSW_TVIDEO_DIP_GCP(dev_priv, TRANSCODER_B));

	MMIO_D(HSW_TVIDEO_DIP_GCP(dev_priv, TRANSCODER_C));

	MMIO_D(RC6_CTX_BASE);

	MMIO_D(GEN8_PUSHBUS_CONTROL);

	MMIO_D(GEN8_PUSHBUS_ENABLE);