]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
drm/i915: pass dev_priv explicitly to GLK_TVIDEO_DIP_DRM_DATA
authorJani Nikula <jani.nikula@intel.com>
Mon, 27 May 2024 11:10:50 +0000 (14:10 +0300)
committerJani Nikula <jani.nikula@intel.com>
Tue, 28 May 2024 07:58:19 +0000 (10:58 +0300)
Avoid the implicit dev_priv local variable use, and pass dev_priv
explicitly to the GLK_TVIDEO_DIP_DRM_DATA register macro.

Reviewed-by: Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/bab2d0385b748c34bec262afaf491be881990033.1716808214.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/display/intel_hdmi.c
drivers/gpu/drm/i915/i915_reg.h

index f7605ff547a363d741e62e99da264109fb894f82..a26ce1e4befd3f9836328b168e270768164cc5ee 100644 (file)
@@ -179,7 +179,7 @@ hsw_dip_data_reg(struct drm_i915_private *dev_priv,
        case HDMI_INFOFRAME_TYPE_VENDOR:
                return HSW_TVIDEO_DIP_VS_DATA(dev_priv, cpu_transcoder, i);
        case HDMI_INFOFRAME_TYPE_DRM:
-               return GLK_TVIDEO_DIP_DRM_DATA(cpu_transcoder, i);
+               return GLK_TVIDEO_DIP_DRM_DATA(dev_priv, cpu_transcoder, i);
        default:
                MISSING_CASE(type);
                return INVALID_MMIO_REG;
index 1cb60a2ffa543f937e2cec07da67556dba3ac64d..4645476bb29e2ac0942f83c669ec8bad31297fa5 100644 (file)
 #define HSW_TVIDEO_DIP_SPD_DATA(dev_priv, trans, i)    _MMIO_TRANS2(dev_priv, trans, _HSW_VIDEO_DIP_SPD_DATA_A + (i) * 4)
 #define HSW_TVIDEO_DIP_GMP_DATA(dev_priv, trans, i)    _MMIO_TRANS2(dev_priv, trans, _HSW_VIDEO_DIP_GMP_DATA_A + (i) * 4)
 #define HSW_TVIDEO_DIP_VSC_DATA(dev_priv, trans, i)    _MMIO_TRANS2(dev_priv, trans, _HSW_VIDEO_DIP_VSC_DATA_A + (i) * 4)
-#define GLK_TVIDEO_DIP_DRM_DATA(trans, i)      _MMIO_TRANS2(dev_priv, trans, _GLK_VIDEO_DIP_DRM_DATA_A + (i) * 4)
+#define GLK_TVIDEO_DIP_DRM_DATA(dev_priv, trans, i)    _MMIO_TRANS2(dev_priv, trans, _GLK_VIDEO_DIP_DRM_DATA_A + (i) * 4)
 #define ICL_VIDEO_DIP_PPS_DATA(trans, i)       _MMIO_TRANS2(dev_priv, trans, _ICL_VIDEO_DIP_PPS_DATA_A + (i) * 4)
 #define ICL_VIDEO_DIP_PPS_ECC(trans, i)                _MMIO_TRANS2(dev_priv, trans, _ICL_VIDEO_DIP_PPS_ECC_A + (i) * 4)
 /*ADLP and later: */