drm/i915: finish the job of removing implicit dev_priv
Subsystems (4)
Re: [PATCH 47/65] drm/i915: pass dev_priv explicitly to _DSPBTILEOFF
In reply to Jani NikulaQuoted 13 lines · Jani Nikula
Avoid the implicit
dev_privlocal variable use, and passdev_privexplicitly to the_DSPBTILEOFFregister macro.Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/i915/i915_reg.h +0
-0
drivers/gpu/drm/i915/i915_reg.h line 2317
Quoted 5 lines
drivers/gpu/drm/i915/i915_reg.h +1
-1@@ -2314,7 +2314,7 @@#define _DSPBPOS (dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x7118C)#define _DSPBSIZE (dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x71190)#define _DSPBSURF (dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x7119C) -#define _DSPBTILEOFF (DISPLAY_MMIO_BASE(dev_priv) + 0x711A4) +#define _DSPBTILEOFF (dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x711A4)
ditto
Quoted 6 lines
drivers/gpu/drm/i915/i915_reg.h +0
-0#define _DSPBOFFSET (DISPLAY_MMIO_BASE(dev_priv) + 0x711A4)#define _DSPBSURFLIVE (DISPLAY_MMIO_BASE(dev_priv) + 0x711AC)Signature · 1 line
2.39.2
Re: [PATCH 49/65] drm/i915: pass dev_priv explicitly to _DSPBSURFLIVE
In reply to Jani NikulaQuoted 13 lines · Jani Nikula
Avoid the implicit
dev_privlocal variable use, and passdev_privexplicitly to the_DSPBSURFLIVEregister macro.Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/i915/i915_reg.h +0
-0
drivers/gpu/drm/i915/i915_reg.h line 2319
Quoted 5 lines
drivers/gpu/drm/i915/i915_reg.h +1
-1@@ -2316,7 +2316,7 @@#define _DSPBSURF (dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x7119C)#define _DSPBTILEOFF (dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x711A4)#define _DSPBOFFSET (dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x711A4) -#define _DSPBSURFLIVE (DISPLAY_MMIO_BASE(dev_priv) + 0x711AC) +#define _DSPBSURFLIVE (dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x711AC)
ditto
Quoted 6 lines
drivers/gpu/drm/i915/i915_reg.h +0
-0/* ICL DSI 0 and 1 */ #define _PIPEDSI0CONF 0x7b008Signature · 1 line
2.39.2
Re: [PATCH 50/65] drm/i915: pass dev_priv explicitly to PIPE_DATA_M1
In reply to Jani NikulaQuoted 2 lines · Jani Nikula
Avoid the implicit
dev_privlocal variable use, and passdev_privexplicitly to thePIPE_DATA_M1register macro.
Quoted 147 lines
Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/display/intel_display.c | 6 ++++-- drivers/gpu/drm/i915/display/intel_fdi.c | 6 +++--- drivers/gpu/drm/i915/gvt/display.c | 8 ++++---- drivers/gpu/drm/i915/i915_reg.h | 2 +- drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 8 ++++---- 5 files changed, 16 insertions(+), 14 deletions(-)drivers/gpu/drm/i915/display/intel_display.c +4
-2@@ -2641,7 +2641,8 @@ void intel_cpu_transcoder_set_m1_n1(struct intel_crtc *crtc,if (DISPLAY_VER (dev_priv) >=5 )intel_set_m_n (dev_priv, m_n, -PIPE_DATA_M1 (transcoder),PIPE_DATA_N1 (transcoder), +PIPE_DATA_M1 (dev_priv, transcoder), +PIPE_DATA_N1 (transcoder),PIPE_LINK_M1 (transcoder),PIPE_LINK_N1 (transcoder));else intel_set_m_n(dev_priv, m_n,@@ -3337,7 +3338,8 @@ void intel_cpu_transcoder_get_m1_n1(struct intel_crtc *crtc,if (DISPLAY_VER (dev_priv) >=5 )intel_get_m_n (dev_priv, m_n, -PIPE_DATA_M1 (transcoder),PIPE_DATA_N1 (transcoder), +PIPE_DATA_M1 (dev_priv, transcoder), +PIPE_DATA_N1 (transcoder),PIPE_LINK_M1 (transcoder),PIPE_LINK_N1 (transcoder));else intel_get_m_n(dev_priv, m_n,drivers/gpu/drm/i915/display/intel_fdi.c +3
-3@@ -514,7 +514,7 @@ static void ilk_fdi_link_train(struct intel_crtc *crtc,* detection works. */ intel_de_write (dev_priv,FDI_RX_TUSIZE1 (pipe), -intel_de_read (dev_priv,PIPE_DATA_M1 (pipe)) &TU_SIZE_MASK ); +intel_de_read (dev_priv,PIPE_DATA_M1 (dev_priv, pipe)) &TU_SIZE_MASK );/* FDI needs bits from pipe first */ assert_transcoder_enabled (dev_priv, crtc_state->cpu_transcoder);@@ -616,7 +616,7 @@ static void gen6_fdi_link_train(struct intel_crtc *crtc,* detection works. */ intel_de_write (dev_priv,FDI_RX_TUSIZE1 (pipe), -intel_de_read (dev_priv,PIPE_DATA_M1 (pipe)) &TU_SIZE_MASK ); +intel_de_read (dev_priv,PIPE_DATA_M1 (dev_priv, pipe)) &TU_SIZE_MASK );/* Train 1: umask FDI RX Interrupt symbol_lock and bit_lock bit for train result */ @@ -754,7 +754,7 @@ static void ivb_manual_fdi_link_train(struct intel_crtc *crtc,* detection works. */ intel_de_write (dev_priv,FDI_RX_TUSIZE1 (pipe), -intel_de_read (dev_priv,PIPE_DATA_M1 (pipe)) &TU_SIZE_MASK ); +intel_de_read (dev_priv,PIPE_DATA_M1 (dev_priv, pipe)) &TU_SIZE_MASK );/* Train 1: umask FDI RX Interrupt symbol_lock and bit_lock bit for train result */ drivers/gpu/drm/i915/gvt/display.c +4
-4@@ -261,8 +261,8 @@ static void emulate_monitor_status_change(struct intel_vgpu *vgpu)* DP link clk 1620 MHz and non-constant_n. * TODO: calculate DP link symbol clk and stream clk m/n. */ -vgpu_vreg_t (vgpu,PIPE_DATA_M1 (TRANSCODER_A )) =TU_SIZE (64 ); -vgpu_vreg_t (vgpu,PIPE_DATA_M1 (TRANSCODER_A )) |=0x5b425e ; +vgpu_vreg_t (vgpu,PIPE_DATA_M1 (dev_priv,TRANSCODER_A )) =TU_SIZE (64 ); +vgpu_vreg_t (vgpu,PIPE_DATA_M1 (dev_priv,TRANSCODER_A )) |=0x5b425e ;vgpu_vreg_t (vgpu,PIPE_DATA_N1 (TRANSCODER_A )) =0x800000 ;vgpu_vreg_t (vgpu,PIPE_LINK_M1 (TRANSCODER_A )) =0x3cd6e ;vgpu_vreg_t (vgpu,PIPE_LINK_N1 (TRANSCODER_A )) =0x80000 ;@@ -395,8 +395,8 @@ static void emulate_monitor_status_change(struct intel_vgpu *vgpu)* DP link clk 1620 MHz and non-constant_n. * TODO: calculate DP link symbol clk and stream clk m/n. */ -vgpu_vreg_t (vgpu,PIPE_DATA_M1 (TRANSCODER_A )) =TU_SIZE (64 ); -vgpu_vreg_t (vgpu,PIPE_DATA_M1 (TRANSCODER_A )) |=0x5b425e ; +vgpu_vreg_t (vgpu,PIPE_DATA_M1 (dev_priv,TRANSCODER_A )) =TU_SIZE (64 ); +vgpu_vreg_t (vgpu,PIPE_DATA_M1 (dev_priv,TRANSCODER_A )) |=0x5b425e ;vgpu_vreg_t (vgpu,PIPE_DATA_N1 (TRANSCODER_A )) =0x800000 ;vgpu_vreg_t (vgpu,PIPE_LINK_M1 (TRANSCODER_A )) =0x3cd6e ;vgpu_vreg_t (vgpu,PIPE_LINK_N1 (TRANSCODER_A )) =0x80000 ;drivers/gpu/drm/i915/i915_reg.h +1
-1@@ -2379,7 +2379,7 @@#define _PIPEB_LINK_M2 0x61048#define _PIPEB_LINK_N2 0x6104c -#define PIPE_DATA_M1 (tran) _MMIO_TRANS2(dev_priv, tran, _PIPEA_DATA_M1) +#define PIPE_DATA_M1 (dev_priv, tran) _MMIO_TRANS2(dev_priv, tran, _PIPEA_DATA_M1)#define PIPE_DATA_N1 (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_N2 (tran) _MMIO_TRANS2(dev_priv, tran, _PIPEA_DATA_N2)drivers/gpu/drm/i915/intel_gvt_mmio_table.c +4
-4@@ -266,7 +266,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (TRANS_VSYNC (dev_priv,TRANSCODER_EDP ));MMIO_D (BCLRPAT (dev_priv,TRANSCODER_EDP ));MMIO_D (TRANS_VSYNCSHIFT (dev_priv,TRANSCODER_EDP )); -MMIO_D (PIPE_DATA_M1 (TRANSCODER_A )); +MMIO_D (PIPE_DATA_M1 (dev_priv,TRANSCODER_A ));MMIO_D (PIPE_DATA_N1 (TRANSCODER_A ));MMIO_D (PIPE_DATA_M2 (TRANSCODER_A ));MMIO_D (PIPE_DATA_N2 (TRANSCODER_A ));@@ -274,7 +274,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (PIPE_LINK_N1 (TRANSCODER_A ));MMIO_D (PIPE_LINK_M2 (TRANSCODER_A ));MMIO_D (PIPE_LINK_N2 (TRANSCODER_A )); -MMIO_D (PIPE_DATA_M1 (TRANSCODER_B )); +MMIO_D (PIPE_DATA_M1 (dev_priv,TRANSCODER_B ));MMIO_D (PIPE_DATA_N1 (TRANSCODER_B ));MMIO_D (PIPE_DATA_M2 (TRANSCODER_B ));MMIO_D (PIPE_DATA_N2 (TRANSCODER_B ));@@ -282,7 +282,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (PIPE_LINK_N1 (TRANSCODER_B ));MMIO_D (PIPE_LINK_M2 (TRANSCODER_B ));MMIO_D (PIPE_LINK_N2 (TRANSCODER_B )); -MMIO_D (PIPE_DATA_M1 (TRANSCODER_C )); +MMIO_D (PIPE_DATA_M1 (dev_priv,TRANSCODER_C ));MMIO_D (PIPE_DATA_N1 (TRANSCODER_C ));MMIO_D (PIPE_DATA_M2 (TRANSCODER_C ));MMIO_D (PIPE_DATA_N2 (TRANSCODER_C ));@@ -290,7 +290,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (PIPE_LINK_N1 (TRANSCODER_C ));MMIO_D (PIPE_LINK_M2 (TRANSCODER_C ));MMIO_D (PIPE_LINK_N2 (TRANSCODER_C )); -MMIO_D (PIPE_DATA_M1 (TRANSCODER_EDP )); +MMIO_D (PIPE_DATA_M1 (dev_priv,TRANSCODER_EDP ));MMIO_D (PIPE_DATA_N1 (TRANSCODER_EDP ));MMIO_D (PIPE_DATA_M2 (TRANSCODER_EDP ));MMIO_D (PIPE_DATA_N2 (TRANSCODER_EDP ));Signature · 1 line
2.39.2
Re: [PATCH 51/65] drm/i915: pass dev_priv explicitly to PIPE_DATA_N1
In reply to Jani NikulaQuoted 2 lines · Jani Nikula
Avoid the implicit
dev_privlocal variable use, and passdev_privexplicitly to thePIPE_DATA_N1register macro.
Quoted 109 lines
Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/display/intel_display.c | 4 ++-- drivers/gpu/drm/i915/gvt/display.c | 4 ++-- drivers/gpu/drm/i915/i915_reg.h | 2 +- drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-)drivers/gpu/drm/i915/display/intel_display.c +2
-2@@ -2642,7 +2642,7 @@ void intel_cpu_transcoder_set_m1_n1(struct intel_crtc *crtc,if (DISPLAY_VER (dev_priv) >=5 )intel_set_m_n (dev_priv, m_n,PIPE_DATA_M1 (dev_priv, transcoder), -PIPE_DATA_N1 (transcoder), +PIPE_DATA_N1 (dev_priv, transcoder),PIPE_LINK_M1 (transcoder),PIPE_LINK_N1 (transcoder));else intel_set_m_n(dev_priv, m_n,@@ -3339,7 +3339,7 @@ void intel_cpu_transcoder_get_m1_n1(struct intel_crtc *crtc,if (DISPLAY_VER (dev_priv) >=5 )intel_get_m_n (dev_priv, m_n,PIPE_DATA_M1 (dev_priv, transcoder), -PIPE_DATA_N1 (transcoder), +PIPE_DATA_N1 (dev_priv, transcoder),PIPE_LINK_M1 (transcoder),PIPE_LINK_N1 (transcoder));else intel_get_m_n(dev_priv, m_n,drivers/gpu/drm/i915/gvt/display.c +2
-2@@ -263,7 +263,7 @@ static void emulate_monitor_status_change(struct intel_vgpu *vgpu)*/ vgpu_vreg_t (vgpu,PIPE_DATA_M1 (dev_priv,TRANSCODER_A )) =TU_SIZE (64 );vgpu_vreg_t (vgpu,PIPE_DATA_M1 (dev_priv,TRANSCODER_A )) |=0x5b425e ; -vgpu_vreg_t (vgpu,PIPE_DATA_N1 (TRANSCODER_A )) =0x800000 ; +vgpu_vreg_t (vgpu,PIPE_DATA_N1 (dev_priv,TRANSCODER_A )) =0x800000 ;vgpu_vreg_t (vgpu,PIPE_LINK_M1 (TRANSCODER_A )) =0x3cd6e ;vgpu_vreg_t (vgpu,PIPE_LINK_N1 (TRANSCODER_A )) =0x80000 ;@@ -397,7 +397,7 @@ static void emulate_monitor_status_change(struct intel_vgpu *vgpu)*/ vgpu_vreg_t (vgpu,PIPE_DATA_M1 (dev_priv,TRANSCODER_A )) =TU_SIZE (64 );vgpu_vreg_t (vgpu,PIPE_DATA_M1 (dev_priv,TRANSCODER_A )) |=0x5b425e ; -vgpu_vreg_t (vgpu,PIPE_DATA_N1 (TRANSCODER_A )) =0x800000 ; +vgpu_vreg_t (vgpu,PIPE_DATA_N1 (dev_priv,TRANSCODER_A )) =0x800000 ;vgpu_vreg_t (vgpu,PIPE_LINK_M1 (TRANSCODER_A )) =0x3cd6e ;vgpu_vreg_t (vgpu,PIPE_LINK_N1 (TRANSCODER_A )) =0x80000 ; }drivers/gpu/drm/i915/i915_reg.h +1
-1@@ -2380,7 +2380,7 @@#define _PIPEB_LINK_N2 0x6104c#define PIPE_DATA_M1 (dev_priv, tran) _MMIO_TRANS2(dev_priv, tran, _PIPEA_DATA_M1) -#define PIPE_DATA_N1 (tran) _MMIO_TRANS2(dev_priv, tran, _PIPEA_DATA_N1) +#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_N2 (tran) _MMIO_TRANS2(dev_priv, tran, _PIPEA_DATA_N2)#define PIPE_LINK_M1 (tran) _MMIO_TRANS2(dev_priv, tran, _PIPEA_LINK_M1)drivers/gpu/drm/i915/intel_gvt_mmio_table.c +4
-4@@ -267,7 +267,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (BCLRPAT (dev_priv,TRANSCODER_EDP ));MMIO_D (TRANS_VSYNCSHIFT (dev_priv,TRANSCODER_EDP ));MMIO_D (PIPE_DATA_M1 (dev_priv,TRANSCODER_A )); -MMIO_D (PIPE_DATA_N1 (TRANSCODER_A )); +MMIO_D (PIPE_DATA_N1 (dev_priv,TRANSCODER_A ));MMIO_D (PIPE_DATA_M2 (TRANSCODER_A ));MMIO_D (PIPE_DATA_N2 (TRANSCODER_A ));MMIO_D (PIPE_LINK_M1 (TRANSCODER_A ));@@ -275,7 +275,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (PIPE_LINK_M2 (TRANSCODER_A ));MMIO_D (PIPE_LINK_N2 (TRANSCODER_A ));MMIO_D (PIPE_DATA_M1 (dev_priv,TRANSCODER_B )); -MMIO_D (PIPE_DATA_N1 (TRANSCODER_B )); +MMIO_D (PIPE_DATA_N1 (dev_priv,TRANSCODER_B ));MMIO_D (PIPE_DATA_M2 (TRANSCODER_B ));MMIO_D (PIPE_DATA_N2 (TRANSCODER_B ));MMIO_D (PIPE_LINK_M1 (TRANSCODER_B ));@@ -283,7 +283,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (PIPE_LINK_M2 (TRANSCODER_B ));MMIO_D (PIPE_LINK_N2 (TRANSCODER_B ));MMIO_D (PIPE_DATA_M1 (dev_priv,TRANSCODER_C )); -MMIO_D (PIPE_DATA_N1 (TRANSCODER_C )); +MMIO_D (PIPE_DATA_N1 (dev_priv,TRANSCODER_C ));MMIO_D (PIPE_DATA_M2 (TRANSCODER_C ));MMIO_D (PIPE_DATA_N2 (TRANSCODER_C ));MMIO_D (PIPE_LINK_M1 (TRANSCODER_C ));@@ -291,7 +291,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (PIPE_LINK_M2 (TRANSCODER_C ));MMIO_D (PIPE_LINK_N2 (TRANSCODER_C ));MMIO_D (PIPE_DATA_M1 (dev_priv,TRANSCODER_EDP )); -MMIO_D (PIPE_DATA_N1 (TRANSCODER_EDP )); +MMIO_D (PIPE_DATA_N1 (dev_priv,TRANSCODER_EDP ));MMIO_D (PIPE_DATA_M2 (TRANSCODER_EDP ));MMIO_D (PIPE_DATA_N2 (TRANSCODER_EDP ));MMIO_D (PIPE_LINK_M1 (TRANSCODER_EDP ));Signature · 1 line
2.39.2
Re: [PATCH 52/65] drm/i915: pass dev_priv explicitly to PIPE_DATA_M2
In reply to Jani NikulaQuoted 2 lines · Jani Nikula
Avoid the implicit
dev_privlocal variable use, and passdev_privexplicitly to thePIPE_DATA_M2register macro.
Quoted 88 lines
Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/display/intel_display.c | 6 ++++-- drivers/gpu/drm/i915/i915_reg.h | 2 +- drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 8 ++++---- 3 files changed, 9 insertions(+), 7 deletions(-)drivers/gpu/drm/i915/display/intel_display.c +4
-2@@ -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)); }drivers/gpu/drm/i915/i915_reg.h +1
-1@@ -2381,7 +2381,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)drivers/gpu/drm/i915/intel_gvt_mmio_table.c +4
-4@@ -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 ));Signature · 1 line
2.39.2
Re: [PATCH 53/65] drm/i915: pass dev_priv explicitly to PIPE_DATA_N2
In reply to Jani NikulaQuoted 2 lines · Jani Nikula
Avoid the implicit
dev_privlocal variable use, and passdev_privexplicitly to thePIPE_DATA_N2register macro.
Quoted 86 lines
Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/display/intel_display.c | 4 ++-- drivers/gpu/drm/i915/i915_reg.h | 2 +- drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-)drivers/gpu/drm/i915/display/intel_display.c +2
-2@@ -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)); }drivers/gpu/drm/i915/i915_reg.h +1
-1@@ -2382,7 +2382,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)drivers/gpu/drm/i915/intel_gvt_mmio_table.c +4
-4@@ -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 ));Signature · 1 line
2.39.2
Re: [PATCH 54/65] drm/i915: pass dev_priv explicitly to PIPE_LINK_M1
In reply to Jani NikulaQuoted 2 lines · Jani Nikula
Avoid the implicit
dev_privlocal variable use, and passdev_privexplicitly to thePIPE_LINK_M1register macro.
Quoted 125 lines
Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/display/intel_display.c | 6 ++++-- drivers/gpu/drm/i915/gvt/display.c | 4 ++-- drivers/gpu/drm/i915/gvt/handlers.c | 2 +- drivers/gpu/drm/i915/i915_reg.h | 2 +- drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 8 ++++---- 5 files changed, 12 insertions(+), 10 deletions(-)drivers/gpu/drm/i915/display/intel_display.c +4
-2@@ -2643,7 +2643,8 @@ void intel_cpu_transcoder_set_m1_n1(struct intel_crtc *crtc,intel_set_m_n (dev_priv, m_n,PIPE_DATA_M1 (dev_priv, transcoder),PIPE_DATA_N1 (dev_priv, transcoder), -PIPE_LINK_M1 (transcoder),PIPE_LINK_N1 (transcoder)); +PIPE_LINK_M1 (dev_priv, transcoder), +PIPE_LINK_N1 (transcoder)); else intel_set_m_n(dev_priv, m_n, PIPE_DATA_M_G4X(pipe), PIPE_DATA_N_G4X(pipe),@@ -3341,7 +3342,8 @@ void intel_cpu_transcoder_get_m1_n1(struct intel_crtc *crtc,intel_get_m_n (dev_priv, m_n,PIPE_DATA_M1 (dev_priv, transcoder),PIPE_DATA_N1 (dev_priv, transcoder), -PIPE_LINK_M1 (transcoder),PIPE_LINK_N1 (transcoder)); +PIPE_LINK_M1 (dev_priv, transcoder), +PIPE_LINK_N1 (transcoder)); else intel_get_m_n(dev_priv, m_n, PIPE_DATA_M_G4X(pipe), PIPE_DATA_N_G4X(pipe),drivers/gpu/drm/i915/gvt/display.c +2
-2@@ -264,7 +264,7 @@ static void emulate_monitor_status_change(struct intel_vgpu *vgpu)vgpu_vreg_t (vgpu,PIPE_DATA_M1 (dev_priv,TRANSCODER_A )) =TU_SIZE (64 );vgpu_vreg_t (vgpu,PIPE_DATA_M1 (dev_priv,TRANSCODER_A )) |=0x5b425e ;vgpu_vreg_t (vgpu,PIPE_DATA_N1 (dev_priv,TRANSCODER_A )) =0x800000 ; -vgpu_vreg_t (vgpu,PIPE_LINK_M1 (TRANSCODER_A )) =0x3cd6e ; +vgpu_vreg_t (vgpu,PIPE_LINK_M1 (dev_priv,TRANSCODER_A )) =0x3cd6e ;vgpu_vreg_t (vgpu,PIPE_LINK_N1 (TRANSCODER_A )) =0x80000 ;/* Enable per-DDI/PORT vreg */ @@ -398,7 +398,7 @@ static void emulate_monitor_status_change(struct intel_vgpu *vgpu)vgpu_vreg_t (vgpu,PIPE_DATA_M1 (dev_priv,TRANSCODER_A )) =TU_SIZE (64 );vgpu_vreg_t (vgpu,PIPE_DATA_M1 (dev_priv,TRANSCODER_A )) |=0x5b425e ;vgpu_vreg_t (vgpu,PIPE_DATA_N1 (dev_priv,TRANSCODER_A )) =0x800000 ; -vgpu_vreg_t (vgpu,PIPE_LINK_M1 (TRANSCODER_A )) =0x3cd6e ; +vgpu_vreg_t (vgpu,PIPE_LINK_M1 (dev_priv,TRANSCODER_A )) =0x3cd6e ;vgpu_vreg_t (vgpu,PIPE_LINK_N1 (TRANSCODER_A )) =0x80000 ; }drivers/gpu/drm/i915/gvt/handlers.c +1
-1@@ -673,7 +673,7 @@ static void vgpu_update_refresh_rate(struct intel_vgpu *vgpu) dp_br =skl_vgpu_get_dp_bitrate (vgpu, port);/* Get DP link symbol clock M/N */ - link_m =vgpu_vreg_t (vgpu,PIPE_LINK_M1 (TRANSCODER_A )); + link_m =vgpu_vreg_t (vgpu,PIPE_LINK_M1 (dev_priv,TRANSCODER_A )); link_n =vgpu_vreg_t (vgpu,PIPE_LINK_N1 (TRANSCODER_A ));/* Get H/V total from transcoder timing */ drivers/gpu/drm/i915/i915_reg.h +1
-1@@ -2383,7 +2383,7 @@#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 (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_M1 (dev_priv, 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)#define PIPE_LINK_N2 (tran) _MMIO_TRANS2(dev_priv, tran, _PIPEA_LINK_N2)drivers/gpu/drm/i915/intel_gvt_mmio_table.c +4
-4@@ -270,7 +270,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (PIPE_DATA_N1 (dev_priv,TRANSCODER_A ));MMIO_D (PIPE_DATA_M2 (dev_priv,TRANSCODER_A ));MMIO_D (PIPE_DATA_N2 (dev_priv,TRANSCODER_A )); -MMIO_D (PIPE_LINK_M1 (TRANSCODER_A )); +MMIO_D (PIPE_LINK_M1 (dev_priv,TRANSCODER_A ));MMIO_D (PIPE_LINK_N1 (TRANSCODER_A ));MMIO_D (PIPE_LINK_M2 (TRANSCODER_A ));MMIO_D (PIPE_LINK_N2 (TRANSCODER_A ));@@ -278,7 +278,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (PIPE_DATA_N1 (dev_priv,TRANSCODER_B ));MMIO_D (PIPE_DATA_M2 (dev_priv,TRANSCODER_B ));MMIO_D (PIPE_DATA_N2 (dev_priv,TRANSCODER_B )); -MMIO_D (PIPE_LINK_M1 (TRANSCODER_B )); +MMIO_D (PIPE_LINK_M1 (dev_priv,TRANSCODER_B ));MMIO_D (PIPE_LINK_N1 (TRANSCODER_B ));MMIO_D (PIPE_LINK_M2 (TRANSCODER_B ));MMIO_D (PIPE_LINK_N2 (TRANSCODER_B ));@@ -286,7 +286,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (PIPE_DATA_N1 (dev_priv,TRANSCODER_C ));MMIO_D (PIPE_DATA_M2 (dev_priv,TRANSCODER_C ));MMIO_D (PIPE_DATA_N2 (dev_priv,TRANSCODER_C )); -MMIO_D (PIPE_LINK_M1 (TRANSCODER_C )); +MMIO_D (PIPE_LINK_M1 (dev_priv,TRANSCODER_C ));MMIO_D (PIPE_LINK_N1 (TRANSCODER_C ));MMIO_D (PIPE_LINK_M2 (TRANSCODER_C ));MMIO_D (PIPE_LINK_N2 (TRANSCODER_C ));@@ -294,7 +294,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (PIPE_DATA_N1 (dev_priv,TRANSCODER_EDP ));MMIO_D (PIPE_DATA_M2 (dev_priv,TRANSCODER_EDP ));MMIO_D (PIPE_DATA_N2 (dev_priv,TRANSCODER_EDP )); -MMIO_D (PIPE_LINK_M1 (TRANSCODER_EDP )); +MMIO_D (PIPE_LINK_M1 (dev_priv,TRANSCODER_EDP ));MMIO_D (PIPE_LINK_N1 (TRANSCODER_EDP ));MMIO_D (PIPE_LINK_M2 (TRANSCODER_EDP ));MMIO_D (PIPE_LINK_N2 (TRANSCODER_EDP ));Signature · 1 line
2.39.2
Re: [PATCH 55/65] drm/i915: pass dev_priv explicitly to PIPE_LINK_N1
In reply to Jani NikulaQuoted 2 lines · Jani Nikula
Avoid the implicit
dev_privlocal variable use, and passdev_privexplicitly to thePIPE_LINK_N1register macro.
Quoted 123 lines
Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/display/intel_display.c | 4 ++-- drivers/gpu/drm/i915/gvt/display.c | 4 ++-- drivers/gpu/drm/i915/gvt/handlers.c | 2 +- drivers/gpu/drm/i915/i915_reg.h | 2 +- drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 8 ++++---- 5 files changed, 10 insertions(+), 10 deletions(-)drivers/gpu/drm/i915/display/intel_display.c +2
-2@@ -2644,7 +2644,7 @@ void intel_cpu_transcoder_set_m1_n1(struct intel_crtc *crtc,PIPE_DATA_M1 (dev_priv, transcoder),PIPE_DATA_N1 (dev_priv, transcoder),PIPE_LINK_M1 (dev_priv, transcoder), - PIPE_LINK_N1(transcoder)); + PIPE_LINK_N1(dev_priv, transcoder)); else intel_set_m_n(dev_priv, m_n, PIPE_DATA_M_G4X(pipe), PIPE_DATA_N_G4X(pipe),@@ -3343,7 +3343,7 @@ void intel_cpu_transcoder_get_m1_n1(struct intel_crtc *crtc,PIPE_DATA_M1 (dev_priv, transcoder),PIPE_DATA_N1 (dev_priv, transcoder),PIPE_LINK_M1 (dev_priv, transcoder), - PIPE_LINK_N1(transcoder)); + PIPE_LINK_N1(dev_priv, transcoder)); else intel_get_m_n(dev_priv, m_n, PIPE_DATA_M_G4X(pipe), PIPE_DATA_N_G4X(pipe),drivers/gpu/drm/i915/gvt/display.c +2
-2@@ -265,7 +265,7 @@ static void emulate_monitor_status_change(struct intel_vgpu *vgpu)vgpu_vreg_t (vgpu,PIPE_DATA_M1 (dev_priv,TRANSCODER_A )) |=0x5b425e ;vgpu_vreg_t (vgpu,PIPE_DATA_N1 (dev_priv,TRANSCODER_A )) =0x800000 ;vgpu_vreg_t (vgpu,PIPE_LINK_M1 (dev_priv,TRANSCODER_A )) =0x3cd6e ; -vgpu_vreg_t (vgpu,PIPE_LINK_N1 (TRANSCODER_A )) =0x80000 ; +vgpu_vreg_t (vgpu,PIPE_LINK_N1 (dev_priv,TRANSCODER_A )) =0x80000 ;/* Enable per-DDI/PORT vreg */ if (intel_vgpu_has_monitor_on_port (vgpu,PORT_A )) {@@ -399,7 +399,7 @@ static void emulate_monitor_status_change(struct intel_vgpu *vgpu)vgpu_vreg_t (vgpu,PIPE_DATA_M1 (dev_priv,TRANSCODER_A )) |=0x5b425e ;vgpu_vreg_t (vgpu,PIPE_DATA_N1 (dev_priv,TRANSCODER_A )) =0x800000 ;vgpu_vreg_t (vgpu,PIPE_LINK_M1 (dev_priv,TRANSCODER_A )) =0x3cd6e ; -vgpu_vreg_t (vgpu,PIPE_LINK_N1 (TRANSCODER_A )) =0x80000 ; +vgpu_vreg_t (vgpu,PIPE_LINK_N1 (dev_priv,TRANSCODER_A )) =0x80000 ; }if (intel_vgpu_has_monitor_on_port (vgpu,PORT_B )) {drivers/gpu/drm/i915/gvt/handlers.c +1
-1@@ -674,7 +674,7 @@ static void vgpu_update_refresh_rate(struct intel_vgpu *vgpu)/* Get DP link symbol clock M/N */ link_m =vgpu_vreg_t (vgpu,PIPE_LINK_M1 (dev_priv,TRANSCODER_A )); - link_n =vgpu_vreg_t (vgpu,PIPE_LINK_N1 (TRANSCODER_A )); + link_n =vgpu_vreg_t (vgpu,PIPE_LINK_N1 (dev_priv,TRANSCODER_A ));/* Get H/V total from transcoder timing */ htotal = (vgpu_vreg_t (vgpu,TRANS_HTOTAL (dev_priv,TRANSCODER_A )) >>TRANS_HTOTAL_SHIFT );drivers/gpu/drm/i915/i915_reg.h +1
-1@@ -2384,7 +2384,7 @@#define PIPE_DATA_M2 (dev_priv, tran) _MMIO_TRANS2(dev_priv, tran, _PIPEA_DATA_M2)#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 (tran) _MMIO_TRANS2(dev_priv, tran, _PIPEA_LINK_N1) +#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_N2 (tran) _MMIO_TRANS2(dev_priv, tran, _PIPEA_LINK_N2)drivers/gpu/drm/i915/intel_gvt_mmio_table.c +4
-4@@ -271,7 +271,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (PIPE_DATA_M2 (dev_priv,TRANSCODER_A ));MMIO_D (PIPE_DATA_N2 (dev_priv,TRANSCODER_A ));MMIO_D (PIPE_LINK_M1 (dev_priv,TRANSCODER_A )); -MMIO_D (PIPE_LINK_N1 (TRANSCODER_A )); +MMIO_D (PIPE_LINK_N1 (dev_priv,TRANSCODER_A ));MMIO_D (PIPE_LINK_M2 (TRANSCODER_A ));MMIO_D (PIPE_LINK_N2 (TRANSCODER_A ));MMIO_D (PIPE_DATA_M1 (dev_priv,TRANSCODER_B ));@@ -279,7 +279,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (PIPE_DATA_M2 (dev_priv,TRANSCODER_B ));MMIO_D (PIPE_DATA_N2 (dev_priv,TRANSCODER_B ));MMIO_D (PIPE_LINK_M1 (dev_priv,TRANSCODER_B )); -MMIO_D (PIPE_LINK_N1 (TRANSCODER_B )); +MMIO_D (PIPE_LINK_N1 (dev_priv,TRANSCODER_B ));MMIO_D (PIPE_LINK_M2 (TRANSCODER_B ));MMIO_D (PIPE_LINK_N2 (TRANSCODER_B ));MMIO_D (PIPE_DATA_M1 (dev_priv,TRANSCODER_C ));@@ -287,7 +287,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (PIPE_DATA_M2 (dev_priv,TRANSCODER_C ));MMIO_D (PIPE_DATA_N2 (dev_priv,TRANSCODER_C ));MMIO_D (PIPE_LINK_M1 (dev_priv,TRANSCODER_C )); -MMIO_D (PIPE_LINK_N1 (TRANSCODER_C )); +MMIO_D (PIPE_LINK_N1 (dev_priv,TRANSCODER_C ));MMIO_D (PIPE_LINK_M2 (TRANSCODER_C ));MMIO_D (PIPE_LINK_N2 (TRANSCODER_C ));MMIO_D (PIPE_DATA_M1 (dev_priv,TRANSCODER_EDP ));@@ -295,7 +295,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (PIPE_DATA_M2 (dev_priv,TRANSCODER_EDP ));MMIO_D (PIPE_DATA_N2 (dev_priv,TRANSCODER_EDP ));MMIO_D (PIPE_LINK_M1 (dev_priv,TRANSCODER_EDP )); -MMIO_D (PIPE_LINK_N1 (TRANSCODER_EDP )); +MMIO_D (PIPE_LINK_N1 (dev_priv,TRANSCODER_EDP ));MMIO_D (PIPE_LINK_M2 (TRANSCODER_EDP ));MMIO_D (PIPE_LINK_N2 (TRANSCODER_EDP ));MMIO_D (PF_CTL (PIPE_A ));Signature · 1 line
2.39.2
Re: [PATCH 59/65] drm/i915: pass dev_priv explicitly to TRANS_DDI_FUNC_CTL
In reply to Jani NikulaQuoted 2 lines · Jani Nikula
Avoid the implicit
dev_privlocal variable use, and passdev_privexplicitly to theTRANS_DDI_FUNC_CTLregister macro.
Quoted 398 lines
Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/display/icl_dsi.c | 12 +++++--- drivers/gpu/drm/i915/display/intel_ddi.c | 29 ++++++++++++------- drivers/gpu/drm/i915/display/intel_display.c | 9 ++++-- .../gpu/drm/i915/display/intel_display_irq.c | 3 +- drivers/gpu/drm/i915/display/intel_dp_mst.c | 5 ++-- drivers/gpu/drm/i915/display/intel_fdi.c | 3 +- drivers/gpu/drm/i915/display/intel_hdcp.c | 3 +- drivers/gpu/drm/i915/display/intel_hdmi.c | 2 +- drivers/gpu/drm/i915/gvt/display.c | 25 +++++++++------- drivers/gpu/drm/i915/gvt/handlers.c | 2 +- drivers/gpu/drm/i915/i915_reg.h | 2 +- 11 files changed, 58 insertions(+), 37 deletions(-)drivers/gpu/drm/i915/display/icl_dsi.c +8
-4@@ -796,7 +796,8 @@ gen11_dsi_configure_transcoder(struct intel_encoder *encoder, dsi_trans =dsi_port_to_transcoder (port);/* select data lane width */ - tmp =intel_de_read (dev_priv,TRANS_DDI_FUNC_CTL (dsi_trans)); + tmp =intel_de_read (dev_priv, +TRANS_DDI_FUNC_CTL (dev_priv, dsi_trans)); tmp &= ~DDI_PORT_WIDTH_MASK ; tmp |=DDI_PORT_WIDTH (intel_dsi->lane_count);@@ -822,7 +823,8 @@ gen11_dsi_configure_transcoder(struct intel_encoder *encoder,/* enable DDI buffer */ tmp |=TRANS_DDI_FUNC_ENABLE ; -intel_de_write (dev_priv,TRANS_DDI_FUNC_CTL (dsi_trans), tmp); +intel_de_write (dev_priv, +TRANS_DDI_FUNC_CTL (dev_priv, dsi_trans), tmp); }/* wait for link ready */ @@ -1333,7 +1335,8 @@ static void gen11_dsi_deconfigure_trancoder(struct intel_encoder *encoder)/* disable ddi function */ for_each_dsi_port (port, intel_dsi->ports) { dsi_trans =dsi_port_to_transcoder (port); -intel_de_rmw (dev_priv,TRANS_DDI_FUNC_CTL (dsi_trans), +intel_de_rmw (dev_priv, +TRANS_DDI_FUNC_CTL (dev_priv, dsi_trans),TRANS_DDI_FUNC_ENABLE ,0 ); }@@ -1697,7 +1700,8 @@ static bool gen11_dsi_get_hw_state(struct intel_encoder *encoder,for_each_dsi_port (port, intel_dsi->ports) { dsi_trans =dsi_port_to_transcoder (port); - tmp =intel_de_read (dev_priv,TRANS_DDI_FUNC_CTL (dsi_trans)); + tmp =intel_de_read (dev_priv, +TRANS_DDI_FUNC_CTL (dev_priv, dsi_trans));switch (tmp &TRANS_DDI_EDP_INPUT_MASK ) {case TRANS_DDI_EDP_INPUT_A_ON : *pipe =PIPE_A ;drivers/gpu/drm/i915/display/intel_ddi.c +18
-11@@ -606,7 +606,7 @@ void intel_ddi_enable_transcoder_func(struct intel_encoder *encoder, TRANS_DDI_FUNC_CTL2(cpu_transcoder), ctl2); } -intel_de_write (dev_priv,TRANS_DDI_FUNC_CTL (cpu_transcoder), +intel_de_write (dev_priv,TRANS_DDI_FUNC_CTL (dev_priv, cpu_transcoder),intel_ddi_transcoder_func_reg_val_get (encoder, crtc_state)); }@@ -626,7 +626,8 @@ intel_ddi_config_transcoder_func(struct intel_encoder *encoder, ctl =intel_ddi_transcoder_func_reg_val_get (encoder, crtc_state); ctl &= ~TRANS_DDI_FUNC_ENABLE ; -intel_de_write (dev_priv,TRANS_DDI_FUNC_CTL (cpu_transcoder), ctl); +intel_de_write (dev_priv,TRANS_DDI_FUNC_CTL (dev_priv, cpu_transcoder), + ctl); }void intel_ddi_disable_transcoder_func (const struct intel_crtc_state *crtc_state)@@ -641,7 +642,8 @@ void intel_ddi_disable_transcoder_func(const struct intel_crtc_state *crtc_stateintel_de_write (dev_priv,TRANS_DDI_FUNC_CTL2 (cpu_transcoder),0 ); - ctl =intel_de_read (dev_priv,TRANS_DDI_FUNC_CTL (cpu_transcoder)); + ctl =intel_de_read (dev_priv, +TRANS_DDI_FUNC_CTL (dev_priv, cpu_transcoder));drm_WARN_ON (crtc->base.dev, ctl &TRANS_DDI_HDCP_SIGNALLING );@@ -660,7 +662,8 @@ void intel_ddi_disable_transcoder_func(const struct intel_crtc_state *crtc_state ctl &= ~(TRANS_DDI_PORT_MASK |TRANS_DDI_MODE_SELECT_MASK ); } -intel_de_write (dev_priv,TRANS_DDI_FUNC_CTL (cpu_transcoder), ctl); +intel_de_write (dev_priv,TRANS_DDI_FUNC_CTL (dev_priv, cpu_transcoder), + ctl);if (intel_has_quirk (display,QUIRK_INCREASE_DDI_DISABLED_TIME ) &&intel_crtc_has_type (crtc_state,INTEL_OUTPUT_HDMI )) {@@ -684,7 +687,7 @@ int intel_ddi_toggle_hdcp_bits(struct intel_encoder *intel_encoder,if (drm_WARN_ON (dev, !wakeref))return -ENXIO ; -intel_de_rmw (dev_priv,TRANS_DDI_FUNC_CTL (cpu_transcoder), +intel_de_rmw (dev_priv,TRANS_DDI_FUNC_CTL (dev_priv, cpu_transcoder), hdcp_mask, enable ? hdcp_mask :0 );intel_display_power_put (dev_priv, intel_encoder->power_domain, wakeref);return ret;@@ -718,7 +721,8 @@ bool intel_ddi_connector_get_hw_state(struct intel_connector *intel_connector)else cpu_transcoder = (enum transcoder ) pipe; - tmp =intel_de_read (dev_priv,TRANS_DDI_FUNC_CTL (cpu_transcoder)); + tmp =intel_de_read (dev_priv, +TRANS_DDI_FUNC_CTL (dev_priv, cpu_transcoder));switch (tmp &TRANS_DDI_MODE_SELECT_MASK ) {case TRANS_DDI_MODE_SELECT_HDMI :@@ -782,7 +786,7 @@ static void intel_ddi_get_encoder_pipes(struct intel_encoder *encoder,if (HAS_TRANSCODER (dev_priv,TRANSCODER_EDP ) && port ==PORT_A ) { tmp =intel_de_read (dev_priv, -TRANS_DDI_FUNC_CTL (TRANSCODER_EDP )); +TRANS_DDI_FUNC_CTL (dev_priv,TRANSCODER_EDP ));switch (tmp &TRANS_DDI_EDP_INPUT_MASK ) {default :@@ -823,7 +827,7 @@ static void intel_ddi_get_encoder_pipes(struct intel_encoder *encoder, } tmp =intel_de_read (dev_priv, -TRANS_DDI_FUNC_CTL (cpu_transcoder)); +TRANS_DDI_FUNC_CTL (dev_priv, cpu_transcoder));intel_display_power_put (dev_priv,POWER_DOMAIN_TRANSCODER (cpu_transcoder), trans_wakeref);@@ -3025,7 +3029,8 @@ static void intel_ddi_post_disable_dp(struct intel_atomic_state *state,if (is_mst) {enum transcoder cpu_transcoder = old_crtc_state->cpu_transcoder; -intel_de_rmw (dev_priv,TRANS_DDI_FUNC_CTL (cpu_transcoder), +intel_de_rmw (dev_priv, +TRANS_DDI_FUNC_CTL (dev_priv, cpu_transcoder),TGL_TRANS_DDI_PORT_MASK |TRANS_DDI_MODE_SELECT_MASK ,0 ); }@@ -3759,7 +3764,8 @@ static enum transcoder bdw_transcoder_master_readout(struct drm_i915_private *de master_select =REG_FIELD_GET (PORT_SYNC_MODE_MASTER_SELECT_MASK , ctl2); }else { -u32 ctl =intel_de_read (dev_priv,TRANS_DDI_FUNC_CTL (cpu_transcoder)); +u32 ctl =intel_de_read (dev_priv, +TRANS_DDI_FUNC_CTL (dev_priv, cpu_transcoder));if ((ctl &TRANS_DDI_PORT_SYNC_ENABLE ) ==0 )return INVALID_TRANSCODER ;@@ -3815,7 +3821,8 @@ static void intel_ddi_read_func_ctl(struct intel_encoder *encoder,struct intel_digital_port *dig_port =enc_to_dig_port (encoder);u32 temp, flags =0 ; - temp =intel_de_read (dev_priv,TRANS_DDI_FUNC_CTL (cpu_transcoder)); + temp =intel_de_read (dev_priv, +TRANS_DDI_FUNC_CTL (dev_priv, cpu_transcoder));if (temp &TRANS_DDI_PHSYNC ) flags |=DRM_MODE_FLAG_PHSYNC ;else drivers/gpu/drm/i915/display/intel_display.c +6
-3@@ -3507,7 +3507,8 @@ static bool transcoder_ddi_func_is_enabled(struct drm_i915_private *dev_priv, power_domain =POWER_DOMAIN_TRANSCODER (cpu_transcoder);with_intel_display_power_if_enabled (dev_priv, power_domain, wakeref) - tmp = intel_de_read(dev_priv, TRANS_DDI_FUNC_CTL(cpu_transcoder)); + tmp = intel_de_read(dev_priv, +TRANS_DDI_FUNC_CTL (dev_priv, cpu_transcoder));return tmp &TRANS_DDI_FUNC_ENABLE ; }@@ -3622,7 +3623,8 @@ static u8 hsw_enabled_transcoders(struct intel_crtc *crtc) power_domain =POWER_DOMAIN_TRANSCODER (cpu_transcoder);with_intel_display_power_if_enabled (dev_priv, power_domain, wakeref) - tmp = intel_de_read(dev_priv, TRANS_DDI_FUNC_CTL(cpu_transcoder)); + tmp = intel_de_read(dev_priv, +TRANS_DDI_FUNC_CTL (dev_priv, cpu_transcoder));if (!(tmp &TRANS_DDI_FUNC_ENABLE ))continue ;@@ -3729,7 +3731,8 @@ static bool hsw_get_transcoder_state(struct intel_crtc *crtc,return false;if (hsw_panel_transcoders (dev_priv) &BIT (pipe_config->cpu_transcoder)) { - tmp =intel_de_read (dev_priv,TRANS_DDI_FUNC_CTL (pipe_config->cpu_transcoder)); + tmp =intel_de_read (dev_priv, +TRANS_DDI_FUNC_CTL (dev_priv, pipe_config->cpu_transcoder));if ((tmp &TRANS_DDI_EDP_INPUT_MASK ) ==TRANS_DDI_EDP_INPUT_A_ONOFF ) pipe_config->pch_pfit.force_thru = true;drivers/gpu/drm/i915/display/intel_display_irq.c +2
-1@@ -934,7 +934,8 @@ static void gen11_dsi_te_interrupt_handler(struct drm_i915_private *dev_priv, }/* Get PIPE for handling VBLANK event */ - val =intel_uncore_read (&dev_priv->uncore,TRANS_DDI_FUNC_CTL (dsi_trans)); + val =intel_uncore_read (&dev_priv->uncore, +TRANS_DDI_FUNC_CTL (dev_priv, dsi_trans));switch (val &TRANS_DDI_EDP_INPUT_MASK ) {case TRANS_DDI_EDP_INPUT_A_ON : pipe =PIPE_A ;drivers/gpu/drm/i915/display/intel_dp_mst.c +3
-2@@ -1009,7 +1009,8 @@ static void intel_mst_post_disable_dp(struct intel_atomic_state *state,clear_act_sent (encoder, old_crtc_state); -intel_de_rmw (dev_priv,TRANS_DDI_FUNC_CTL (old_crtc_state->cpu_transcoder), +intel_de_rmw (dev_priv, +TRANS_DDI_FUNC_CTL (dev_priv, old_crtc_state->cpu_transcoder),TRANS_DDI_DP_VC_PAYLOAD_ALLOC ,0 );wait_for_act_sent (encoder, old_crtc_state);@@ -1230,7 +1231,7 @@ static void intel_mst_enable_dp(struct intel_atomic_state *state,clear_act_sent (encoder, pipe_config); -intel_de_rmw (dev_priv,TRANS_DDI_FUNC_CTL (trans),0 , +intel_de_rmw (dev_priv,TRANS_DDI_FUNC_CTL (dev_priv, trans),0 ,TRANS_DDI_DP_VC_PAYLOAD_ALLOC ); drm_dbg_kms(&dev_priv->drm, "active links %d\n",drivers/gpu/drm/i915/display/intel_fdi.c +2
-1@@ -34,7 +34,8 @@ static void assert_fdi_tx(struct drm_i915_private *dev_priv,* so pipe->transcoder cast is fine here. */ enum transcoder cpu_transcoder = (enum transcoder )pipe; - cur_state =intel_de_read (dev_priv,TRANS_DDI_FUNC_CTL (cpu_transcoder)) &TRANS_DDI_FUNC_ENABLE ; + cur_state =intel_de_read (dev_priv, +TRANS_DDI_FUNC_CTL (dev_priv, cpu_transcoder)) &TRANS_DDI_FUNC_ENABLE ; }else { cur_state =intel_de_read (dev_priv,FDI_TX_CTL (pipe)) &FDI_TX_ENABLE ; }drivers/gpu/drm/i915/display/intel_hdcp.c +2
-1@@ -47,7 +47,8 @@ intel_hdcp_disable_hdcp_line_rekeying(struct intel_encoder *encoder, 0, HDCP_LINE_REKEY_DISABLE); else if (IS_DISPLAY_IP_STEP(dev_priv, IP_VER(14, 1), STEP_B0, STEP_FOREVER) || IS_DISPLAY_IP_STEP(dev_priv, IP_VER(20, 0), STEP_B0, STEP_FOREVER)) - intel_de_rmw(dev_priv, TRANS_DDI_FUNC_CTL(hdcp->cpu_transcoder), +intel_de_rmw (dev_priv , + TRANS_DDI_FUNC_CTL(dev_priv, hdcp->cpu_transcoder), 0, TRANS_DDI_HDCP_LINE_REKEY_DISABLE); } }drivers/gpu/drm/i915/display/intel_hdmi.c +1
-1@@ -83,7 +83,7 @@ assert_hdmi_transcoder_func_disabled(struct drm_i915_private *dev_priv, enum transcoder cpu_transcoder) {drm_WARN (&dev_priv->drm, -intel_de_read (dev_priv,TRANS_DDI_FUNC_CTL (cpu_transcoder)) & +intel_de_read (dev_priv,TRANS_DDI_FUNC_CTL (dev_priv, cpu_transcoder)) &TRANS_DDI_FUNC_ENABLE ,"HDMI transcoder function enabled, expecting disabled\n" ); }drivers/gpu/drm/i915/gvt/display.c +14
-11@@ -200,11 +200,11 @@ static void emulate_monitor_status_change(struct intel_vgpu *vgpu) }for (trans =TRANSCODER_A ; trans <=TRANSCODER_EDP ; trans++) { -vgpu_vreg_t (vgpu,TRANS_DDI_FUNC_CTL (trans)) &= +vgpu_vreg_t (vgpu,TRANS_DDI_FUNC_CTL (dev_priv, trans)) &= ~(TRANS_DDI_BPC_MASK |TRANS_DDI_MODE_SELECT_MASK |TRANS_DDI_PORT_MASK |TRANS_DDI_FUNC_ENABLE ); } -vgpu_vreg_t (vgpu,TRANS_DDI_FUNC_CTL (TRANSCODER_A )) &= +vgpu_vreg_t (vgpu,TRANS_DDI_FUNC_CTL (dev_priv,TRANSCODER_A )) &= ~(TRANS_DDI_BPC_MASK |TRANS_DDI_MODE_SELECT_MASK |TRANS_DDI_PORT_MASK );@@ -287,7 +287,8 @@ static void emulate_monitor_status_change(struct intel_vgpu *vgpu) (DDI_BUF_CTL_ENABLE |DDI_INIT_DISPLAY_DETECTED );vgpu_vreg_t (vgpu,DDI_BUF_CTL (PORT_A )) &= ~DDI_BUF_IS_IDLE ; -vgpu_vreg_t (vgpu,TRANS_DDI_FUNC_CTL (TRANSCODER_EDP )) |= +vgpu_vreg_t (vgpu, +TRANS_DDI_FUNC_CTL (dev_priv,TRANSCODER_EDP )) |= (TRANS_DDI_BPC_8 |TRANS_DDI_MODE_SELECT_DP_SST |TRANS_DDI_FUNC_ENABLE ); vgpu_vreg_t(vgpu, PCH_PORT_HOTPLUG) |=@@ -316,7 +317,8 @@ static void emulate_monitor_status_change(struct intel_vgpu *vgpu)DDI_BUF_CTL_ENABLE ;vgpu_vreg_t (vgpu,DDI_BUF_CTL (PORT_B )) &= ~DDI_BUF_IS_IDLE ; -vgpu_vreg_t (vgpu,TRANS_DDI_FUNC_CTL (TRANSCODER_A )) |= +vgpu_vreg_t (vgpu, +TRANS_DDI_FUNC_CTL (dev_priv,TRANSCODER_A )) |= (TRANS_DDI_BPC_8 |TRANS_DDI_MODE_SELECT_DP_SST | (PORT_B <<TRANS_DDI_PORT_SHIFT ) |TRANS_DDI_FUNC_ENABLE );@@ -346,7 +348,8 @@ static void emulate_monitor_status_change(struct intel_vgpu *vgpu)DDI_BUF_CTL_ENABLE ;vgpu_vreg_t (vgpu,DDI_BUF_CTL (PORT_C )) &= ~DDI_BUF_IS_IDLE ; -vgpu_vreg_t (vgpu,TRANS_DDI_FUNC_CTL (TRANSCODER_A )) |= +vgpu_vreg_t (vgpu, +TRANS_DDI_FUNC_CTL (dev_priv,TRANSCODER_A )) |= (TRANS_DDI_BPC_8 |TRANS_DDI_MODE_SELECT_DP_SST | (PORT_B <<TRANS_DDI_PORT_SHIFT ) |TRANS_DDI_FUNC_ENABLE );@@ -410,10 +413,10 @@ static void emulate_monitor_status_change(struct intel_vgpu *vgpu)vgpu_vreg_t (vgpu,DPLL_CTRL2 ) |=DPLL_CTRL2_DDI_SEL_OVERRIDE (PORT_B );vgpu_vreg_t (vgpu,SFUSE_STRAP ) |=SFUSE_STRAP_DDIB_DETECTED ; -vgpu_vreg_t (vgpu,TRANS_DDI_FUNC_CTL (TRANSCODER_A )) &= +vgpu_vreg_t (vgpu,TRANS_DDI_FUNC_CTL (dev_priv,TRANSCODER_A )) &= ~(TRANS_DDI_BPC_MASK |TRANS_DDI_MODE_SELECT_MASK |TRANS_DDI_PORT_MASK ); -vgpu_vreg_t (vgpu,TRANS_DDI_FUNC_CTL (TRANSCODER_A )) |= +vgpu_vreg_t (vgpu,TRANS_DDI_FUNC_CTL (dev_priv,TRANSCODER_A )) |= (TRANS_DDI_BPC_8 |TRANS_DDI_MODE_SELECT_DP_SST | (PORT_B <<TRANS_DDI_PORT_SHIFT ) |TRANS_DDI_FUNC_ENABLE );@@ -436,10 +439,10 @@ static void emulate_monitor_status_change(struct intel_vgpu *vgpu)vgpu_vreg_t (vgpu,DPLL_CTRL2 ) |=DPLL_CTRL2_DDI_SEL_OVERRIDE (PORT_C );vgpu_vreg_t (vgpu,SDEISR ) |=SDE_PORTC_HOTPLUG_CPT ; -vgpu_vreg_t (vgpu,TRANS_DDI_FUNC_CTL (TRANSCODER_A )) &= +vgpu_vreg_t (vgpu,TRANS_DDI_FUNC_CTL (dev_priv,TRANSCODER_A )) &= ~(TRANS_DDI_BPC_MASK |TRANS_DDI_MODE_SELECT_MASK |TRANS_DDI_PORT_MASK ); -vgpu_vreg_t (vgpu,TRANS_DDI_FUNC_CTL (TRANSCODER_A )) |= +vgpu_vreg_t (vgpu,TRANS_DDI_FUNC_CTL (dev_priv,TRANSCODER_A )) |= (TRANS_DDI_BPC_8 |TRANS_DDI_MODE_SELECT_DP_SST | (PORT_C <<TRANS_DDI_PORT_SHIFT ) |TRANS_DDI_FUNC_ENABLE );@@ -462,10 +465,10 @@ static void emulate_monitor_status_change(struct intel_vgpu *vgpu)vgpu_vreg_t (vgpu,DPLL_CTRL2 ) |=DPLL_CTRL2_DDI_SEL_OVERRIDE (PORT_D );vgpu_vreg_t (vgpu,SDEISR ) |=SDE_PORTD_HOTPLUG_CPT ; -vgpu_vreg_t (vgpu,TRANS_DDI_FUNC_CTL (TRANSCODER_A )) &= +vgpu_vreg_t (vgpu,TRANS_DDI_FUNC_CTL (dev_priv,TRANSCODER_A )) &= ~(TRANS_DDI_BPC_MASK |TRANS_DDI_MODE_SELECT_MASK |TRANS_DDI_PORT_MASK ); -vgpu_vreg_t (vgpu,TRANS_DDI_FUNC_CTL (TRANSCODER_A )) |= +vgpu_vreg_t (vgpu,TRANS_DDI_FUNC_CTL (dev_priv,TRANSCODER_A )) |= (TRANS_DDI_BPC_8 |TRANS_DDI_MODE_SELECT_DP_SST | (PORT_D <<TRANS_DDI_PORT_SHIFT ) |TRANS_DDI_FUNC_ENABLE );drivers/gpu/drm/i915/gvt/handlers.c +1
-1@@ -657,7 +657,7 @@ static void vgpu_update_refresh_rate(struct intel_vgpu *vgpu)u32 dp_br, link_m, link_n, htotal, vtotal;/* Find DDI/PORT assigned to TRANSCODER_A, expect B or D */ - port = (vgpu_vreg_t (vgpu,TRANS_DDI_FUNC_CTL (TRANSCODER_A )) & + port = (vgpu_vreg_t (vgpu,TRANS_DDI_FUNC_CTL (dev_priv,TRANSCODER_A )) &TRANS_DDI_PORT_MASK ) >>TRANS_DDI_PORT_SHIFT ;if (port !=PORT_B && port !=PORT_D ) {gvt_dbg_dpy ("vgpu-%d unsupported PORT_%c\n" , vgpu->id,port_name (port));drivers/gpu/drm/i915/i915_reg.h +1
-1@@ -3953,7 +3953,7 @@ enum skl_power_gate {#define _TRANS_DDI_FUNC_CTL_EDP 0x6F400#define _TRANS_DDI_FUNC_CTL_DSI0 0x6b400#define _TRANS_DDI_FUNC_CTL_DSI1 0x6bc00 -#define TRANS_DDI_FUNC_CTL (tran) _MMIO_TRANS2(dev_priv, tran, _TRANS_DDI_FUNC_CTL_A) +#define TRANS_DDI_FUNC_CTL (dev_priv, tran) _MMIO_TRANS2(dev_priv, tran, _TRANS_DDI_FUNC_CTL_A)#define TRANS_DDI_FUNC_ENABLE (1 << 31)/* Those bits are ignored by pipe EDP since it can only connect to DDI A */ Signature · 1 line
2.39.2
Re: [PATCH 61/65] drm/i915: pass dev_priv explicitly to TGL_DP_TP_CTL
In reply to Jani NikulaQuoted 2 lines · Jani Nikula
Avoid the implicit
dev_privlocal variable use, and passdev_privexplicitly to theTGL_DP_TP_CTLregister macro.
Quoted 37 lines
Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/display/intel_ddi.c | 3 ++- drivers/gpu/drm/i915/i915_reg.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/display/intel_ddi.c +2
-1@@ -2184,7 +2184,8 @@ i915_reg_t dp_tp_ctl_reg(struct intel_encoder *encoder,struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);if (DISPLAY_VER (dev_priv) >=12 ) -return TGL_DP_TP_CTL (tgl_dp_tp_transcoder (crtc_state)); +return TGL_DP_TP_CTL (dev_priv, +tgl_dp_tp_transcoder (crtc_state));else return DP_TP_CTL (encoder->port); }drivers/gpu/drm/i915/i915_reg.h +1
-1@@ -4022,7 +4022,7 @@ enum skl_power_gate {#define _DP_TP_CTL_B 0x64140#define _TGL_DP_TP_CTL_A 0x60540#define DP_TP_CTL (port) _MMIO_PORT(port, _DP_TP_CTL_A, _DP_TP_CTL_B) -#define TGL_DP_TP_CTL (tran) _MMIO_TRANS2(dev_priv, (tran), _TGL_DP_TP_CTL_A) +#define TGL_DP_TP_CTL (dev_priv, tran) _MMIO_TRANS2(dev_priv, (tran), _TGL_DP_TP_CTL_A)#define DP_TP_CTL_ENABLE (1 << 31)#define DP_TP_CTL_FEC_ENABLE (1 << 30)#define DP_TP_CTL_MODE_SST (0 << 27)Signature · 1 line
2.39.2
Re: [PATCH 57/65] drm/i915: pass dev_priv explicitly to PIPE_LINK_N2
In reply to Jani NikulaQuoted 2 lines · Jani Nikula
Avoid the implicit
dev_privlocal variable use, and passdev_privexplicitly to thePIPE_LINK_N2register macro.
Quoted 86 lines
Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/display/intel_display.c | 4 ++-- drivers/gpu/drm/i915/i915_reg.h | 2 +- drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-)drivers/gpu/drm/i915/display/intel_display.c +2
-2@@ -2664,7 +2664,7 @@ void intel_cpu_transcoder_set_m2_n2(struct intel_crtc *crtc,PIPE_DATA_M2 (dev_priv, transcoder),PIPE_DATA_N2 (dev_priv, transcoder),PIPE_LINK_M2 (dev_priv, transcoder), - PIPE_LINK_N2(transcoder)); + PIPE_LINK_N2(dev_priv, transcoder)); }static void intel_set_transcoder_timings (const struct intel_crtc_state *crtc_state)@@ -3364,7 +3364,7 @@ void intel_cpu_transcoder_get_m2_n2(struct intel_crtc *crtc,PIPE_DATA_M2 (dev_priv, transcoder),PIPE_DATA_N2 (dev_priv, transcoder),PIPE_LINK_M2 (dev_priv, transcoder), - PIPE_LINK_N2(transcoder)); + PIPE_LINK_N2(dev_priv, transcoder)); }static void ilk_get_pfit_config (struct intel_crtc_state *crtc_state)drivers/gpu/drm/i915/i915_reg.h +1
-1@@ -2386,7 +2386,7 @@#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 (dev_priv, tran) _MMIO_TRANS2(dev_priv, tran, _PIPEA_LINK_M2) -#define PIPE_LINK_N2 (tran) _MMIO_TRANS2(dev_priv, tran, _PIPEA_LINK_N2) +#define PIPE_LINK_N2 (dev_priv, tran) _MMIO_TRANS2(dev_priv, tran, _PIPEA_LINK_N2)/* CPU panel fitter */ /* IVB+ has 3 fitters, 0 is 7x5 capable, the other two only 3x3 */ drivers/gpu/drm/i915/intel_gvt_mmio_table.c +4
-4@@ -273,7 +273,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (PIPE_LINK_M1 (dev_priv,TRANSCODER_A ));MMIO_D (PIPE_LINK_N1 (dev_priv,TRANSCODER_A ));MMIO_D (PIPE_LINK_M2 (dev_priv,TRANSCODER_A )); -MMIO_D (PIPE_LINK_N2 (TRANSCODER_A )); +MMIO_D (PIPE_LINK_N2 (dev_priv,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 (dev_priv,TRANSCODER_B ));@@ -281,7 +281,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (PIPE_LINK_M1 (dev_priv,TRANSCODER_B ));MMIO_D (PIPE_LINK_N1 (dev_priv,TRANSCODER_B ));MMIO_D (PIPE_LINK_M2 (dev_priv,TRANSCODER_B )); -MMIO_D (PIPE_LINK_N2 (TRANSCODER_B )); +MMIO_D (PIPE_LINK_N2 (dev_priv,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 (dev_priv,TRANSCODER_C ));@@ -289,7 +289,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (PIPE_LINK_M1 (dev_priv,TRANSCODER_C ));MMIO_D (PIPE_LINK_N1 (dev_priv,TRANSCODER_C ));MMIO_D (PIPE_LINK_M2 (dev_priv,TRANSCODER_C )); -MMIO_D (PIPE_LINK_N2 (TRANSCODER_C )); +MMIO_D (PIPE_LINK_N2 (dev_priv,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 (dev_priv,TRANSCODER_EDP ));@@ -297,7 +297,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (PIPE_LINK_M1 (dev_priv,TRANSCODER_EDP ));MMIO_D (PIPE_LINK_N1 (dev_priv,TRANSCODER_EDP ));MMIO_D (PIPE_LINK_M2 (dev_priv,TRANSCODER_EDP )); -MMIO_D (PIPE_LINK_N2 (TRANSCODER_EDP )); +MMIO_D (PIPE_LINK_N2 (dev_priv,TRANSCODER_EDP ));MMIO_D (PF_CTL (PIPE_A ));MMIO_D (PF_WIN_SZ (PIPE_A ));MMIO_D (PF_WIN_POS (PIPE_A ));Signature · 1 line
2.39.2
Re: [PATCH 56/65] drm/i915: pass dev_priv explicitly to PIPE_LINK_M2
In reply to Jani NikulaQuoted 2 lines · Jani Nikula
Avoid the implicit
dev_privlocal variable use, and passdev_privexplicitly to thePIPE_LINK_M2register macro.
Quoted 88 lines
Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/display/intel_display.c | 6 ++++-- drivers/gpu/drm/i915/i915_reg.h | 2 +- drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 8 ++++---- 3 files changed, 9 insertions(+), 7 deletions(-)drivers/gpu/drm/i915/display/intel_display.c +4
-2@@ -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)drivers/gpu/drm/i915/i915_reg.h +1
-1@@ -2385,7 +2385,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 */ drivers/gpu/drm/i915/intel_gvt_mmio_table.c +4
-4@@ -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 ));Signature · 1 line
2.39.2
Re: [PATCH 62/65] drm/i915: pass dev_priv explicitly to TGL_DP_TP_STATUS
In reply to Jani NikulaQuoted 2 lines · Jani Nikula
Avoid the implicit
dev_privlocal variable use, and passdev_privexplicitly to theTGL_DP_TP_STATUSregister macro.
Quoted 37 lines
Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/display/intel_ddi.c | 3 ++- drivers/gpu/drm/i915/i915_reg.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/display/intel_ddi.c +2
-1@@ -2196,7 +2196,8 @@ i915_reg_t dp_tp_status_reg(struct intel_encoder *encoder,struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);if (DISPLAY_VER (dev_priv) >=12 ) -return TGL_DP_TP_STATUS (tgl_dp_tp_transcoder (crtc_state)); +return TGL_DP_TP_STATUS (dev_priv, +tgl_dp_tp_transcoder (crtc_state));else return DP_TP_STATUS (encoder->port); }drivers/gpu/drm/i915/i915_reg.h +1
-1@@ -4048,7 +4048,7 @@ enum skl_power_gate {#define _DP_TP_STATUS_B 0x64144#define _TGL_DP_TP_STATUS_A 0x60544#define DP_TP_STATUS (port) _MMIO_PORT(port, _DP_TP_STATUS_A, _DP_TP_STATUS_B) -#define TGL_DP_TP_STATUS (tran) _MMIO_TRANS2(dev_priv, (tran), _TGL_DP_TP_STATUS_A) +#define TGL_DP_TP_STATUS (dev_priv, tran) _MMIO_TRANS2(dev_priv, (tran), _TGL_DP_TP_STATUS_A)#define DP_TP_STATUS_FEC_ENABLE_LIVE (1 << 28)#define DP_TP_STATUS_IDLE_DONE (1 << 25)#define DP_TP_STATUS_ACT_SENT (1 << 24)Signature · 1 line
2.39.2
Re: [PATCH 63/65] drm/i915: pass dev_priv explicitly to TRANS_MSA_MISC
In reply to Jani NikulaQuoted 2 lines · Jani Nikula
Avoid the implicit
dev_privlocal variable use, and passdev_privexplicitly to theTRANS_MSA_MISCregister macro.
Quoted 37 lines
Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/display/intel_ddi.c | 3 ++- drivers/gpu/drm/i915/i915_reg.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/display/intel_ddi.c +2
-1@@ -440,7 +440,8 @@ void intel_ddi_set_dp_msa(const struct intel_crtc_state *crtc_state,if (intel_dp_needs_vsc_sdp (crtc_state, conn_state)) temp |=DP_MSA_MISC_COLOR_VSC_SDP ; -intel_de_write (dev_priv,TRANS_MSA_MISC (cpu_transcoder), temp); +intel_de_write (dev_priv,TRANS_MSA_MISC (dev_priv, cpu_transcoder), + temp); }static u32 bdw_trans_port_sync_master_select (enum transcoder master_transcoder)drivers/gpu/drm/i915/i915_reg.h +1
-1@@ -4229,7 +4229,7 @@ enum skl_power_gate {#define _TRANSB_MSA_MISC 0x61410#define _TRANSC_MSA_MISC 0x62410#define _TRANS_EDP_MSA_MISC 0x6f410 -#define TRANS_MSA_MISC (tran) _MMIO_TRANS2(dev_priv, tran, _TRANSA_MSA_MISC) +#define TRANS_MSA_MISC (dev_priv, tran) _MMIO_TRANS2(dev_priv, tran, _TRANSA_MSA_MISC)/* See DP_MSA_MISC_* for the bit definitions */ #define _TRANS_A_SET_CONTEXT_LATENCY 0x6007CSignature · 1 line
2.39.2
Re: [PATCH 58/65] drm/i915: pass dev_priv explicitly to HSW_STEREO_3D_CTL
In reply to Jani NikulaQuoted 13 lines · Jani Nikula
Avoid the implicit
dev_privlocal variable use, and passdev_privexplicitly to theHSW_STEREO_3D_CTLregister macro.Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/i915/i915_reg.h +0
-0
drivers/gpu/drm/i915/i915_reg.h line 3496
Quoted 5 lines
drivers/gpu/drm/i915/i915_reg.h +1
-1@@ -3493,7 +3493,7 @@#define S3D_ENABLE (1 << 31)#define _HSW_STEREO_3D_CTL_B 0x71020 -#define HSW_STEREO_3D_CTL (trans) _MMIO_PIPE2(dev_priv, trans, _HSW_STEREO_3D_CTL_A) +#define HSW_STEREO_3D_CTL (dev_priv, trans) _MMIO_PIPE2(dev_priv, trans, _HSW_STEREO_3D_CTL_A)
oh! this I'm pretty sure it is really old and will never get used.
Let's remove?! :$
but up to you:
Quoted 6 lines
drivers/gpu/drm/i915/i915_reg.h +0
-0#define _PCH_TRANS_HTOTAL_B 0xe1000#define _PCH_TRANS_HBLANK_B 0xe1004Signature · 1 line
2.39.2
Re: [PATCH 60/65] drm/i915: pass dev_priv explicitly to TRANS_DDI_FUNC_CTL2
In reply to Jani NikulaQuoted 2 lines · Jani Nikula
Avoid the implicit
dev_privlocal variable use, and passdev_privexplicitly to theTRANS_DDI_FUNC_CTL2register macro.
Quoted 97 lines
Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/display/icl_dsi.c | 6 ++++-- drivers/gpu/drm/i915/display/intel_ddi.c | 9 ++++++--- drivers/gpu/drm/i915/display/intel_display_irq.c | 3 ++- drivers/gpu/drm/i915/i915_reg.h | 2 +- 4 files changed, 13 insertions(+), 7 deletions(-)drivers/gpu/drm/i915/display/icl_dsi.c +4
-2@@ -784,7 +784,8 @@ gen11_dsi_configure_transcoder(struct intel_encoder *encoder,if (intel_dsi->dual_link) {for_each_dsi_port (port, intel_dsi->ports) { dsi_trans =dsi_port_to_transcoder (port); -intel_de_rmw (dev_priv,TRANS_DDI_FUNC_CTL2 (dsi_trans), +intel_de_rmw (dev_priv, +TRANS_DDI_FUNC_CTL2 (dev_priv, dsi_trans),0 ,PORT_SYNC_MODE_ENABLE ); }@@ -1344,7 +1345,8 @@ static void gen11_dsi_deconfigure_trancoder(struct intel_encoder *encoder)if (intel_dsi->dual_link) {for_each_dsi_port (port, intel_dsi->ports) { dsi_trans =dsi_port_to_transcoder (port); -intel_de_rmw (dev_priv,TRANS_DDI_FUNC_CTL2 (dsi_trans), +intel_de_rmw (dev_priv, +TRANS_DDI_FUNC_CTL2 (dev_priv, dsi_trans),PORT_SYNC_MODE_ENABLE ,0 ); } }drivers/gpu/drm/i915/display/intel_ddi.c +6
-3@@ -603,7 +603,8 @@ void intel_ddi_enable_transcoder_func(struct intel_encoder *encoder, }intel_de_write (dev_priv, -TRANS_DDI_FUNC_CTL2 (cpu_transcoder), ctl2); +TRANS_DDI_FUNC_CTL2 (dev_priv, cpu_transcoder), + ctl2); } intel_de_write(dev_priv, TRANS_DDI_FUNC_CTL(dev_priv, cpu_transcoder),@@ -640,7 +641,8 @@ void intel_ddi_disable_transcoder_func(const struct intel_crtc_state *crtc_stateif (DISPLAY_VER (dev_priv) >=11 )intel_de_write (dev_priv, -TRANS_DDI_FUNC_CTL2 (cpu_transcoder),0 ); +TRANS_DDI_FUNC_CTL2 (dev_priv, cpu_transcoder), +0 ); ctl =intel_de_read (dev_priv,TRANS_DDI_FUNC_CTL (dev_priv, cpu_transcoder));@@ -3757,7 +3759,8 @@ static enum transcoder bdw_transcoder_master_readout(struct drm_i915_private *deu32 master_select;if (DISPLAY_VER (dev_priv) >=11 ) { -u32 ctl2 =intel_de_read (dev_priv,TRANS_DDI_FUNC_CTL2 (cpu_transcoder)); +u32 ctl2 =intel_de_read (dev_priv, +TRANS_DDI_FUNC_CTL2 (dev_priv, cpu_transcoder));if ((ctl2 &PORT_SYNC_MODE_ENABLE ) ==0 )return INVALID_TRANSCODER ;drivers/gpu/drm/i915/display/intel_display_irq.c +2
-1@@ -913,7 +913,8 @@ static void gen11_dsi_te_interrupt_handler(struct drm_i915_private *dev_priv,* Incase of dual link, TE comes from DSI_1 * this is to check if dual link is enabled */ - val =intel_uncore_read (&dev_priv->uncore,TRANS_DDI_FUNC_CTL2 (TRANSCODER_DSI_0 )); + val =intel_uncore_read (&dev_priv->uncore, +TRANS_DDI_FUNC_CTL2 (dev_priv,TRANSCODER_DSI_0 )); val &=PORT_SYNC_MODE_ENABLE ;/* drivers/gpu/drm/i915/i915_reg.h +1
-1@@ -4009,7 +4009,7 @@ enum skl_power_gate {#define _TRANS_DDI_FUNC_CTL2_EDP 0x6f404#define _TRANS_DDI_FUNC_CTL2_DSI0 0x6b404#define _TRANS_DDI_FUNC_CTL2_DSI1 0x6bc04 -#define TRANS_DDI_FUNC_CTL2 (tran) _MMIO_TRANS2(dev_priv, tran, _TRANS_DDI_FUNC_CTL2_A) +#define TRANS_DDI_FUNC_CTL2 (dev_priv, tran) _MMIO_TRANS2(dev_priv, tran, _TRANS_DDI_FUNC_CTL2_A)#define PORT_SYNC_MODE_ENABLE REG_BIT(4)#define PORT_SYNC_MODE_MASTER_SELECT_MASK REG_GENMASK(2, 0)#define PORT_SYNC_MODE_MASTER_SELECT (x) REG_FIELD_PREP(PORT_SYNC_MODE_MASTER_SELECT_MASK, (x))Signature · 1 line
2.39.2
Re: [PATCH 64/65] drm/i915: pass dev_priv explicitly to TRANS_SET_CONTEXT_LATENCY
In reply to Jani NikulaQuoted 2 lines · Jani Nikula
Avoid the implicit
dev_privlocal variable use, and passdev_privexplicitly to theTRANS_SET_CONTEXT_LATENCYregister macro.
Quoted 47 lines
Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/display/intel_display.c | 6 ++++-- drivers/gpu/drm/i915/i915_reg.h | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-)drivers/gpu/drm/i915/display/intel_display.c +4
-2@@ -2703,7 +2703,8 @@ static void intel_set_transcoder_timings(const struct intel_crtc_state *crtc_sta* TRANS_SET_CONTEXT_LATENCY to configure the pipe vblank start. */ if (DISPLAY_VER (dev_priv) >=13 ) { -intel_de_write (dev_priv,TRANS_SET_CONTEXT_LATENCY (cpu_transcoder), +intel_de_write (dev_priv, +TRANS_SET_CONTEXT_LATENCY (dev_priv, cpu_transcoder), crtc_vblank_start - crtc_vdisplay);/* @@ -2860,7 +2861,8 @@ static void intel_get_transcoder_timings(struct intel_crtc *crtc,if (DISPLAY_VER (dev_priv) >=13 && !transcoder_is_dsi (cpu_transcoder)) adjusted_mode->crtc_vblank_start = adjusted_mode->crtc_vdisplay + -intel_de_read (dev_priv,TRANS_SET_CONTEXT_LATENCY (cpu_transcoder)); +intel_de_read (dev_priv, +TRANS_SET_CONTEXT_LATENCY (dev_priv, cpu_transcoder)); }static void intel_bigjoiner_adjust_pipe_src (struct intel_crtc_state *crtc_state)drivers/gpu/drm/i915/i915_reg.h +1
-1@@ -4236,7 +4236,7 @@ enum skl_power_gate {#define _TRANS_B_SET_CONTEXT_LATENCY 0x6107C#define _TRANS_C_SET_CONTEXT_LATENCY 0x6207C#define _TRANS_D_SET_CONTEXT_LATENCY 0x6307C -#define TRANS_SET_CONTEXT_LATENCY (tran) _MMIO_TRANS2(dev_priv, tran, _TRANS_A_SET_CONTEXT_LATENCY) +#define TRANS_SET_CONTEXT_LATENCY (dev_priv, tran) _MMIO_TRANS2(dev_priv, tran, _TRANS_A_SET_CONTEXT_LATENCY)#define TRANS_SET_CONTEXT_LATENCY_MASK REG_GENMASK(15, 0)#define TRANS_SET_CONTEXT_LATENCY_VALUE (x) REG_FIELD_PREP(TRANS_SET_CONTEXT_LATENCY_MASK, (x))Signature · 1 line
2.39.2
Re: [PATCH 65/65] drm/i915: pass dev_priv explicitly to MTL_CLKGATE_DIS_TRANS
In reply to Jani NikulaQuoted 2 lines · Jani Nikula
Avoid the implicit
dev_privlocal variable use, and passdev_privexplicitly to theMTL_CLKGATE_DIS_TRANSregister macro.
I hope I didn't missed anything.
Quoted 46 lines
Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/display/intel_psr.c | 5 +++-- drivers/gpu/drm/i915/i915_reg.h | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-)drivers/gpu/drm/i915/display/intel_psr.c +3
-2@@ -1716,7 +1716,8 @@ static void intel_psr_enable_source(struct intel_dp *intel_dp,if (!intel_dp->psr.panel_replay_enabled &&IS_DISPLAY_IP_STEP (dev_priv,IP_VER (14 ,0 ),STEP_A0 ,STEP_B0 ))intel_de_rmw (dev_priv, -MTL_CLKGATE_DIS_TRANS (cpu_transcoder),0 , +MTL_CLKGATE_DIS_TRANS (dev_priv, cpu_transcoder), +0 ,MTL_CLKGATE_DIS_TRANS_DMASC_GATING_DIS );else if (IS_ALDERLAKE_P (dev_priv)) intel_de_rmw(dev_priv, CLKGATE_DIS_MISC, 0,@@ -1897,7 +1898,7 @@ static void intel_psr_disable_locked(struct intel_dp *intel_dp)if (!intel_dp->psr.panel_replay_enabled &&IS_DISPLAY_IP_STEP (dev_priv,IP_VER (14 ,0 ),STEP_A0 ,STEP_B0 ))intel_de_rmw (dev_priv, -MTL_CLKGATE_DIS_TRANS (cpu_transcoder), +MTL_CLKGATE_DIS_TRANS (dev_priv, cpu_transcoder),MTL_CLKGATE_DIS_TRANS_DMASC_GATING_DIS ,0 );else if (IS_ALDERLAKE_P (dev_priv)) intel_de_rmw(dev_priv, CLKGATE_DIS_MISC,drivers/gpu/drm/i915/i915_reg.h +1
-1@@ -4718,7 +4718,7 @@ enum skl_power_gate {#define _MTL_CLKGATE_DIS_TRANS_A 0x604E8#define _MTL_CLKGATE_DIS_TRANS_B 0x614E8 -#define MTL_CLKGATE_DIS_TRANS (trans) _MMIO_TRANS2(dev_priv, trans, _MTL_CLKGATE_DIS_TRANS_A) +#define MTL_CLKGATE_DIS_TRANS (dev_priv, trans) _MMIO_TRANS2(dev_priv, trans, _MTL_CLKGATE_DIS_TRANS_A)#define MTL_CLKGATE_DIS_TRANS_DMASC_GATING_DIS REG_BIT(7)#define MTL_MEM_SS_INFO_GLOBAL _MMIO(0x45700)Signature · 1 line
2.39.2
Re: [PATCH 45/65] drm/i915: pass dev_priv explicitly to _DSPBSIZE
In reply to Rodrigo ViviQuoted 24 lines · Rodrigo Vivi
Quoted 13 lines · Jani Nikula
Avoid the implicit
dev_privlocal variable use, and passdev_privexplicitly to the_DSPBSIZEregister macro.Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/i915/i915_reg.h +0
-0drivers/gpu/drm/i915/i915_reg.h line 2315
Quoted 5 lines
drivers/gpu/drm/i915/i915_reg.h +1
-1@@ -2312,7 +2312,7 @@#define _DSPBADDR (dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x71184)#define _DSPBSTRIDE (dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x71188)#define _DSPBPOS (dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x7118C) -#define _DSPBSIZE (DISPLAY_MMIO_BASE(dev_priv) + 0x71190) +#define _DSPBSIZE (dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x71190)way too many unused cases...
we should probably remove them all in one patch and whoever is introducing them later should already introduce with thedev_priv...
Quoted 3 lines
but again, up to you
Reviewed-by Rodrigo Vivi <[email protected]>
Dropped the changes touching unused macros, and pushed everything else to din. I've got a separate series cleaning up gvt a bit and removing the unused ones.
Thanks for the review!
BR,
Jani.
Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/i915/i915_reg.h +0
-0#define _DSPBSURF (DISPLAY_MMIO_BASE(dev_priv) + 0x7119C)#define _DSPBTILEOFF (DISPLAY_MMIO_BASE(dev_priv) + 0x711A4)#define _DSPBOFFSET (DISPLAY_MMIO_BASE(dev_priv) + 0x711A4)Signature · 1 line
2.39.2
Signature · 1 line
Jani Nikula, Intel
Re: [PATCH 45/65] drm/i915: pass dev_priv explicitly to _DSPBSIZE
Quoted 25 lines · Jani Nikula
Quoted 24 lines · Rodrigo Vivi
Quoted 13 lines · Jani Nikula
Avoid the implicit
dev_privlocal variable use, and passdev_privexplicitly to the_DSPBSIZEregister macro.Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/i915/i915_reg.h +0
-0drivers/gpu/drm/i915/i915_reg.h line 2315
Quoted 5 lines
drivers/gpu/drm/i915/i915_reg.h +1
-1@@ -2312,7 +2312,7 @@#define _DSPBADDR (dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x71184)#define _DSPBSTRIDE (dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x71188)#define _DSPBPOS (dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x7118C) -#define _DSPBSIZE (DISPLAY_MMIO_BASE(dev_priv) + 0x71190) +#define _DSPBSIZE (dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x71190)way too many unused cases...
we should probably remove them all in one patch and whoever is introducing them later should already introduce with thedev_priv...
Quoted 7 lines
Quoted 3 lines
but again, up to you
Reviewed-by Rodrigo Vivi <[email protected]>Dropped the changes touching unused macros, and pushed everything else to din. I've got a separate series cleaning up gvt a bit and removing the unused ones.
PS. Fixed a couple of whitespace issues while pushing.
Quoted 15 lines
Thanks for the review!
BR,
Jani.Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/i915/i915_reg.h +0
-0#define _DSPBSURF (DISPLAY_MMIO_BASE(dev_priv) + 0x7119C)#define _DSPBTILEOFF (DISPLAY_MMIO_BASE(dev_priv) + 0x711A4)#define _DSPBOFFSET (DISPLAY_MMIO_BASE(dev_priv) + 0x711A4)Signature · 1 line
2.39.2
Signature · 1 line
Jani Nikula, Intel