drm/i915: pass dev_priv explicitly to PIPE_LINK_M2

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

Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/31337adcaca1333724600b0afe6e3880f0948d5e.1717514638.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index eef3179845649a52bcec7ad443ed430f0a67a54f..9df8e486a86edc392346df3179159ff28334fc45 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -2663,7 +2663,8 @@ void intel_cpu_transcoder_set_m2_n2(struct intel_crtc *crtc,
        intel_set_m_n(dev_priv, m_n,
                      PIPE_DATA_M2(dev_priv, transcoder),
                      PIPE_DATA_N2(dev_priv, transcoder),
-                     PIPE_LINK_M2(transcoder), PIPE_LINK_N2(transcoder));
+                     PIPE_LINK_M2(dev_priv, transcoder),
+                     PIPE_LINK_N2(transcoder));
 }
 
 static void intel_set_transcoder_timings(const struct intel_crtc_state *crtc_state)
@@ -3362,7 +3363,8 @@ void intel_cpu_transcoder_get_m2_n2(struct intel_crtc *crtc,
        intel_get_m_n(dev_priv, m_n,
                      PIPE_DATA_M2(dev_priv, transcoder),
                      PIPE_DATA_N2(dev_priv, transcoder),
-                     PIPE_LINK_M2(transcoder), PIPE_LINK_N2(transcoder));
+                     PIPE_LINK_M2(dev_priv, transcoder),
+                     PIPE_LINK_N2(transcoder));
 }
 
 static void ilk_get_pfit_config(struct intel_crtc_state *crtc_state)

diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 86ca2798fd2c67aceaafb3b6dab3403d9f3f85c3..f0e9cc998143812dbff47e4f9d73355eb4ccae1e 100644 (file)
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -2304,7 +2304,7 @@
 #define PIPE_DATA_N2(dev_priv, tran) _MMIO_TRANS2(dev_priv, tran, _PIPEA_DATA_N2)
 #define PIPE_LINK_M1(dev_priv, tran) _MMIO_TRANS2(dev_priv, tran, _PIPEA_LINK_M1)
 #define PIPE_LINK_N1(dev_priv, tran) _MMIO_TRANS2(dev_priv, tran, _PIPEA_LINK_N1)
-#define PIPE_LINK_M2(tran) _MMIO_TRANS2(dev_priv, tran, _PIPEA_LINK_M2)
+#define PIPE_LINK_M2(dev_priv, tran) _MMIO_TRANS2(dev_priv, tran, _PIPEA_LINK_M2)
 #define PIPE_LINK_N2(tran) _MMIO_TRANS2(dev_priv, tran, _PIPEA_LINK_N2)
 
 /* CPU panel fitter */

diff --git a/drivers/gpu/drm/i915/intel_gvt_mmio_table.c b/drivers/gpu/drm/i915/intel_gvt_mmio_table.c
index 00ce7147a9b6291c84cfdcbb9c427ebcc9ae3e01..d1a51ae042f112e3474b0fd250ed514521edabc3 100644 (file)
--- a/drivers/gpu/drm/i915/intel_gvt_mmio_table.c
+++ b/drivers/gpu/drm/i915/intel_gvt_mmio_table.c
@@ -272,7 +272,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)
        MMIO_D(PIPE_DATA_N2(dev_priv, TRANSCODER_A));
        MMIO_D(PIPE_LINK_M1(dev_priv, TRANSCODER_A));
        MMIO_D(PIPE_LINK_N1(dev_priv, TRANSCODER_A));
-       MMIO_D(PIPE_LINK_M2(TRANSCODER_A));
+       MMIO_D(PIPE_LINK_M2(dev_priv, TRANSCODER_A));
        MMIO_D(PIPE_LINK_N2(TRANSCODER_A));
        MMIO_D(PIPE_DATA_M1(dev_priv, TRANSCODER_B));
        MMIO_D(PIPE_DATA_N1(dev_priv, TRANSCODER_B));
@@ -280,7 +280,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)
        MMIO_D(PIPE_DATA_N2(dev_priv, TRANSCODER_B));
        MMIO_D(PIPE_LINK_M1(dev_priv, TRANSCODER_B));
        MMIO_D(PIPE_LINK_N1(dev_priv, TRANSCODER_B));
-       MMIO_D(PIPE_LINK_M2(TRANSCODER_B));
+       MMIO_D(PIPE_LINK_M2(dev_priv, TRANSCODER_B));
        MMIO_D(PIPE_LINK_N2(TRANSCODER_B));
        MMIO_D(PIPE_DATA_M1(dev_priv, TRANSCODER_C));
        MMIO_D(PIPE_DATA_N1(dev_priv, TRANSCODER_C));
@@ -288,7 +288,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)
        MMIO_D(PIPE_DATA_N2(dev_priv, TRANSCODER_C));
        MMIO_D(PIPE_LINK_M1(dev_priv, TRANSCODER_C));
        MMIO_D(PIPE_LINK_N1(dev_priv, TRANSCODER_C));
-       MMIO_D(PIPE_LINK_M2(TRANSCODER_C));
+       MMIO_D(PIPE_LINK_M2(dev_priv, TRANSCODER_C));
        MMIO_D(PIPE_LINK_N2(TRANSCODER_C));
        MMIO_D(PIPE_DATA_M1(dev_priv, TRANSCODER_EDP));
        MMIO_D(PIPE_DATA_N1(dev_priv, TRANSCODER_EDP));
@@ -296,7 +296,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)
        MMIO_D(PIPE_DATA_N2(dev_priv, TRANSCODER_EDP));
        MMIO_D(PIPE_LINK_M1(dev_priv, TRANSCODER_EDP));
        MMIO_D(PIPE_LINK_N1(dev_priv, TRANSCODER_EDP));
-       MMIO_D(PIPE_LINK_M2(TRANSCODER_EDP));
+       MMIO_D(PIPE_LINK_M2(dev_priv, TRANSCODER_EDP));
        MMIO_D(PIPE_LINK_N2(TRANSCODER_EDP));
        MMIO_D(PF_CTL(PIPE_A));
        MMIO_D(PF_WIN_SZ(PIPE_A));