drm/i915: pass dev_priv explicitly to PIPE_DATA_N2

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

Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/6eeb0c74d6e566f04a193b2a3f1272e58df66f20.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 c2a2061a467ddaed97f314a951475d7cfd279dcf..7bf5b255914349be8d8a69a5e683085d19c5d3ca 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -2661,7 +2661,7 @@ 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(transcoder),
+                     PIPE_DATA_N2(dev_priv, transcoder),
                      PIPE_LINK_M2(transcoder), PIPE_LINK_N2(transcoder));
 }
 
@@ -3359,7 +3359,7 @@ 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(transcoder),
+                     PIPE_DATA_N2(dev_priv, transcoder),
                      PIPE_LINK_M2(transcoder), PIPE_LINK_N2(transcoder));
 }
 

diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 5e3e709d8f1a65cd5dd9eff5a8fe853fac78bc09..87c06eadf248e12b9fed864a8740a930d89d2875 100644 (file)
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -2301,7 +2301,7 @@
 #define PIPE_DATA_M1(dev_priv, tran) _MMIO_TRANS2(dev_priv, tran, _PIPEA_DATA_M1)
 #define PIPE_DATA_N1(dev_priv, tran) _MMIO_TRANS2(dev_priv, tran, _PIPEA_DATA_N1)
 #define PIPE_DATA_M2(dev_priv, tran) _MMIO_TRANS2(dev_priv, tran, _PIPEA_DATA_M2)
-#define PIPE_DATA_N2(tran) _MMIO_TRANS2(dev_priv, tran, _PIPEA_DATA_N2)
+#define PIPE_DATA_N2(dev_priv, tran) _MMIO_TRANS2(dev_priv, tran, _PIPEA_DATA_N2)
 #define PIPE_LINK_M1(tran) _MMIO_TRANS2(dev_priv, tran, _PIPEA_LINK_M1)
 #define PIPE_LINK_N1(tran) _MMIO_TRANS2(dev_priv, tran, _PIPEA_LINK_N1)
 #define PIPE_LINK_M2(tran) _MMIO_TRANS2(dev_priv, tran, _PIPEA_LINK_M2)

diff --git a/drivers/gpu/drm/i915/intel_gvt_mmio_table.c b/drivers/gpu/drm/i915/intel_gvt_mmio_table.c
index 4199106f720236a0bab4f925fe8d4532c5e2c548..829196c665c6e52239684e2148de21c02c0584af 100644 (file)
--- a/drivers/gpu/drm/i915/intel_gvt_mmio_table.c
+++ b/drivers/gpu/drm/i915/intel_gvt_mmio_table.c
@@ -269,7 +269,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)
        MMIO_D(PIPE_DATA_M1(dev_priv, TRANSCODER_A));
        MMIO_D(PIPE_DATA_N1(dev_priv, TRANSCODER_A));
        MMIO_D(PIPE_DATA_M2(dev_priv, TRANSCODER_A));
-       MMIO_D(PIPE_DATA_N2(TRANSCODER_A));
+       MMIO_D(PIPE_DATA_N2(dev_priv, TRANSCODER_A));
        MMIO_D(PIPE_LINK_M1(TRANSCODER_A));
        MMIO_D(PIPE_LINK_N1(TRANSCODER_A));
        MMIO_D(PIPE_LINK_M2(TRANSCODER_A));
@@ -277,7 +277,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)
        MMIO_D(PIPE_DATA_M1(dev_priv, TRANSCODER_B));
        MMIO_D(PIPE_DATA_N1(dev_priv, TRANSCODER_B));
        MMIO_D(PIPE_DATA_M2(dev_priv, TRANSCODER_B));
-       MMIO_D(PIPE_DATA_N2(TRANSCODER_B));
+       MMIO_D(PIPE_DATA_N2(dev_priv, TRANSCODER_B));
        MMIO_D(PIPE_LINK_M1(TRANSCODER_B));
        MMIO_D(PIPE_LINK_N1(TRANSCODER_B));
        MMIO_D(PIPE_LINK_M2(TRANSCODER_B));
@@ -285,7 +285,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)
        MMIO_D(PIPE_DATA_M1(dev_priv, TRANSCODER_C));
        MMIO_D(PIPE_DATA_N1(dev_priv, TRANSCODER_C));
        MMIO_D(PIPE_DATA_M2(dev_priv, TRANSCODER_C));
-       MMIO_D(PIPE_DATA_N2(TRANSCODER_C));
+       MMIO_D(PIPE_DATA_N2(dev_priv, TRANSCODER_C));
        MMIO_D(PIPE_LINK_M1(TRANSCODER_C));
        MMIO_D(PIPE_LINK_N1(TRANSCODER_C));
        MMIO_D(PIPE_LINK_M2(TRANSCODER_C));
@@ -293,7 +293,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)
        MMIO_D(PIPE_DATA_M1(dev_priv, TRANSCODER_EDP));
        MMIO_D(PIPE_DATA_N1(dev_priv, TRANSCODER_EDP));
        MMIO_D(PIPE_DATA_M2(dev_priv, TRANSCODER_EDP));
-       MMIO_D(PIPE_DATA_N2(TRANSCODER_EDP));
+       MMIO_D(PIPE_DATA_N2(dev_priv, TRANSCODER_EDP));
        MMIO_D(PIPE_LINK_M1(TRANSCODER_EDP));
        MMIO_D(PIPE_LINK_N1(TRANSCODER_EDP));
        MMIO_D(PIPE_LINK_M2(TRANSCODER_EDP));