Commit 7e6e5519 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915: pass dev_priv explicitly to HSW_TVIDEO_DIP_AVI_DATA 



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

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


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

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

+1 −1
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ hsw_dip_data_reg(struct drm_i915_private *dev_priv, 
	case DP_SDP_PPS:

		return ICL_VIDEO_DIP_PPS_DATA(cpu_transcoder, i);

	case HDMI_INFOFRAME_TYPE_AVI:

		return HSW_TVIDEO_DIP_AVI_DATA(cpu_transcoder, i);

		return HSW_TVIDEO_DIP_AVI_DATA(dev_priv, cpu_transcoder, i);

	case HDMI_INFOFRAME_TYPE_SPD:

		return HSW_TVIDEO_DIP_SPD_DATA(cpu_transcoder, i);

	case HDMI_INFOFRAME_TYPE_VENDOR:

drivers/gpu/drm/i915/i915_reg.h

+1 −1
Original line number Diff line number Diff line
@@ -3477,7 +3477,7 @@ 


#define HSW_TVIDEO_DIP_CTL(dev_priv, trans)		_MMIO_TRANS2(dev_priv, trans, _HSW_VIDEO_DIP_CTL_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_AVI_DATA(dev_priv, 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)

#define HSW_TVIDEO_DIP_GMP_DATA(trans, i)	_MMIO_TRANS2(dev_priv, trans, _HSW_VIDEO_DIP_GMP_DATA_A + (i) * 4)