drm/i915: pass dev_priv explicitly to PIPE_DATA_M2

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

Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1fda9b8cd446727845089844a1c8eeb5c8ae7b5a.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 5eb4ad261c215ca27cb3c488ba47317bd5be3914..c2a2061a467ddaed97f314a951475d7cfd279dcf 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -2660,7 +2660,8 @@ void intel_cpu_transcoder_set_m2_n2(struct intel_crtc *crtc,
                return;
 
        intel_set_m_n(dev_priv, m_n,
-                     PIPE_DATA_M2(transcoder), PIPE_DATA_N2(transcoder),
+                     PIPE_DATA_M2(dev_priv, transcoder),
+                     PIPE_DATA_N2(transcoder),
                      PIPE_LINK_M2(transcoder), PIPE_LINK_N2(transcoder));
 }
 
@@ -3357,7 +3358,8 @@ void intel_cpu_transcoder_get_m2_n2(struct intel_crtc *crtc,
                return;
 
        intel_get_m_n(dev_priv, m_n,
-                     PIPE_DATA_M2(transcoder), PIPE_DATA_N2(transcoder),
+                     PIPE_DATA_M2(dev_priv, transcoder),
+                     PIPE_DATA_N2(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 762b2e43051cea23868341762f0a3154a82ae90a..5e3e709d8f1a65cd5dd9eff5a8fe853fac78bc09 100644 (file)
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -2300,7 +2300,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(tran) _MMIO_TRANS2(dev_priv, tran, _PIPEA_DATA_M2)
+#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_LINK_M1(tran) _MMIO_TRANS2(dev_priv, tran, _PIPEA_LINK_M1)
 #define PIPE_LINK_N1(tran) _MMIO_TRANS2(dev_priv, tran, _PIPEA_LINK_N1)

diff --git a/drivers/gpu/drm/i915/intel_gvt_mmio_table.c b/drivers/gpu/drm/i915/intel_gvt_mmio_table.c
index b9ad4eec474040bfd9ca3251b9913241a6b79c6b..4199106f720236a0bab4f925fe8d4532c5e2c548 100644 (file)
--- a/drivers/gpu/drm/i915/intel_gvt_mmio_table.c
+++ b/drivers/gpu/drm/i915/intel_gvt_mmio_table.c
@@ -268,7 +268,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)
        MMIO_D(TRANS_VSYNCSHIFT(dev_priv, TRANSCODER_EDP));
        MMIO_D(PIPE_DATA_M1(dev_priv, TRANSCODER_A));
        MMIO_D(PIPE_DATA_N1(dev_priv, TRANSCODER_A));
-       MMIO_D(PIPE_DATA_M2(TRANSCODER_A));
+       MMIO_D(PIPE_DATA_M2(dev_priv, TRANSCODER_A));
        MMIO_D(PIPE_DATA_N2(TRANSCODER_A));
        MMIO_D(PIPE_LINK_M1(TRANSCODER_A));
        MMIO_D(PIPE_LINK_N1(TRANSCODER_A));
@@ -276,7 +276,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)
        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));
-       MMIO_D(PIPE_DATA_M2(TRANSCODER_B));
+       MMIO_D(PIPE_DATA_M2(dev_priv, TRANSCODER_B));
        MMIO_D(PIPE_DATA_N2(TRANSCODER_B));
        MMIO_D(PIPE_LINK_M1(TRANSCODER_B));
        MMIO_D(PIPE_LINK_N1(TRANSCODER_B));
@@ -284,7 +284,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)
        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));
-       MMIO_D(PIPE_DATA_M2(TRANSCODER_C));
+       MMIO_D(PIPE_DATA_M2(dev_priv, TRANSCODER_C));
        MMIO_D(PIPE_DATA_N2(TRANSCODER_C));
        MMIO_D(PIPE_LINK_M1(TRANSCODER_C));
        MMIO_D(PIPE_LINK_N1(TRANSCODER_C));
@@ -292,7 +292,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)
        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));
-       MMIO_D(PIPE_DATA_M2(TRANSCODER_EDP));
+       MMIO_D(PIPE_DATA_M2(dev_priv, TRANSCODER_EDP));
        MMIO_D(PIPE_DATA_N2(TRANSCODER_EDP));
        MMIO_D(PIPE_LINK_M1(TRANSCODER_EDP));
        MMIO_D(PIPE_LINK_N1(TRANSCODER_EDP));