drm/i915: finish the job of removing implicit dev_priv
Subsystems (4)
cover drm/i915: finish the job of removing implicit dev_priv
Rip the band-aid. Finish the job of removing implicit dev_priv usage. It's a lot, but it's straightforward.
BR,
Jani.
Jani Nikula (65):
drm/i915: pass dev_priv explicitly to DPLL
drm/i915: pass dev_priv explicitly to DPLL_MD drm/i915: pass dev_priv explicitly to TRANS_HTOTAL drm/i915: pass dev_priv explicitly to TRANS_HBLANK drm/i915: pass dev_priv explicitly to TRANS_HSYNC drm/i915: pass dev_priv explicitly to TRANS_VTOTAL drm/i915: pass dev_priv explicitly to TRANS_VBLANK drm/i915: pass dev_priv explicitly to TRANS_VSYNC drm/i915: pass dev_priv explicitly to BCLRPAT drm/i915: pass dev_priv explicitly to TRANS_VSYNCSHIFT drm/i915: pass dev_priv explicitly to PIPESRC drm/i915: pass dev_priv explicitly to TRANS_MULT drm/i915: pass dev_priv explicitly to PORT_HOTPLUG_EN drm/i915: pass dev_priv explicitly to PORT_HOTPLUG_STAT drm/i915: pass dev_priv explicitly to PFIT_CONTROL drm/i915: pass dev_priv explicitly to PFIT_PGM_RATIOS drm/i915: pass dev_priv explicitly to PFIT_AUTO_RATIOS drm/i915: pass dev_priv explicitly to TRANSCONF drm/i915: pass dev_priv explicitly to PIPEDSL drm/i915: pass dev_priv explicitly to PIPEFRAME drm/i915: pass dev_priv explicitly to PIPEFRAMEPIXEL drm/i915: pass dev_priv explicitly to PIPESTAT drm/i915: pass dev_priv explicitly to PIPE_ARB_CTL drm/i915: pass dev_priv explicitly to ICL_PIPESTATUS drm/i915: pass dev_priv explicitly to DSPARB drm/i915: pass dev_priv explicitly to DSPFW1 drm/i915: pass dev_priv explicitly to DSPFW2 drm/i915: pass dev_priv explicitly to DSPFW3 drm/i915: pass dev_priv explicitly to PIPE_FRMCOUNT_G4X drm/i915: pass dev_priv explicitly to PIPE_FLIPCOUNT_G4X drm/i915: pass dev_priv explicitly to CHV_BLEND drm/i915: pass dev_priv explicitly to CHV_CANVAS drm/i915: pass dev_priv explicitly to SWF0
drm/i915: pass dev_priv explicitly to SWF1
drm/i915: pass dev_priv explicitly to SWF3
drm/i915: pass dev_priv explicitly to _PIPEBDSL drm/i915: pass dev_priv explicitly to _TRANSBCONF drm/i915: pass dev_priv explicitly to _PIPEBSTAT drm/i915: pass dev_priv explicitly to _PIPEB_FRMCOUNT_G4X drm/i915: pass dev_priv explicitly to _PIPEB_FLIPCOUNT_G4X drm/i915: pass dev_priv explicitly to _DSPBCNTR drm/i915: pass dev_priv explicitly to _DSPBADDR drm/i915: pass dev_priv explicitly to _DSPBSTRIDE drm/i915: pass dev_priv explicitly to _DSPBPOS drm/i915: pass dev_priv explicitly to _DSPBSIZE drm/i915: pass dev_priv explicitly to _DSPBSURF drm/i915: pass dev_priv explicitly to _DSPBTILEOFF drm/i915: pass dev_priv explicitly to _DSPBOFFSET drm/i915: pass dev_priv explicitly to _DSPBSURFLIVE drm/i915: pass dev_priv explicitly to PIPE_DATA_M1 drm/i915: pass dev_priv explicitly to PIPE_DATA_N1 drm/i915: pass dev_priv explicitly to PIPE_DATA_M2 drm/i915: pass dev_priv explicitly to PIPE_DATA_N2 drm/i915: pass dev_priv explicitly to PIPE_LINK_M1 drm/i915: pass dev_priv explicitly to PIPE_LINK_N1 drm/i915: pass dev_priv explicitly to PIPE_LINK_M2 drm/i915: pass dev_priv explicitly to PIPE_LINK_N2 drm/i915: pass dev_priv explicitly to HSW_STEREO_3D_CTL drm/i915: pass dev_priv explicitly to TRANS_DDI_FUNC_CTL drm/i915: pass dev_priv explicitly to TRANS_DDI_FUNC_CTL2 drm/i915: pass dev_priv explicitly to TGL_DP_TP_CTL drm/i915: pass dev_priv explicitly to TGL_DP_TP_STATUS drm/i915: pass dev_priv explicitly to TRANS_MSA_MISC drm/i915: pass dev_priv explicitly to TRANS_SET_CONTEXT_LATENCY drm/i915: pass dev_priv explicitly to MTL_CLKGATE_DIS_TRANS
drivers/gpu/drm/i915/display/g4x_dp.c | 2 +- drivers/gpu/drm/i915/display/i9xx_plane.c | 2 +- drivers/gpu/drm/i915/display/i9xx_wm.c | 87 ++++---- drivers/gpu/drm/i915/display/icl_dsi.c | 46 +++-- drivers/gpu/drm/i915/display/intel_crt.c | 50 +++-- drivers/gpu/drm/i915/display/intel_ddi.c | 47 +++-- drivers/gpu/drm/i915/display/intel_display.c | 193 ++++++++++-------- .../drm/i915/display/intel_display_debugfs.c | 2 +- .../gpu/drm/i915/display/intel_display_irq.c | 17 +- .../drm/i915/display/intel_display_power.c | 2 +- .../i915/display/intel_display_power_well.c | 14 +- drivers/gpu/drm/i915/display/intel_dp_mst.c | 5 +- drivers/gpu/drm/i915/display/intel_dpll.c | 63 +++--- drivers/gpu/drm/i915/display/intel_drrs.c | 2 +- drivers/gpu/drm/i915/display/intel_dvo.c | 5 +- drivers/gpu/drm/i915/display/intel_fdi.c | 15 +- .../drm/i915/display/intel_fifo_underrun.c | 13 +- drivers/gpu/drm/i915/display/intel_hdcp.c | 3 +- drivers/gpu/drm/i915/display/intel_hdmi.c | 5 +- .../gpu/drm/i915/display/intel_hotplug_irq.c | 12 +- drivers/gpu/drm/i915/display/intel_lvds.c | 2 +- drivers/gpu/drm/i915/display/intel_overlay.c | 10 +- .../gpu/drm/i915/display/intel_pch_display.c | 21 +- drivers/gpu/drm/i915/display/intel_pps.c | 2 +- drivers/gpu/drm/i915/display/intel_psr.c | 5 +- drivers/gpu/drm/i915/display/intel_vblank.c | 14 +- drivers/gpu/drm/i915/display/vlv_dsi.c | 3 +- drivers/gpu/drm/i915/gvt/cmd_parser.c | 2 +- drivers/gpu/drm/i915/gvt/display.c | 59 +++--- drivers/gpu/drm/i915/gvt/fb_decoder.c | 6 +- drivers/gpu/drm/i915/gvt/handlers.c | 28 +-- drivers/gpu/drm/i915/i915_irq.c | 5 +- drivers/gpu/drm/i915/i915_reg.h | 130 ++++++------ drivers/gpu/drm/i915/i915_suspend.c | 48 +++-- drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 180 ++++++++-------- 35 files changed, 610 insertions(+), 490 deletions(-)
Signature · 1 line
2.39.2
PATCH 1/65 drm/i915: pass dev_priv explicitly to DPLL
Avoid the implicit dev_priv local variable use, and pass dev_priv explicitly to the DPLL register macro.
--- drivers/gpu/drm/i915/display/intel_display.c | 21 ++++----- .../drm/i915/display/intel_display_power.c | 2 +- .../i915/display/intel_display_power_well.c | 6 +-- drivers/gpu/drm/i915/display/intel_dpll.c | 45 ++++++++++--------- drivers/gpu/drm/i915/display/intel_dvo.c | 5 ++- drivers/gpu/drm/i915/display/intel_pps.c | 2 +- drivers/gpu/drm/i915/i915_reg.h | 2 +- 7 files changed, 43 insertions(+), 40 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +11 -10
@@ -382,11 +382,11 @@ void vlv_wait_port_ready(struct drm_i915_private *dev_priv, fallthrough;case PORT_B : port_mask =DPLL_PORTB_READY_MASK ; - dpll_reg =DPLL (0 ); + dpll_reg =DPLL (dev_priv,0 );break ;case PORT_C : port_mask =DPLL_PORTC_READY_MASK ; - dpll_reg =DPLL (0 ); + dpll_reg =DPLL (dev_priv,0 ); expected_mask <<=4 ;break ;case PORT_D :
@@ -8212,11 +8212,12 @@ void i830_enable_pipe(struct drm_i915_private *dev_priv, enum pipe pipe)* the P1/P2 dividers. Otherwise the DPLL will keep using the old * dividers, even though the register value does change. */ -intel_de_write (dev_priv,DPLL (pipe), dpll & ~DPLL_VGA_MODE_DIS ); -intel_de_write (dev_priv,DPLL (pipe), dpll); +intel_de_write (dev_priv,DPLL (dev_priv, pipe), + dpll & ~DPLL_VGA_MODE_DIS ); +intel_de_write (dev_priv,DPLL (dev_priv, pipe), dpll);/* Wait for the clocks to stabilize. */ -intel_de_posting_read (dev_priv,DPLL (pipe)); +intel_de_posting_read (dev_priv,DPLL (dev_priv, pipe));udelay (150 );/* The pixel multiplier can only be updated once the
@@ -8224,12 +8225,12 @@ void i830_enable_pipe(struct drm_i915_private *dev_priv, enum pipe pipe)* * So write it again. */ -intel_de_write (dev_priv,DPLL (pipe), dpll); +intel_de_write (dev_priv,DPLL (dev_priv, pipe), dpll);/* We do this three times for luck */ for (i =0 ; i <3 ; i++) { -intel_de_write (dev_priv,DPLL (pipe), dpll); -intel_de_posting_read (dev_priv,DPLL (pipe)); +intel_de_write (dev_priv,DPLL (dev_priv, pipe), dpll); +intel_de_posting_read (dev_priv,DPLL (dev_priv, pipe));udelay (150 );/* wait for warmup */ }
@@ -8262,8 +8263,8 @@ void i830_disable_pipe(struct drm_i915_private *dev_priv, enum pipe pipe)intel_wait_for_pipe_scanline_stopped (crtc); -intel_de_write (dev_priv,DPLL (pipe),DPLL_VGA_MODE_DIS ); -intel_de_posting_read (dev_priv,DPLL (pipe)); +intel_de_write (dev_priv,DPLL (dev_priv, pipe),DPLL_VGA_MODE_DIS ); +intel_de_posting_read (dev_priv,DPLL (dev_priv, pipe)); }void intel_hpd_poll_fini (struct drm_i915_private *i915)
drivers/gpu/drm/i915/display/intel_display_power.c +1 -1
@@ -1772,7 +1772,7 @@ static void chv_phy_control_init(struct drm_i915_private *dev_priv)* current lane status. */ if (intel_power_well_is_enabled (dev_priv, cmn_bc)) { -u32 status =intel_de_read (dev_priv,DPLL (PIPE_A )); +u32 status =intel_de_read (dev_priv,DPLL (dev_priv,PIPE_A ));unsigned int mask; mask = status &DPLL_PORTB_READY_MASK ;
drivers/gpu/drm/i915/display/intel_display_power_well.c +3 -3
@@ -1196,13 +1196,13 @@ static void vlv_display_power_well_init(struct drm_i915_private *dev_priv)* CHV DPLL B/C have some issues if VGA mode is enabled. */ for_each_pipe (dev_priv, pipe) { -u32 val =intel_de_read (dev_priv,DPLL (pipe)); +u32 val =intel_de_read (dev_priv,DPLL (dev_priv, pipe)); val |=DPLL_REF_CLK_ENABLE_VLV |DPLL_VGA_MODE_DIS ;if (pipe !=PIPE_A ) val |=DPLL_INTEGRATED_CRI_CLK_VLV ; -intel_de_write (dev_priv,DPLL (pipe), val); +intel_de_write (dev_priv,DPLL (dev_priv, pipe), val); }vlv_init_display_clock_gating (dev_priv);
@@ -1355,7 +1355,7 @@ static void assert_chv_phy_status(struct drm_i915_private *dev_priv)*/ if (BITS_SET (phy_control,PHY_CH_POWER_DOWN_OVRD (0xf ,DPIO_PHY0 ,DPIO_CH1 )) && - (intel_de_read (dev_priv,DPLL (PIPE_B )) &DPLL_VCO_ENABLE ) ==0 ) + (intel_de_read (dev_priv,DPLL (dev_priv,PIPE_B )) &DPLL_VCO_ENABLE ) ==0 ) phy_status |=PHY_STATUS_CMN_LDO (DPIO_PHY0 ,DPIO_CH1 ); if (BITS_SET(phy_control,
drivers/gpu/drm/i915/display/intel_dpll.c +23 -22
127 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_dvo.c +3 -2
@@ -456,13 +456,14 @@ static bool intel_dvo_init_dev(struct drm_i915_private *dev_priv,* the device. */ for_each_pipe (dev_priv, pipe) - dpll[pipe] =intel_de_rmw (dev_priv,DPLL (pipe),0 ,DPLL_DVO_2X_MODE ); + dpll[pipe] =intel_de_rmw (dev_priv,DPLL (dev_priv, pipe),0 , +DPLL_DVO_2X_MODE ); ret = dvo->dev_ops->init (&intel_dvo->dev, i2c);/* restore the DVO 2x clock state to original */ for_each_pipe (dev_priv, pipe) { -intel_de_write (dev_priv,DPLL (pipe), dpll[pipe]); +intel_de_write (dev_priv,DPLL (dev_priv, pipe), dpll[pipe]); }intel_gmbus_force_bit (i2c, false);
drivers/gpu/drm/i915/display/intel_pps.c +1 -1
@@ -119,7 +119,7 @@ vlv_power_sequencer_kick(struct intel_dp *intel_dp)else DP |=DP_PIPE_SEL (pipe); - pll_enabled =intel_de_read (dev_priv,DPLL (pipe)) &DPLL_VCO_ENABLE ; + pll_enabled =intel_de_read (dev_priv,DPLL (dev_priv, pipe)) &DPLL_VCO_ENABLE ;/* * The DPLL for the pipe must be enabled for this to work.
drivers/gpu/drm/i915/i915_reg.h +1 -1
@@ -668,7 +668,7 @@#define _DPLL_A 0x6014#define _DPLL_B 0x6018#define _CHV_DPLL_C 0x6030 -#define DPLL (pipe) _MMIO_BASE_PIPE3(DISPLAY_MMIO_BASE(dev_priv), \ +#define DPLL (dev_priv, pipe) _MMIO_BASE_PIPE3(DISPLAY_MMIO_BASE(dev_priv), \ (pipe), _DPLL_A, _DPLL_B, _CHV_DPLL_C)#define VGA0 _MMIO(0x6000)
Signature · 1 line
2.39.2
Re: [PATCH 01/65] drm/i915: pass dev_priv explicitly to DPLL
Quoted 4 lines · Jani Nikula
Avoid the implicit
dev_privlocal variable use, and passdev_privexplicitly to the DPLL register macro.Signed-off-by Jani Nikula <[email protected]>
(
even though it is a big series and overall it looks all right,
I will put one by one for 2 reasons:
- so I ensure I don't miss details and I know where I stopped
- so you can use dim b4 directly without extra rebase and adding my rv-b one by one... )
Quoted 306 lines
--- drivers/gpu/drm/i915/display/intel_display.c | 21 ++++----- .../drm/i915/display/intel_display_power.c | 2 +- .../i915/display/intel_display_power_well.c | 6 +-- drivers/gpu/drm/i915/display/intel_dpll.c | 45 ++++++++++--------- drivers/gpu/drm/i915/display/intel_dvo.c | 5 ++- drivers/gpu/drm/i915/display/intel_pps.c | 2 +- drivers/gpu/drm/i915/i915_reg.h | 2 +- 7 files changed, 43 insertions(+), 40 deletions(-)drivers/gpu/drm/i915/display/intel_display.c +11
-10@@ -382,11 +382,11 @@ void vlv_wait_port_ready(struct drm_i915_private *dev_priv, fallthrough;case PORT_B : port_mask =DPLL_PORTB_READY_MASK ; - dpll_reg =DPLL (0 ); + dpll_reg =DPLL (dev_priv,0 );break ;case PORT_C : port_mask =DPLL_PORTC_READY_MASK ; - dpll_reg =DPLL (0 ); + dpll_reg =DPLL (dev_priv,0 ); expected_mask <<=4 ;break ;case PORT_D :@@ -8212,11 +8212,12 @@ void i830_enable_pipe(struct drm_i915_private *dev_priv, enum pipe pipe)* the P1/P2 dividers. Otherwise the DPLL will keep using the old * dividers, even though the register value does change. */ -intel_de_write (dev_priv,DPLL (pipe), dpll & ~DPLL_VGA_MODE_DIS ); -intel_de_write (dev_priv,DPLL (pipe), dpll); +intel_de_write (dev_priv,DPLL (dev_priv, pipe), + dpll & ~DPLL_VGA_MODE_DIS ); +intel_de_write (dev_priv,DPLL (dev_priv, pipe), dpll);/* Wait for the clocks to stabilize. */ -intel_de_posting_read (dev_priv,DPLL (pipe)); +intel_de_posting_read (dev_priv,DPLL (dev_priv, pipe));udelay (150 );/* The pixel multiplier can only be updated once the @@ -8224,12 +8225,12 @@ void i830_enable_pipe(struct drm_i915_private *dev_priv, enum pipe pipe)* * So write it again. */ -intel_de_write (dev_priv,DPLL (pipe), dpll); +intel_de_write (dev_priv,DPLL (dev_priv, pipe), dpll);/* We do this three times for luck */ for (i =0 ; i <3 ; i++) { -intel_de_write (dev_priv,DPLL (pipe), dpll); -intel_de_posting_read (dev_priv,DPLL (pipe)); +intel_de_write (dev_priv,DPLL (dev_priv, pipe), dpll); +intel_de_posting_read (dev_priv,DPLL (dev_priv, pipe));udelay (150 );/* wait for warmup */ }@@ -8262,8 +8263,8 @@ void i830_disable_pipe(struct drm_i915_private *dev_priv, enum pipe pipe)intel_wait_for_pipe_scanline_stopped (crtc); -intel_de_write (dev_priv,DPLL (pipe),DPLL_VGA_MODE_DIS ); -intel_de_posting_read (dev_priv,DPLL (pipe)); +intel_de_write (dev_priv,DPLL (dev_priv, pipe),DPLL_VGA_MODE_DIS ); +intel_de_posting_read (dev_priv,DPLL (dev_priv, pipe)); }void intel_hpd_poll_fini (struct drm_i915_private *i915)drivers/gpu/drm/i915/display/intel_display_power.c +1
-1@@ -1772,7 +1772,7 @@ static void chv_phy_control_init(struct drm_i915_private *dev_priv)* current lane status. */ if (intel_power_well_is_enabled (dev_priv, cmn_bc)) { -u32 status =intel_de_read (dev_priv,DPLL (PIPE_A )); +u32 status =intel_de_read (dev_priv,DPLL (dev_priv,PIPE_A ));unsigned int mask; mask = status &DPLL_PORTB_READY_MASK ;drivers/gpu/drm/i915/display/intel_display_power_well.c +3
-3@@ -1196,13 +1196,13 @@ static void vlv_display_power_well_init(struct drm_i915_private *dev_priv)* CHV DPLL B/C have some issues if VGA mode is enabled. */ for_each_pipe (dev_priv, pipe) { -u32 val =intel_de_read (dev_priv,DPLL (pipe)); +u32 val =intel_de_read (dev_priv,DPLL (dev_priv, pipe)); val |=DPLL_REF_CLK_ENABLE_VLV |DPLL_VGA_MODE_DIS ;if (pipe !=PIPE_A ) val |=DPLL_INTEGRATED_CRI_CLK_VLV ; -intel_de_write (dev_priv,DPLL (pipe), val); +intel_de_write (dev_priv,DPLL (dev_priv, pipe), val); }vlv_init_display_clock_gating (dev_priv);@@ -1355,7 +1355,7 @@ static void assert_chv_phy_status(struct drm_i915_private *dev_priv)*/ if (BITS_SET (phy_control,PHY_CH_POWER_DOWN_OVRD (0xf ,DPIO_PHY0 ,DPIO_CH1 )) && - (intel_de_read (dev_priv,DPLL (PIPE_B )) &DPLL_VCO_ENABLE ) ==0 ) + (intel_de_read (dev_priv,DPLL (dev_priv,PIPE_B )) &DPLL_VCO_ENABLE ) ==0 ) phy_status |=PHY_STATUS_CMN_LDO (DPIO_PHY0 ,DPIO_CH1 ); if (BITS_SET(phy_control,drivers/gpu/drm/i915/display/intel_dpll.c +23
-22@@ -403,7 +403,7 @@ void i9xx_dpll_get_hw_state(struct intel_crtc *crtc, hw_state->dpll_md = tmp; } - hw_state->dpll =intel_de_read (dev_priv,DPLL (crtc->pipe)); + hw_state->dpll =intel_de_read (dev_priv,DPLL (dev_priv, crtc->pipe));if (!IS_VALLEYVIEW (dev_priv) && !IS_CHERRYVIEW (dev_priv)) { hw_state->fp0 =intel_de_read (dev_priv,FP0 (crtc->pipe));@@ -1842,11 +1842,12 @@ void i9xx_enable_pll(const struct intel_crtc_state *crtc_state)* the P1/P2 dividers. Otherwise the DPLL will keep using the old * dividers, even though the register value does change. */ -intel_de_write (dev_priv,DPLL (pipe), hw_state->dpll & ~DPLL_VGA_MODE_DIS ); -intel_de_write (dev_priv,DPLL (pipe), hw_state->dpll); +intel_de_write (dev_priv,DPLL (dev_priv, pipe), + hw_state->dpll & ~DPLL_VGA_MODE_DIS ); +intel_de_write (dev_priv,DPLL (dev_priv, pipe), hw_state->dpll);/* Wait for the clocks to stabilize. */ -intel_de_posting_read (dev_priv,DPLL (pipe)); +intel_de_posting_read (dev_priv,DPLL (dev_priv, pipe));udelay (150 );if (DISPLAY_VER (dev_priv) >=4 ) {@@ -1857,13 +1858,13 @@ void i9xx_enable_pll(const struct intel_crtc_state *crtc_state)* * So write it again. */ -intel_de_write (dev_priv,DPLL (pipe), hw_state->dpll); +intel_de_write (dev_priv,DPLL (dev_priv, pipe), hw_state->dpll); }/* We do this three times for luck */ for (i =0 ; i <3 ; i++) { -intel_de_write (dev_priv,DPLL (pipe), hw_state->dpll); -intel_de_posting_read (dev_priv,DPLL (pipe)); +intel_de_write (dev_priv,DPLL (dev_priv, pipe), hw_state->dpll); +intel_de_posting_read (dev_priv,DPLL (dev_priv, pipe));udelay (150 );/* wait for warmup */ } }@@ -1991,11 +1992,11 @@ static void _vlv_enable_pll(const struct intel_crtc_state *crtc_state)const struct i9xx_dpll_hw_state *hw_state = &crtc_state->dpll_hw_state.i9xx;enum pipe pipe = crtc->pipe; -intel_de_write (dev_priv,DPLL (pipe), hw_state->dpll); -intel_de_posting_read (dev_priv,DPLL (pipe)); +intel_de_write (dev_priv,DPLL (dev_priv, pipe), hw_state->dpll); +intel_de_posting_read (dev_priv,DPLL (dev_priv, pipe));udelay (150 ); -if (intel_de_wait_for_set (dev_priv,DPLL (pipe),DPLL_LOCK_VLV ,1 )) +if (intel_de_wait_for_set (dev_priv,DPLL (dev_priv, pipe),DPLL_LOCK_VLV ,1 ))drm_err (&dev_priv->drm,"DPLL %d failed to lock\n" , pipe); }@@ -2012,7 +2013,7 @@ void vlv_enable_pll(const struct intel_crtc_state *crtc_state)assert_pps_unlocked (dev_priv, pipe);/* Enable Refclk */ -intel_de_write (dev_priv,DPLL (pipe), +intel_de_write (dev_priv,DPLL (dev_priv, pipe), hw_state->dpll & ~(DPLL_VCO_ENABLE |DPLL_EXT_BUFFER_ENABLE_VLV ));if (hw_state->dpll &DPLL_VCO_ENABLE ) {@@ -2138,10 +2139,10 @@ static void _chv_enable_pll(const struct intel_crtc_state *crtc_state)udelay (1 );/* Enable PLL */ -intel_de_write (dev_priv,DPLL (pipe), hw_state->dpll); +intel_de_write (dev_priv,DPLL (dev_priv, pipe), hw_state->dpll);/* Check PLL is locked */ -if (intel_de_wait_for_set (dev_priv,DPLL (pipe),DPLL_LOCK_VLV ,1 )) +if (intel_de_wait_for_set (dev_priv,DPLL (dev_priv, pipe),DPLL_LOCK_VLV ,1 ))drm_err (&dev_priv->drm,"PLL %d failed to lock\n" , pipe); }@@ -2158,7 +2159,7 @@ void chv_enable_pll(const struct intel_crtc_state *crtc_state)assert_pps_unlocked (dev_priv, pipe);/* Enable Refclk and SSC */ -intel_de_write (dev_priv,DPLL (pipe), +intel_de_write (dev_priv,DPLL (dev_priv, pipe), hw_state->dpll & ~DPLL_VCO_ENABLE );if (hw_state->dpll &DPLL_VCO_ENABLE ) {@@ -2183,7 +2184,7 @@ void chv_enable_pll(const struct intel_crtc_state *crtc_state)* We should always have it disabled. */ drm_WARN_ON (&dev_priv->drm, - (intel_de_read (dev_priv,DPLL (PIPE_B )) & + (intel_de_read (dev_priv,DPLL (dev_priv,PIPE_B )) &DPLL_VGA_MODE_DIS ) ==0 ); }else {intel_de_write (dev_priv,DPLL_MD (pipe), hw_state->dpll_md);@@ -2241,8 +2242,8 @@ void vlv_disable_pll(struct drm_i915_private *dev_priv, enum pipe pipe)if (pipe !=PIPE_A ) val |=DPLL_INTEGRATED_CRI_CLK_VLV ; -intel_de_write (dev_priv,DPLL (pipe), val); -intel_de_posting_read (dev_priv,DPLL (pipe)); +intel_de_write (dev_priv,DPLL (dev_priv, pipe), val); +intel_de_posting_read (dev_priv,DPLL (dev_priv, pipe)); }void chv_disable_pll (struct drm_i915_private *dev_priv,enum pipe pipe)@@ -2259,8 +2260,8 @@ void chv_disable_pll(struct drm_i915_private *dev_priv, enum pipe pipe)if (pipe !=PIPE_A ) val |=DPLL_INTEGRATED_CRI_CLK_VLV ; -intel_de_write (dev_priv,DPLL (pipe), val); -intel_de_posting_read (dev_priv,DPLL (pipe)); +intel_de_write (dev_priv,DPLL (dev_priv, pipe), val); +intel_de_posting_read (dev_priv,DPLL (dev_priv, pipe));vlv_dpio_get (dev_priv);@@ -2285,8 +2286,8 @@ void i9xx_disable_pll(const struct intel_crtc_state *crtc_state)/* Make sure the pipe isn't still relying on us */ assert_transcoder_disabled (dev_priv, crtc_state->cpu_transcoder); -intel_de_write (dev_priv,DPLL (pipe),DPLL_VGA_MODE_DIS ); -intel_de_posting_read (dev_priv,DPLL (pipe)); +intel_de_write (dev_priv,DPLL (dev_priv, pipe),DPLL_VGA_MODE_DIS ); +intel_de_posting_read (dev_priv,DPLL (dev_priv, pipe)); }@@ -2312,7 +2313,7 @@ static void assert_pll(struct drm_i915_private *dev_priv, {bool cur_state; - cur_state =intel_de_read (dev_priv,DPLL (pipe)) &DPLL_VCO_ENABLE ; + cur_state =intel_de_read (dev_priv,DPLL (dev_priv, pipe)) &DPLL_VCO_ENABLE ;I915_STATE_WARN (dev_priv, cur_state != state,"PLL state assertion failure (expected %s, current %s)\n" ,str_on_off (state),str_on_off (cur_state));drivers/gpu/drm/i915/display/intel_dvo.c +3
-2@@ -456,13 +456,14 @@ static bool intel_dvo_init_dev(struct drm_i915_private *dev_priv,* the device. */ for_each_pipe (dev_priv, pipe) - dpll[pipe] =intel_de_rmw (dev_priv,DPLL (pipe),0 ,DPLL_DVO_2X_MODE ); + dpll[pipe] =intel_de_rmw (dev_priv,DPLL (dev_priv, pipe),0 , +DPLL_DVO_2X_MODE ); ret = dvo->dev_ops->init (&intel_dvo->dev, i2c);/* restore the DVO 2x clock state to original */ for_each_pipe (dev_priv, pipe) { -intel_de_write (dev_priv,DPLL (pipe), dpll[pipe]); +intel_de_write (dev_priv,DPLL (dev_priv, pipe), dpll[pipe]); }intel_gmbus_force_bit (i2c, false);drivers/gpu/drm/i915/display/intel_pps.c +1
-1@@ -119,7 +119,7 @@ vlv_power_sequencer_kick(struct intel_dp *intel_dp)else DP |=DP_PIPE_SEL (pipe); - pll_enabled =intel_de_read (dev_priv,DPLL (pipe)) &DPLL_VCO_ENABLE ; + pll_enabled =intel_de_read (dev_priv,DPLL (dev_priv, pipe)) &DPLL_VCO_ENABLE ;/* * The DPLL for the pipe must be enabled for this to work. drivers/gpu/drm/i915/i915_reg.h +1
-1@@ -668,7 +668,7 @@#define _DPLL_A 0x6014#define _DPLL_B 0x6018#define _CHV_DPLL_C 0x6030 -#define DPLL (pipe) _MMIO_BASE_PIPE3(DISPLAY_MMIO_BASE(dev_priv), \ +#define DPLL (dev_priv, pipe) _MMIO_BASE_PIPE3(DISPLAY_MMIO_BASE(dev_priv), \ (pipe), _DPLL_A, _DPLL_B, _CHV_DPLL_C)#define VGA0 _MMIO(0x6000)Signature · 1 line
2.39.2
PATCH 2/65 drm/i915: pass dev_priv explicitly to DPLL_MD
In reply to Jani NikulaAvoid the implicit dev_priv local variable use, and pass dev_priv explicitly to the DPLL_MD register macro.
--- drivers/gpu/drm/i915/display/intel_dpll.c | 18 +++++++++++------- drivers/gpu/drm/i915/i915_reg.h | 2 +- 2 files changed, 12 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/display/intel_dpll.c +11 -7
@@ -398,7 +398,8 @@ void i9xx_dpll_get_hw_state(struct intel_crtc *crtc,if (IS_CHERRYVIEW (dev_priv) && crtc->pipe !=PIPE_A ) tmp = dev_priv->display.state.chv_dpll_md[crtc->pipe];else - tmp =intel_de_read (dev_priv,DPLL_MD (crtc->pipe)); + tmp =intel_de_read (dev_priv, +DPLL_MD (dev_priv, crtc->pipe)); hw_state->dpll_md = tmp; }
@@ -1851,7 +1852,8 @@ void i9xx_enable_pll(const struct intel_crtc_state *crtc_state)udelay (150 );if (DISPLAY_VER (dev_priv) >=4 ) { -intel_de_write (dev_priv,DPLL_MD (pipe), hw_state->dpll_md); +intel_de_write (dev_priv,DPLL_MD (dev_priv, pipe), + hw_state->dpll_md); }else {/* The pixel multiplier can only be updated once the * DPLL is enabled and the clocks are stable.
@@ -2021,8 +2023,8 @@ void vlv_enable_pll(const struct intel_crtc_state *crtc_state)_vlv_enable_pll (crtc_state); } -intel_de_write (dev_priv,DPLL_MD (pipe), hw_state->dpll_md); -intel_de_posting_read (dev_priv,DPLL_MD (pipe)); +intel_de_write (dev_priv,DPLL_MD (dev_priv, pipe), hw_state->dpll_md); +intel_de_posting_read (dev_priv,DPLL_MD (dev_priv, pipe)); }static void chv_prepare_pll (const struct intel_crtc_state *crtc_state)
@@ -2175,7 +2177,8 @@ void chv_enable_pll(const struct intel_crtc_state *crtc_state)* the value from DPLLBMD to either pipe B or C. */ intel_de_write (dev_priv,CBR4_VLV ,CBR_DPLLBMD_PIPE (pipe)); -intel_de_write (dev_priv,DPLL_MD (PIPE_B ), hw_state->dpll_md); +intel_de_write (dev_priv,DPLL_MD (dev_priv,PIPE_B ), + hw_state->dpll_md);intel_de_write (dev_priv,CBR4_VLV ,0 ); dev_priv->display.state.chv_dpll_md[pipe] = hw_state->dpll_md;
@@ -2187,8 +2190,9 @@ void chv_enable_pll(const struct intel_crtc_state *crtc_state) (intel_de_read (dev_priv,DPLL (dev_priv,PIPE_B )) & DPLL_VGA_MODE_DIS) == 0); }else { -intel_de_write (dev_priv,DPLL_MD (pipe), hw_state->dpll_md); -intel_de_posting_read (dev_priv,DPLL_MD (pipe)); +intel_de_write (dev_priv,DPLL_MD (dev_priv, pipe), + hw_state->dpll_md); +intel_de_posting_read (dev_priv,DPLL_MD (dev_priv, pipe)); } }
drivers/gpu/drm/i915/i915_reg.h +1 -1
@@ -768,7 +768,7 @@#define _DPLL_A_MD 0x601c#define _DPLL_B_MD 0x6020#define _CHV_DPLL_C_MD 0x603c -#define DPLL_MD (pipe) _MMIO_BASE_PIPE3(DISPLAY_MMIO_BASE(dev_priv), \ +#define DPLL_MD (dev_priv, pipe) _MMIO_BASE_PIPE3(DISPLAY_MMIO_BASE(dev_priv), \ (pipe), _DPLL_A_MD, _DPLL_B_MD, _CHV_DPLL_C_MD)/*
Signature · 1 line
2.39.2
Re: [PATCH 02/65] drm/i915: pass dev_priv explicitly to DPLL_MD
Quoted 3 lines · Jani Nikula
Avoid the implicit
dev_privlocal variable use, and passdev_privexplicitly to theDPLL_MDregister macro.
Quoted 79 lines
Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/display/intel_dpll.c | 18 +++++++++++------- drivers/gpu/drm/i915/i915_reg.h | 2 +- 2 files changed, 12 insertions(+), 8 deletions(-)drivers/gpu/drm/i915/display/intel_dpll.c +11
-7@@ -398,7 +398,8 @@ void i9xx_dpll_get_hw_state(struct intel_crtc *crtc,if (IS_CHERRYVIEW (dev_priv) && crtc->pipe !=PIPE_A ) tmp = dev_priv->display.state.chv_dpll_md[crtc->pipe];else - tmp =intel_de_read (dev_priv,DPLL_MD (crtc->pipe)); + tmp =intel_de_read (dev_priv, +DPLL_MD (dev_priv, crtc->pipe)); hw_state->dpll_md = tmp; }@@ -1851,7 +1852,8 @@ void i9xx_enable_pll(const struct intel_crtc_state *crtc_state)udelay (150 );if (DISPLAY_VER (dev_priv) >=4 ) { -intel_de_write (dev_priv,DPLL_MD (pipe), hw_state->dpll_md); +intel_de_write (dev_priv,DPLL_MD (dev_priv, pipe), + hw_state->dpll_md); }else {/* The pixel multiplier can only be updated once the * DPLL is enabled and the clocks are stable. @@ -2021,8 +2023,8 @@ void vlv_enable_pll(const struct intel_crtc_state *crtc_state)_vlv_enable_pll (crtc_state); } -intel_de_write (dev_priv,DPLL_MD (pipe), hw_state->dpll_md); -intel_de_posting_read (dev_priv,DPLL_MD (pipe)); +intel_de_write (dev_priv,DPLL_MD (dev_priv, pipe), hw_state->dpll_md); +intel_de_posting_read (dev_priv,DPLL_MD (dev_priv, pipe)); }static void chv_prepare_pll (const struct intel_crtc_state *crtc_state)@@ -2175,7 +2177,8 @@ void chv_enable_pll(const struct intel_crtc_state *crtc_state)* the value from DPLLBMD to either pipe B or C. */ intel_de_write (dev_priv,CBR4_VLV ,CBR_DPLLBMD_PIPE (pipe)); -intel_de_write (dev_priv,DPLL_MD (PIPE_B ), hw_state->dpll_md); +intel_de_write (dev_priv,DPLL_MD (dev_priv,PIPE_B ), + hw_state->dpll_md);intel_de_write (dev_priv,CBR4_VLV ,0 ); dev_priv->display.state.chv_dpll_md[pipe] = hw_state->dpll_md;@@ -2187,8 +2190,9 @@ void chv_enable_pll(const struct intel_crtc_state *crtc_state) (intel_de_read (dev_priv,DPLL (dev_priv,PIPE_B )) & DPLL_VGA_MODE_DIS) == 0); }else { -intel_de_write (dev_priv,DPLL_MD (pipe), hw_state->dpll_md); -intel_de_posting_read (dev_priv,DPLL_MD (pipe)); +intel_de_write (dev_priv,DPLL_MD (dev_priv, pipe), + hw_state->dpll_md); +intel_de_posting_read (dev_priv,DPLL_MD (dev_priv, pipe)); } }drivers/gpu/drm/i915/i915_reg.h +1
-1@@ -768,7 +768,7 @@#define _DPLL_A_MD 0x601c#define _DPLL_B_MD 0x6020#define _CHV_DPLL_C_MD 0x603c -#define DPLL_MD (pipe) _MMIO_BASE_PIPE3(DISPLAY_MMIO_BASE(dev_priv), \ +#define DPLL_MD (dev_priv, pipe) _MMIO_BASE_PIPE3(DISPLAY_MMIO_BASE(dev_priv), \ (pipe), _DPLL_A_MD, _DPLL_B_MD, _CHV_DPLL_C_MD)/* Signature · 1 line
2.39.2
PATCH 3/65 drm/i915: pass dev_priv explicitly to TRANS_HTOTAL
In reply to Jani NikulaAvoid the implicit dev_priv local variable use, and pass dev_priv explicitly to the TRANS_HTOTAL register macro.
--- drivers/gpu/drm/i915/display/icl_dsi.c | 2 +- drivers/gpu/drm/i915/display/intel_display.c | 6 +++--- drivers/gpu/drm/i915/display/intel_pch_display.c | 2 +- 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 ++++---- 6 files changed, 11 insertions(+), 11 deletions(-)
drivers/gpu/drm/i915/display/icl_dsi.c +1 -1
@@ -915,7 +915,7 @@ gen11_dsi_set_transcoder_timings(struct intel_encoder *encoder,/* program TRANS_HTOTAL register */ for_each_dsi_port (port, intel_dsi->ports) { dsi_trans =dsi_port_to_transcoder (port); -intel_de_write (dev_priv,TRANS_HTOTAL (dsi_trans), +intel_de_write (dev_priv,TRANS_HTOTAL (dev_priv, dsi_trans),HACTIVE (hactive -1 ) |HTOTAL (htotal -1 )); }
drivers/gpu/drm/i915/display/intel_display.c +3 -3
@@ -2710,7 +2710,7 @@ static void intel_set_transcoder_timings(const struct intel_crtc_state *crtc_staintel_de_write (dev_priv,TRANS_VSYNCSHIFT (cpu_transcoder), vsyncshift); -intel_de_write (dev_priv,TRANS_HTOTAL (cpu_transcoder), +intel_de_write (dev_priv,TRANS_HTOTAL (dev_priv, cpu_transcoder),HACTIVE (adjusted_mode->crtc_hdisplay -1 ) |HTOTAL (adjusted_mode->crtc_htotal -1 )); intel_de_write(dev_priv, TRANS_HBLANK(cpu_transcoder),
@@ -2811,7 +2811,7 @@ static void intel_get_transcoder_timings(struct intel_crtc *crtc,struct drm_display_mode *adjusted_mode = &pipe_config->hw.adjusted_mode;u32 tmp; - tmp =intel_de_read (dev_priv,TRANS_HTOTAL (cpu_transcoder)); + tmp =intel_de_read (dev_priv,TRANS_HTOTAL (dev_priv, cpu_transcoder)); adjusted_mode->crtc_hdisplay =REG_FIELD_GET (HACTIVE_MASK , tmp) +1 ; adjusted_mode->crtc_htotal =REG_FIELD_GET (HTOTAL_MASK , tmp) +1 ;
@@ -8189,7 +8189,7 @@ void i830_enable_pipe(struct drm_i915_private *dev_priv, enum pipe pipe)PLL_REF_INPUT_DREFCLK |DPLL_VCO_ENABLE ; -intel_de_write (dev_priv,TRANS_HTOTAL (cpu_transcoder), +intel_de_write (dev_priv,TRANS_HTOTAL (dev_priv, cpu_transcoder),HACTIVE (640 -1 ) |HTOTAL (800 -1 ));intel_de_write (dev_priv,TRANS_HBLANK (cpu_transcoder),HBLANK_START (640 -1 ) |HBLANK_END (800 -1 ));
drivers/gpu/drm/i915/display/intel_pch_display.c +1 -1
@@ -224,7 +224,7 @@ static void ilk_pch_transcoder_set_timings(const struct intel_crtc_state *crtc_senum transcoder cpu_transcoder = crtc_state->cpu_transcoder;intel_de_write (dev_priv,PCH_TRANS_HTOTAL (pch_transcoder), -intel_de_read (dev_priv,TRANS_HTOTAL (cpu_transcoder))); +intel_de_read (dev_priv,TRANS_HTOTAL (dev_priv, cpu_transcoder)));intel_de_write (dev_priv,PCH_TRANS_HBLANK (pch_transcoder),intel_de_read (dev_priv,TRANS_HBLANK (cpu_transcoder))); intel_de_write(dev_priv, PCH_TRANS_HSYNC(pch_transcoder),
drivers/gpu/drm/i915/gvt/handlers.c +1 -1
@@ -677,7 +677,7 @@ static void vgpu_update_refresh_rate(struct intel_vgpu *vgpu) link_n =vgpu_vreg_t (vgpu,PIPE_LINK_N1 (TRANSCODER_A ));/* Get H/V total from transcoder timing */ - htotal = (vgpu_vreg_t (vgpu,TRANS_HTOTAL (TRANSCODER_A )) >>TRANS_HTOTAL_SHIFT ); + htotal = (vgpu_vreg_t (vgpu,TRANS_HTOTAL (dev_priv,TRANSCODER_A )) >>TRANS_HTOTAL_SHIFT ); vtotal = (vgpu_vreg_t (vgpu,TRANS_VTOTAL (TRANSCODER_A )) >>TRANS_VTOTAL_SHIFT );if (dp_br && link_n && htotal && vtotal) {
drivers/gpu/drm/i915/i915_reg.h +1 -1
@@ -1217,7 +1217,7 @@#define _TRANS_VSYNC_DSI1 0x6b814#define _TRANS_VSYNCSHIFT_DSI1 0x6b828 -#define TRANS_HTOTAL (trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_HTOTAL_A) +#define TRANS_HTOTAL (dev_priv, trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_HTOTAL_A)#define TRANS_HBLANK (trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_HBLANK_A)#define TRANS_HSYNC (trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_HSYNC_A)#define TRANS_VTOTAL (trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_VTOTAL_A)
drivers/gpu/drm/i915/intel_gvt_mmio_table.c +4 -4
@@ -231,7 +231,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (SPRSCALE (PIPE_C ));MMIO_D (SPRSURFLIVE (PIPE_C ));MMIO_D (REG_50080 (PIPE_C ,PLANE_SPRITE0 )); -MMIO_D (TRANS_HTOTAL (TRANSCODER_A )); +MMIO_D (TRANS_HTOTAL (dev_priv,TRANSCODER_A ));MMIO_D (TRANS_HBLANK (TRANSCODER_A ));MMIO_D (TRANS_HSYNC (TRANSCODER_A ));MMIO_D (TRANS_VTOTAL (TRANSCODER_A ));
@@ -240,7 +240,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (BCLRPAT (TRANSCODER_A ));MMIO_D (TRANS_VSYNCSHIFT (TRANSCODER_A ));MMIO_D (PIPESRC (TRANSCODER_A )); -MMIO_D (TRANS_HTOTAL (TRANSCODER_B )); +MMIO_D (TRANS_HTOTAL (dev_priv,TRANSCODER_B ));MMIO_D (TRANS_HBLANK (TRANSCODER_B ));MMIO_D (TRANS_HSYNC (TRANSCODER_B ));MMIO_D (TRANS_VTOTAL (TRANSCODER_B ));
@@ -249,7 +249,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (BCLRPAT (TRANSCODER_B ));MMIO_D (TRANS_VSYNCSHIFT (TRANSCODER_B ));MMIO_D (PIPESRC (TRANSCODER_B )); -MMIO_D (TRANS_HTOTAL (TRANSCODER_C )); +MMIO_D (TRANS_HTOTAL (dev_priv,TRANSCODER_C ));MMIO_D (TRANS_HBLANK (TRANSCODER_C ));MMIO_D (TRANS_HSYNC (TRANSCODER_C ));MMIO_D (TRANS_VTOTAL (TRANSCODER_C ));
@@ -258,7 +258,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (BCLRPAT (TRANSCODER_C ));MMIO_D (TRANS_VSYNCSHIFT (TRANSCODER_C ));MMIO_D (PIPESRC (TRANSCODER_C )); -MMIO_D (TRANS_HTOTAL (TRANSCODER_EDP )); +MMIO_D (TRANS_HTOTAL (dev_priv,TRANSCODER_EDP ));MMIO_D (TRANS_HBLANK (TRANSCODER_EDP ));MMIO_D (TRANS_HSYNC (TRANSCODER_EDP ));MMIO_D (TRANS_VTOTAL (TRANSCODER_EDP ));
Signature · 1 line
2.39.2
Re: [PATCH 03/65] drm/i915: pass dev_priv explicitly to TRANS_HTOTAL
Quoted 2 lines · Jani Nikula
Avoid the implicit
dev_privlocal variable use, and passdev_privexplicitly to theTRANS_HTOTALregister macro.
Quoted 137 lines
Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/display/icl_dsi.c | 2 +- drivers/gpu/drm/i915/display/intel_display.c | 6 +++--- drivers/gpu/drm/i915/display/intel_pch_display.c | 2 +- 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 ++++---- 6 files changed, 11 insertions(+), 11 deletions(-)drivers/gpu/drm/i915/display/icl_dsi.c +1
-1@@ -915,7 +915,7 @@ gen11_dsi_set_transcoder_timings(struct intel_encoder *encoder,/* program TRANS_HTOTAL register */ for_each_dsi_port (port, intel_dsi->ports) { dsi_trans =dsi_port_to_transcoder (port); -intel_de_write (dev_priv,TRANS_HTOTAL (dsi_trans), +intel_de_write (dev_priv,TRANS_HTOTAL (dev_priv, dsi_trans),HACTIVE (hactive -1 ) |HTOTAL (htotal -1 )); }drivers/gpu/drm/i915/display/intel_display.c +3
-3@@ -2710,7 +2710,7 @@ static void intel_set_transcoder_timings(const struct intel_crtc_state *crtc_staintel_de_write (dev_priv,TRANS_VSYNCSHIFT (cpu_transcoder), vsyncshift); -intel_de_write (dev_priv,TRANS_HTOTAL (cpu_transcoder), +intel_de_write (dev_priv,TRANS_HTOTAL (dev_priv, cpu_transcoder),HACTIVE (adjusted_mode->crtc_hdisplay -1 ) |HTOTAL (adjusted_mode->crtc_htotal -1 )); intel_de_write(dev_priv, TRANS_HBLANK(cpu_transcoder),@@ -2811,7 +2811,7 @@ static void intel_get_transcoder_timings(struct intel_crtc *crtc,struct drm_display_mode *adjusted_mode = &pipe_config->hw.adjusted_mode;u32 tmp; - tmp =intel_de_read (dev_priv,TRANS_HTOTAL (cpu_transcoder)); + tmp =intel_de_read (dev_priv,TRANS_HTOTAL (dev_priv, cpu_transcoder)); adjusted_mode->crtc_hdisplay =REG_FIELD_GET (HACTIVE_MASK , tmp) +1 ; adjusted_mode->crtc_htotal =REG_FIELD_GET (HTOTAL_MASK , tmp) +1 ;@@ -8189,7 +8189,7 @@ void i830_enable_pipe(struct drm_i915_private *dev_priv, enum pipe pipe)PLL_REF_INPUT_DREFCLK |DPLL_VCO_ENABLE ; -intel_de_write (dev_priv,TRANS_HTOTAL (cpu_transcoder), +intel_de_write (dev_priv,TRANS_HTOTAL (dev_priv, cpu_transcoder),HACTIVE (640 -1 ) |HTOTAL (800 -1 ));intel_de_write (dev_priv,TRANS_HBLANK (cpu_transcoder),HBLANK_START (640 -1 ) |HBLANK_END (800 -1 ));drivers/gpu/drm/i915/display/intel_pch_display.c +1
-1@@ -224,7 +224,7 @@ static void ilk_pch_transcoder_set_timings(const struct intel_crtc_state *crtc_senum transcoder cpu_transcoder = crtc_state->cpu_transcoder;intel_de_write (dev_priv,PCH_TRANS_HTOTAL (pch_transcoder), -intel_de_read (dev_priv,TRANS_HTOTAL (cpu_transcoder))); +intel_de_read (dev_priv,TRANS_HTOTAL (dev_priv, cpu_transcoder)));intel_de_write (dev_priv,PCH_TRANS_HBLANK (pch_transcoder),intel_de_read (dev_priv,TRANS_HBLANK (cpu_transcoder))); intel_de_write(dev_priv, PCH_TRANS_HSYNC(pch_transcoder),drivers/gpu/drm/i915/gvt/handlers.c +1
-1@@ -677,7 +677,7 @@ static void vgpu_update_refresh_rate(struct intel_vgpu *vgpu) link_n =vgpu_vreg_t (vgpu,PIPE_LINK_N1 (TRANSCODER_A ));/* Get H/V total from transcoder timing */ - htotal = (vgpu_vreg_t (vgpu,TRANS_HTOTAL (TRANSCODER_A )) >>TRANS_HTOTAL_SHIFT ); + htotal = (vgpu_vreg_t (vgpu,TRANS_HTOTAL (dev_priv,TRANSCODER_A )) >>TRANS_HTOTAL_SHIFT ); vtotal = (vgpu_vreg_t (vgpu,TRANS_VTOTAL (TRANSCODER_A )) >>TRANS_VTOTAL_SHIFT );if (dp_br && link_n && htotal && vtotal) {drivers/gpu/drm/i915/i915_reg.h +1
-1@@ -1217,7 +1217,7 @@#define _TRANS_VSYNC_DSI1 0x6b814#define _TRANS_VSYNCSHIFT_DSI1 0x6b828 -#define TRANS_HTOTAL (trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_HTOTAL_A) +#define TRANS_HTOTAL (dev_priv, trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_HTOTAL_A)#define TRANS_HBLANK (trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_HBLANK_A)#define TRANS_HSYNC (trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_HSYNC_A)#define TRANS_VTOTAL (trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_VTOTAL_A)drivers/gpu/drm/i915/intel_gvt_mmio_table.c +4
-4@@ -231,7 +231,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (SPRSCALE (PIPE_C ));MMIO_D (SPRSURFLIVE (PIPE_C ));MMIO_D (REG_50080 (PIPE_C ,PLANE_SPRITE0 )); -MMIO_D (TRANS_HTOTAL (TRANSCODER_A )); +MMIO_D (TRANS_HTOTAL (dev_priv,TRANSCODER_A ));MMIO_D (TRANS_HBLANK (TRANSCODER_A ));MMIO_D (TRANS_HSYNC (TRANSCODER_A ));MMIO_D (TRANS_VTOTAL (TRANSCODER_A ));@@ -240,7 +240,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (BCLRPAT (TRANSCODER_A ));MMIO_D (TRANS_VSYNCSHIFT (TRANSCODER_A ));MMIO_D (PIPESRC (TRANSCODER_A )); -MMIO_D (TRANS_HTOTAL (TRANSCODER_B )); +MMIO_D (TRANS_HTOTAL (dev_priv,TRANSCODER_B ));MMIO_D (TRANS_HBLANK (TRANSCODER_B ));MMIO_D (TRANS_HSYNC (TRANSCODER_B ));MMIO_D (TRANS_VTOTAL (TRANSCODER_B ));@@ -249,7 +249,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (BCLRPAT (TRANSCODER_B ));MMIO_D (TRANS_VSYNCSHIFT (TRANSCODER_B ));MMIO_D (PIPESRC (TRANSCODER_B )); -MMIO_D (TRANS_HTOTAL (TRANSCODER_C )); +MMIO_D (TRANS_HTOTAL (dev_priv,TRANSCODER_C ));MMIO_D (TRANS_HBLANK (TRANSCODER_C ));MMIO_D (TRANS_HSYNC (TRANSCODER_C ));MMIO_D (TRANS_VTOTAL (TRANSCODER_C ));@@ -258,7 +258,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (BCLRPAT (TRANSCODER_C ));MMIO_D (TRANS_VSYNCSHIFT (TRANSCODER_C ));MMIO_D (PIPESRC (TRANSCODER_C )); -MMIO_D (TRANS_HTOTAL (TRANSCODER_EDP )); +MMIO_D (TRANS_HTOTAL (dev_priv,TRANSCODER_EDP ));MMIO_D (TRANS_HBLANK (TRANSCODER_EDP ));MMIO_D (TRANS_HSYNC (TRANSCODER_EDP ));MMIO_D (TRANS_VTOTAL (TRANSCODER_EDP ));Signature · 1 line
2.39.2
PATCH 4/65 drm/i915: pass dev_priv explicitly to TRANS_HBLANK
In reply to Jani NikulaAvoid the implicit dev_priv local variable use, and pass dev_priv explicitly to the TRANS_HBLANK register macro.
--- drivers/gpu/drm/i915/display/intel_display.c | 7 ++++--- drivers/gpu/drm/i915/display/intel_pch_display.c | 2 +- drivers/gpu/drm/i915/i915_reg.h | 2 +- drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 8 ++++---- 4 files changed, 10 insertions(+), 9 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +4 -3
@@ -2713,7 +2713,7 @@ static void intel_set_transcoder_timings(const struct intel_crtc_state *crtc_staintel_de_write (dev_priv,TRANS_HTOTAL (dev_priv, cpu_transcoder),HACTIVE (adjusted_mode->crtc_hdisplay -1 ) |HTOTAL (adjusted_mode->crtc_htotal -1 )); -intel_de_write (dev_priv,TRANS_HBLANK (cpu_transcoder), +intel_de_write (dev_priv,TRANS_HBLANK (dev_priv, cpu_transcoder),HBLANK_START (adjusted_mode->crtc_hblank_start -1 ) |HBLANK_END (adjusted_mode->crtc_hblank_end -1 )); intel_de_write(dev_priv, TRANS_HSYNC(cpu_transcoder),
@@ -2816,7 +2816,8 @@ static void intel_get_transcoder_timings(struct intel_crtc *crtc, adjusted_mode->crtc_htotal =REG_FIELD_GET (HTOTAL_MASK , tmp) +1 ;if (!transcoder_is_dsi (cpu_transcoder)) { - tmp =intel_de_read (dev_priv,TRANS_HBLANK (cpu_transcoder)); + tmp =intel_de_read (dev_priv, +TRANS_HBLANK (dev_priv, cpu_transcoder)); adjusted_mode->crtc_hblank_start =REG_FIELD_GET (HBLANK_START_MASK , tmp) +1 ; adjusted_mode->crtc_hblank_end =REG_FIELD_GET (HBLANK_END_MASK , tmp) +1 ; }
@@ -8191,7 +8192,7 @@ void i830_enable_pipe(struct drm_i915_private *dev_priv, enum pipe pipe)intel_de_write (dev_priv,TRANS_HTOTAL (dev_priv, cpu_transcoder),HACTIVE (640 -1 ) |HTOTAL (800 -1 )); -intel_de_write (dev_priv,TRANS_HBLANK (cpu_transcoder), +intel_de_write (dev_priv,TRANS_HBLANK (dev_priv, cpu_transcoder),HBLANK_START (640 -1 ) |HBLANK_END (800 -1 ));intel_de_write (dev_priv,TRANS_HSYNC (cpu_transcoder),HSYNC_START (656 -1 ) |HSYNC_END (752 -1 ));
drivers/gpu/drm/i915/display/intel_pch_display.c +1 -1
@@ -226,7 +226,7 @@ static void ilk_pch_transcoder_set_timings(const struct intel_crtc_state *crtc_sintel_de_write (dev_priv,PCH_TRANS_HTOTAL (pch_transcoder),intel_de_read (dev_priv,TRANS_HTOTAL (dev_priv, cpu_transcoder)));intel_de_write (dev_priv,PCH_TRANS_HBLANK (pch_transcoder), -intel_de_read (dev_priv,TRANS_HBLANK (cpu_transcoder))); +intel_de_read (dev_priv,TRANS_HBLANK (dev_priv, cpu_transcoder)));intel_de_write (dev_priv,PCH_TRANS_HSYNC (pch_transcoder),intel_de_read (dev_priv,TRANS_HSYNC (cpu_transcoder)));
drivers/gpu/drm/i915/i915_reg.h +1 -1
@@ -1218,7 +1218,7 @@#define _TRANS_VSYNCSHIFT_DSI1 0x6b828#define TRANS_HTOTAL (dev_priv, trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_HTOTAL_A) -#define TRANS_HBLANK (trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_HBLANK_A) +#define TRANS_HBLANK (dev_priv, trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_HBLANK_A)#define TRANS_HSYNC (trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_HSYNC_A)#define TRANS_VTOTAL (trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_VTOTAL_A)#define TRANS_VBLANK (trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_VBLANK_A)
drivers/gpu/drm/i915/intel_gvt_mmio_table.c +4 -4
@@ -232,7 +232,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (SPRSURFLIVE (PIPE_C ));MMIO_D (REG_50080 (PIPE_C ,PLANE_SPRITE0 ));MMIO_D (TRANS_HTOTAL (dev_priv,TRANSCODER_A )); -MMIO_D (TRANS_HBLANK (TRANSCODER_A )); +MMIO_D (TRANS_HBLANK (dev_priv,TRANSCODER_A ));MMIO_D (TRANS_HSYNC (TRANSCODER_A ));MMIO_D (TRANS_VTOTAL (TRANSCODER_A ));MMIO_D (TRANS_VBLANK (TRANSCODER_A ));
@@ -241,7 +241,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (TRANS_VSYNCSHIFT (TRANSCODER_A ));MMIO_D (PIPESRC (TRANSCODER_A ));MMIO_D (TRANS_HTOTAL (dev_priv,TRANSCODER_B )); -MMIO_D (TRANS_HBLANK (TRANSCODER_B )); +MMIO_D (TRANS_HBLANK (dev_priv,TRANSCODER_B ));MMIO_D (TRANS_HSYNC (TRANSCODER_B ));MMIO_D (TRANS_VTOTAL (TRANSCODER_B ));MMIO_D (TRANS_VBLANK (TRANSCODER_B ));
@@ -250,7 +250,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (TRANS_VSYNCSHIFT (TRANSCODER_B ));MMIO_D (PIPESRC (TRANSCODER_B ));MMIO_D (TRANS_HTOTAL (dev_priv,TRANSCODER_C )); -MMIO_D (TRANS_HBLANK (TRANSCODER_C )); +MMIO_D (TRANS_HBLANK (dev_priv,TRANSCODER_C ));MMIO_D (TRANS_HSYNC (TRANSCODER_C ));MMIO_D (TRANS_VTOTAL (TRANSCODER_C ));MMIO_D (TRANS_VBLANK (TRANSCODER_C ));
@@ -259,7 +259,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (TRANS_VSYNCSHIFT (TRANSCODER_C ));MMIO_D (PIPESRC (TRANSCODER_C ));MMIO_D (TRANS_HTOTAL (dev_priv,TRANSCODER_EDP )); -MMIO_D (TRANS_HBLANK (TRANSCODER_EDP )); +MMIO_D (TRANS_HBLANK (dev_priv,TRANSCODER_EDP ));MMIO_D (TRANS_HSYNC (TRANSCODER_EDP ));MMIO_D (TRANS_VTOTAL (TRANSCODER_EDP ));MMIO_D (TRANS_VBLANK (TRANSCODER_EDP ));
Signature · 1 line
2.39.2
Re: [PATCH 04/65] drm/i915: pass dev_priv explicitly to TRANS_HBLANK
Quoted 3 lines · Jani Nikula
Avoid the implicit
dev_privlocal variable use, and passdev_privexplicitly to theTRANS_HBLANKregister macro.
Quoted 109 lines
Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/display/intel_display.c | 7 ++++--- drivers/gpu/drm/i915/display/intel_pch_display.c | 2 +- drivers/gpu/drm/i915/i915_reg.h | 2 +- drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 8 ++++---- 4 files changed, 10 insertions(+), 9 deletions(-)drivers/gpu/drm/i915/display/intel_display.c +4
-3@@ -2713,7 +2713,7 @@ static void intel_set_transcoder_timings(const struct intel_crtc_state *crtc_staintel_de_write (dev_priv,TRANS_HTOTAL (dev_priv, cpu_transcoder),HACTIVE (adjusted_mode->crtc_hdisplay -1 ) |HTOTAL (adjusted_mode->crtc_htotal -1 )); -intel_de_write (dev_priv,TRANS_HBLANK (cpu_transcoder), +intel_de_write (dev_priv,TRANS_HBLANK (dev_priv, cpu_transcoder),HBLANK_START (adjusted_mode->crtc_hblank_start -1 ) |HBLANK_END (adjusted_mode->crtc_hblank_end -1 )); intel_de_write(dev_priv, TRANS_HSYNC(cpu_transcoder),@@ -2816,7 +2816,8 @@ static void intel_get_transcoder_timings(struct intel_crtc *crtc, adjusted_mode->crtc_htotal =REG_FIELD_GET (HTOTAL_MASK , tmp) +1 ;if (!transcoder_is_dsi (cpu_transcoder)) { - tmp =intel_de_read (dev_priv,TRANS_HBLANK (cpu_transcoder)); + tmp =intel_de_read (dev_priv, +TRANS_HBLANK (dev_priv, cpu_transcoder)); adjusted_mode->crtc_hblank_start =REG_FIELD_GET (HBLANK_START_MASK , tmp) +1 ; adjusted_mode->crtc_hblank_end =REG_FIELD_GET (HBLANK_END_MASK , tmp) +1 ; }@@ -8191,7 +8192,7 @@ void i830_enable_pipe(struct drm_i915_private *dev_priv, enum pipe pipe)intel_de_write (dev_priv,TRANS_HTOTAL (dev_priv, cpu_transcoder),HACTIVE (640 -1 ) |HTOTAL (800 -1 )); -intel_de_write (dev_priv,TRANS_HBLANK (cpu_transcoder), +intel_de_write (dev_priv,TRANS_HBLANK (dev_priv, cpu_transcoder),HBLANK_START (640 -1 ) |HBLANK_END (800 -1 ));intel_de_write (dev_priv,TRANS_HSYNC (cpu_transcoder),HSYNC_START (656 -1 ) |HSYNC_END (752 -1 ));drivers/gpu/drm/i915/display/intel_pch_display.c +1
-1@@ -226,7 +226,7 @@ static void ilk_pch_transcoder_set_timings(const struct intel_crtc_state *crtc_sintel_de_write (dev_priv,PCH_TRANS_HTOTAL (pch_transcoder),intel_de_read (dev_priv,TRANS_HTOTAL (dev_priv, cpu_transcoder)));intel_de_write (dev_priv,PCH_TRANS_HBLANK (pch_transcoder), -intel_de_read (dev_priv,TRANS_HBLANK (cpu_transcoder))); +intel_de_read (dev_priv,TRANS_HBLANK (dev_priv, cpu_transcoder)));intel_de_write (dev_priv,PCH_TRANS_HSYNC (pch_transcoder),intel_de_read (dev_priv,TRANS_HSYNC (cpu_transcoder)));drivers/gpu/drm/i915/i915_reg.h +1
-1@@ -1218,7 +1218,7 @@#define _TRANS_VSYNCSHIFT_DSI1 0x6b828#define TRANS_HTOTAL (dev_priv, trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_HTOTAL_A) -#define TRANS_HBLANK (trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_HBLANK_A) +#define TRANS_HBLANK (dev_priv, trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_HBLANK_A)#define TRANS_HSYNC (trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_HSYNC_A)#define TRANS_VTOTAL (trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_VTOTAL_A)#define TRANS_VBLANK (trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_VBLANK_A)drivers/gpu/drm/i915/intel_gvt_mmio_table.c +4
-4@@ -232,7 +232,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (SPRSURFLIVE (PIPE_C ));MMIO_D (REG_50080 (PIPE_C ,PLANE_SPRITE0 ));MMIO_D (TRANS_HTOTAL (dev_priv,TRANSCODER_A )); -MMIO_D (TRANS_HBLANK (TRANSCODER_A )); +MMIO_D (TRANS_HBLANK (dev_priv,TRANSCODER_A ));MMIO_D (TRANS_HSYNC (TRANSCODER_A ));MMIO_D (TRANS_VTOTAL (TRANSCODER_A ));MMIO_D (TRANS_VBLANK (TRANSCODER_A ));@@ -241,7 +241,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (TRANS_VSYNCSHIFT (TRANSCODER_A ));MMIO_D (PIPESRC (TRANSCODER_A ));MMIO_D (TRANS_HTOTAL (dev_priv,TRANSCODER_B )); -MMIO_D (TRANS_HBLANK (TRANSCODER_B )); +MMIO_D (TRANS_HBLANK (dev_priv,TRANSCODER_B ));MMIO_D (TRANS_HSYNC (TRANSCODER_B ));MMIO_D (TRANS_VTOTAL (TRANSCODER_B ));MMIO_D (TRANS_VBLANK (TRANSCODER_B ));@@ -250,7 +250,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (TRANS_VSYNCSHIFT (TRANSCODER_B ));MMIO_D (PIPESRC (TRANSCODER_B ));MMIO_D (TRANS_HTOTAL (dev_priv,TRANSCODER_C )); -MMIO_D (TRANS_HBLANK (TRANSCODER_C )); +MMIO_D (TRANS_HBLANK (dev_priv,TRANSCODER_C ));MMIO_D (TRANS_HSYNC (TRANSCODER_C ));MMIO_D (TRANS_VTOTAL (TRANSCODER_C ));MMIO_D (TRANS_VBLANK (TRANSCODER_C ));@@ -259,7 +259,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (TRANS_VSYNCSHIFT (TRANSCODER_C ));MMIO_D (PIPESRC (TRANSCODER_C ));MMIO_D (TRANS_HTOTAL (dev_priv,TRANSCODER_EDP )); -MMIO_D (TRANS_HBLANK (TRANSCODER_EDP )); +MMIO_D (TRANS_HBLANK (dev_priv,TRANSCODER_EDP ));MMIO_D (TRANS_HSYNC (TRANSCODER_EDP ));MMIO_D (TRANS_VTOTAL (TRANSCODER_EDP ));MMIO_D (TRANS_VBLANK (TRANSCODER_EDP ));Signature · 1 line
2.39.2
PATCH 5/65 drm/i915: pass dev_priv explicitly to TRANS_HSYNC
In reply to Jani NikulaAvoid the implicit dev_priv local variable use, and pass dev_priv explicitly to the TRANS_HSYNC register macro.
--- drivers/gpu/drm/i915/display/icl_dsi.c | 3 ++- drivers/gpu/drm/i915/display/intel_display.c | 6 +++--- drivers/gpu/drm/i915/display/intel_pch_display.c | 2 +- drivers/gpu/drm/i915/i915_reg.h | 2 +- drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 8 ++++---- 5 files changed, 11 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/display/icl_dsi.c +2 -1
@@ -938,7 +938,8 @@ gen11_dsi_set_transcoder_timings(struct intel_encoder *encoder,for_each_dsi_port (port, intel_dsi->ports) { dsi_trans =dsi_port_to_transcoder (port); -intel_de_write (dev_priv,TRANS_HSYNC (dsi_trans), +intel_de_write (dev_priv, +TRANS_HSYNC (dev_priv, dsi_trans),HSYNC_START (hsync_start -1 ) |HSYNC_END (hsync_end -1 )); } }
drivers/gpu/drm/i915/display/intel_display.c +3 -3
@@ -2716,7 +2716,7 @@ static void intel_set_transcoder_timings(const struct intel_crtc_state *crtc_staintel_de_write (dev_priv,TRANS_HBLANK (dev_priv, cpu_transcoder),HBLANK_START (adjusted_mode->crtc_hblank_start -1 ) |HBLANK_END (adjusted_mode->crtc_hblank_end -1 )); -intel_de_write (dev_priv,TRANS_HSYNC (cpu_transcoder), +intel_de_write (dev_priv,TRANS_HSYNC (dev_priv, cpu_transcoder),HSYNC_START (adjusted_mode->crtc_hsync_start -1 ) |HSYNC_END (adjusted_mode->crtc_hsync_end -1 ));
@@ -2822,7 +2822,7 @@ static void intel_get_transcoder_timings(struct intel_crtc *crtc, adjusted_mode->crtc_hblank_end =REG_FIELD_GET (HBLANK_END_MASK , tmp) +1 ; } - tmp =intel_de_read (dev_priv,TRANS_HSYNC (cpu_transcoder)); + tmp =intel_de_read (dev_priv,TRANS_HSYNC (dev_priv, cpu_transcoder)); adjusted_mode->crtc_hsync_start =REG_FIELD_GET (HSYNC_START_MASK , tmp) +1 ; adjusted_mode->crtc_hsync_end =REG_FIELD_GET (HSYNC_END_MASK , tmp) +1 ;
@@ -8194,7 +8194,7 @@ void i830_enable_pipe(struct drm_i915_private *dev_priv, enum pipe pipe) HACTIVE(640 - 1) | HTOTAL(800 - 1));intel_de_write (dev_priv,TRANS_HBLANK (dev_priv, cpu_transcoder),HBLANK_START (640 -1 ) |HBLANK_END (800 -1 )); -intel_de_write (dev_priv,TRANS_HSYNC (cpu_transcoder), +intel_de_write (dev_priv,TRANS_HSYNC (dev_priv, cpu_transcoder),HSYNC_START (656 -1 ) |HSYNC_END (752 -1 ));intel_de_write (dev_priv,TRANS_VTOTAL (cpu_transcoder),VACTIVE (480 -1 ) |VTOTAL (525 -1 ));
drivers/gpu/drm/i915/display/intel_pch_display.c +1 -1
@@ -228,7 +228,7 @@ static void ilk_pch_transcoder_set_timings(const struct intel_crtc_state *crtc_sintel_de_write (dev_priv,PCH_TRANS_HBLANK (pch_transcoder),intel_de_read (dev_priv,TRANS_HBLANK (dev_priv, cpu_transcoder)));intel_de_write (dev_priv,PCH_TRANS_HSYNC (pch_transcoder), -intel_de_read (dev_priv,TRANS_HSYNC (cpu_transcoder))); +intel_de_read (dev_priv,TRANS_HSYNC (dev_priv, cpu_transcoder)));intel_de_write (dev_priv,PCH_TRANS_VTOTAL (pch_transcoder),intel_de_read (dev_priv,TRANS_VTOTAL (cpu_transcoder)));
drivers/gpu/drm/i915/i915_reg.h +1 -1
@@ -1219,7 +1219,7 @@#define TRANS_HTOTAL (dev_priv, trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_HTOTAL_A)#define TRANS_HBLANK (dev_priv, trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_HBLANK_A) -#define TRANS_HSYNC (trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_HSYNC_A) +#define TRANS_HSYNC (dev_priv, trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_HSYNC_A)#define TRANS_VTOTAL (trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_VTOTAL_A)#define TRANS_VBLANK (trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_VBLANK_A)#define TRANS_VSYNC (trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_VSYNC_A)
drivers/gpu/drm/i915/intel_gvt_mmio_table.c +4 -4
@@ -233,7 +233,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (REG_50080 (PIPE_C ,PLANE_SPRITE0 ));MMIO_D (TRANS_HTOTAL (dev_priv,TRANSCODER_A ));MMIO_D (TRANS_HBLANK (dev_priv,TRANSCODER_A )); -MMIO_D (TRANS_HSYNC (TRANSCODER_A )); +MMIO_D (TRANS_HSYNC (dev_priv,TRANSCODER_A ));MMIO_D (TRANS_VTOTAL (TRANSCODER_A ));MMIO_D (TRANS_VBLANK (TRANSCODER_A ));MMIO_D (TRANS_VSYNC (TRANSCODER_A ));
@@ -242,7 +242,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (PIPESRC (TRANSCODER_A ));MMIO_D (TRANS_HTOTAL (dev_priv,TRANSCODER_B ));MMIO_D (TRANS_HBLANK (dev_priv,TRANSCODER_B )); -MMIO_D (TRANS_HSYNC (TRANSCODER_B )); +MMIO_D (TRANS_HSYNC (dev_priv,TRANSCODER_B ));MMIO_D (TRANS_VTOTAL (TRANSCODER_B ));MMIO_D (TRANS_VBLANK (TRANSCODER_B ));MMIO_D (TRANS_VSYNC (TRANSCODER_B ));
@@ -251,7 +251,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (PIPESRC (TRANSCODER_B ));MMIO_D (TRANS_HTOTAL (dev_priv,TRANSCODER_C ));MMIO_D (TRANS_HBLANK (dev_priv,TRANSCODER_C )); -MMIO_D (TRANS_HSYNC (TRANSCODER_C )); +MMIO_D (TRANS_HSYNC (dev_priv,TRANSCODER_C ));MMIO_D (TRANS_VTOTAL (TRANSCODER_C ));MMIO_D (TRANS_VBLANK (TRANSCODER_C ));MMIO_D (TRANS_VSYNC (TRANSCODER_C ));
@@ -260,7 +260,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (PIPESRC (TRANSCODER_C ));MMIO_D (TRANS_HTOTAL (dev_priv,TRANSCODER_EDP ));MMIO_D (TRANS_HBLANK (dev_priv,TRANSCODER_EDP )); -MMIO_D (TRANS_HSYNC (TRANSCODER_EDP )); +MMIO_D (TRANS_HSYNC (dev_priv,TRANSCODER_EDP ));MMIO_D (TRANS_VTOTAL (TRANSCODER_EDP ));MMIO_D (TRANS_VBLANK (TRANSCODER_EDP ));MMIO_D (TRANS_VSYNC (TRANSCODER_EDP ));
Signature · 1 line
2.39.2
Re: [PATCH 05/65] drm/i915: pass dev_priv explicitly to TRANS_HSYNC
Quoted 2 lines · Jani Nikula
Avoid the implicit
dev_privlocal variable use, and passdev_privexplicitly to theTRANS_HSYNCregister macro.
Quoted 124 lines
Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/display/icl_dsi.c | 3 ++- drivers/gpu/drm/i915/display/intel_display.c | 6 +++--- drivers/gpu/drm/i915/display/intel_pch_display.c | 2 +- drivers/gpu/drm/i915/i915_reg.h | 2 +- drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 8 ++++---- 5 files changed, 11 insertions(+), 10 deletions(-)drivers/gpu/drm/i915/display/icl_dsi.c +2
-1@@ -938,7 +938,8 @@ gen11_dsi_set_transcoder_timings(struct intel_encoder *encoder,for_each_dsi_port (port, intel_dsi->ports) { dsi_trans =dsi_port_to_transcoder (port); -intel_de_write (dev_priv,TRANS_HSYNC (dsi_trans), +intel_de_write (dev_priv, +TRANS_HSYNC (dev_priv, dsi_trans),HSYNC_START (hsync_start -1 ) |HSYNC_END (hsync_end -1 )); } }drivers/gpu/drm/i915/display/intel_display.c +3
-3@@ -2716,7 +2716,7 @@ static void intel_set_transcoder_timings(const struct intel_crtc_state *crtc_staintel_de_write (dev_priv,TRANS_HBLANK (dev_priv, cpu_transcoder),HBLANK_START (adjusted_mode->crtc_hblank_start -1 ) |HBLANK_END (adjusted_mode->crtc_hblank_end -1 )); -intel_de_write (dev_priv,TRANS_HSYNC (cpu_transcoder), +intel_de_write (dev_priv,TRANS_HSYNC (dev_priv, cpu_transcoder),HSYNC_START (adjusted_mode->crtc_hsync_start -1 ) |HSYNC_END (adjusted_mode->crtc_hsync_end -1 ));@@ -2822,7 +2822,7 @@ static void intel_get_transcoder_timings(struct intel_crtc *crtc, adjusted_mode->crtc_hblank_end =REG_FIELD_GET (HBLANK_END_MASK , tmp) +1 ; } - tmp =intel_de_read (dev_priv,TRANS_HSYNC (cpu_transcoder)); + tmp =intel_de_read (dev_priv,TRANS_HSYNC (dev_priv, cpu_transcoder)); adjusted_mode->crtc_hsync_start =REG_FIELD_GET (HSYNC_START_MASK , tmp) +1 ; adjusted_mode->crtc_hsync_end =REG_FIELD_GET (HSYNC_END_MASK , tmp) +1 ;@@ -8194,7 +8194,7 @@ void i830_enable_pipe(struct drm_i915_private *dev_priv, enum pipe pipe) HACTIVE(640 - 1) | HTOTAL(800 - 1));intel_de_write (dev_priv,TRANS_HBLANK (dev_priv, cpu_transcoder),HBLANK_START (640 -1 ) |HBLANK_END (800 -1 )); -intel_de_write (dev_priv,TRANS_HSYNC (cpu_transcoder), +intel_de_write (dev_priv,TRANS_HSYNC (dev_priv, cpu_transcoder),HSYNC_START (656 -1 ) |HSYNC_END (752 -1 ));intel_de_write (dev_priv,TRANS_VTOTAL (cpu_transcoder),VACTIVE (480 -1 ) |VTOTAL (525 -1 ));drivers/gpu/drm/i915/display/intel_pch_display.c +1
-1@@ -228,7 +228,7 @@ static void ilk_pch_transcoder_set_timings(const struct intel_crtc_state *crtc_sintel_de_write (dev_priv,PCH_TRANS_HBLANK (pch_transcoder),intel_de_read (dev_priv,TRANS_HBLANK (dev_priv, cpu_transcoder)));intel_de_write (dev_priv,PCH_TRANS_HSYNC (pch_transcoder), -intel_de_read (dev_priv,TRANS_HSYNC (cpu_transcoder))); +intel_de_read (dev_priv,TRANS_HSYNC (dev_priv, cpu_transcoder)));intel_de_write (dev_priv,PCH_TRANS_VTOTAL (pch_transcoder),intel_de_read (dev_priv,TRANS_VTOTAL (cpu_transcoder)));drivers/gpu/drm/i915/i915_reg.h +1
-1@@ -1219,7 +1219,7 @@#define TRANS_HTOTAL (dev_priv, trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_HTOTAL_A)#define TRANS_HBLANK (dev_priv, trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_HBLANK_A) -#define TRANS_HSYNC (trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_HSYNC_A) +#define TRANS_HSYNC (dev_priv, trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_HSYNC_A)#define TRANS_VTOTAL (trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_VTOTAL_A)#define TRANS_VBLANK (trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_VBLANK_A)#define TRANS_VSYNC (trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_VSYNC_A)drivers/gpu/drm/i915/intel_gvt_mmio_table.c +4
-4@@ -233,7 +233,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (REG_50080 (PIPE_C ,PLANE_SPRITE0 ));MMIO_D (TRANS_HTOTAL (dev_priv,TRANSCODER_A ));MMIO_D (TRANS_HBLANK (dev_priv,TRANSCODER_A )); -MMIO_D (TRANS_HSYNC (TRANSCODER_A )); +MMIO_D (TRANS_HSYNC (dev_priv,TRANSCODER_A ));MMIO_D (TRANS_VTOTAL (TRANSCODER_A ));MMIO_D (TRANS_VBLANK (TRANSCODER_A ));MMIO_D (TRANS_VSYNC (TRANSCODER_A ));@@ -242,7 +242,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (PIPESRC (TRANSCODER_A ));MMIO_D (TRANS_HTOTAL (dev_priv,TRANSCODER_B ));MMIO_D (TRANS_HBLANK (dev_priv,TRANSCODER_B )); -MMIO_D (TRANS_HSYNC (TRANSCODER_B )); +MMIO_D (TRANS_HSYNC (dev_priv,TRANSCODER_B ));MMIO_D (TRANS_VTOTAL (TRANSCODER_B ));MMIO_D (TRANS_VBLANK (TRANSCODER_B ));MMIO_D (TRANS_VSYNC (TRANSCODER_B ));@@ -251,7 +251,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (PIPESRC (TRANSCODER_B ));MMIO_D (TRANS_HTOTAL (dev_priv,TRANSCODER_C ));MMIO_D (TRANS_HBLANK (dev_priv,TRANSCODER_C )); -MMIO_D (TRANS_HSYNC (TRANSCODER_C )); +MMIO_D (TRANS_HSYNC (dev_priv,TRANSCODER_C ));MMIO_D (TRANS_VTOTAL (TRANSCODER_C ));MMIO_D (TRANS_VBLANK (TRANSCODER_C ));MMIO_D (TRANS_VSYNC (TRANSCODER_C ));@@ -260,7 +260,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (PIPESRC (TRANSCODER_C ));MMIO_D (TRANS_HTOTAL (dev_priv,TRANSCODER_EDP ));MMIO_D (TRANS_HBLANK (dev_priv,TRANSCODER_EDP )); -MMIO_D (TRANS_HSYNC (TRANSCODER_EDP )); +MMIO_D (TRANS_HSYNC (dev_priv,TRANSCODER_EDP ));MMIO_D (TRANS_VTOTAL (TRANSCODER_EDP ));MMIO_D (TRANS_VBLANK (TRANSCODER_EDP ));MMIO_D (TRANS_VSYNC (TRANSCODER_EDP ));Signature · 1 line
2.39.2
PATCH 6/65 drm/i915: pass dev_priv explicitly to TRANS_VTOTAL
In reply to Jani NikulaAvoid the implicit dev_priv local variable use, and pass dev_priv explicitly to the TRANS_VTOTAL register macro.
--- drivers/gpu/drm/i915/display/icl_dsi.c | 2 +- drivers/gpu/drm/i915/display/intel_crt.c | 3 ++- drivers/gpu/drm/i915/display/intel_display.c | 10 +++++----- drivers/gpu/drm/i915/display/intel_pch_display.c | 2 +- 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 ++++---- 7 files changed, 15 insertions(+), 14 deletions(-)
drivers/gpu/drm/i915/display/icl_dsi.c +1 -1
@@ -953,7 +953,7 @@ gen11_dsi_set_transcoder_timings(struct intel_encoder *encoder,* struct drm_display_mode. * For interlace mode: program required pixel minus 2 */ -intel_de_write (dev_priv,TRANS_VTOTAL (dsi_trans), +intel_de_write (dev_priv,TRANS_VTOTAL (dev_priv, dsi_trans),VACTIVE (vactive -1 ) |VTOTAL (vtotal -1 )); }
drivers/gpu/drm/i915/display/intel_crt.c +2 -1
@@ -708,7 +708,8 @@ intel_crt_load_detect(struct intel_crt *crt, enum pipe pipe)drm_dbg_kms (&dev_priv->drm,"starting load-detect on CRT\n" ); save_bclrpat =intel_de_read (dev_priv,BCLRPAT (cpu_transcoder)); - save_vtotal =intel_de_read (dev_priv,TRANS_VTOTAL (cpu_transcoder)); + save_vtotal =intel_de_read (dev_priv, +TRANS_VTOTAL (dev_priv, cpu_transcoder)); vblank =intel_de_read (dev_priv,TRANS_VBLANK (cpu_transcoder)); vtotal =REG_FIELD_GET (VTOTAL_MASK , save_vtotal) +1 ;
drivers/gpu/drm/i915/display/intel_display.c +5 -5
@@ -2720,7 +2720,7 @@ static void intel_set_transcoder_timings(const struct intel_crtc_state *crtc_staHSYNC_START (adjusted_mode->crtc_hsync_start -1 ) | HSYNC_END(adjusted_mode->crtc_hsync_end - 1)); -intel_de_write (dev_priv,TRANS_VTOTAL (cpu_transcoder), +intel_de_write (dev_priv,TRANS_VTOTAL (dev_priv, cpu_transcoder),VACTIVE (crtc_vdisplay -1 ) |VTOTAL (crtc_vtotal -1 )); intel_de_write(dev_priv, TRANS_VBLANK(cpu_transcoder),
@@ -2736,7 +2736,7 @@ static void intel_set_transcoder_timings(const struct intel_crtc_state *crtc_sta* bits. */ if (IS_HASWELL (dev_priv) && cpu_transcoder ==TRANSCODER_EDP && (pipe ==PIPE_B || pipe ==PIPE_C )) -intel_de_write (dev_priv,TRANS_VTOTAL (pipe), +intel_de_write (dev_priv,TRANS_VTOTAL (dev_priv, pipe),VACTIVE (crtc_vdisplay -1 ) |VTOTAL (crtc_vtotal -1 )); }
@@ -2767,7 +2767,7 @@ static void intel_set_transcoder_timings_lrr(const struct intel_crtc_state *crtc* The double buffer latch point for TRANS_VTOTAL * is the transcoder's undelayed vblank. */ -intel_de_write (dev_priv,TRANS_VTOTAL (cpu_transcoder), +intel_de_write (dev_priv,TRANS_VTOTAL (dev_priv, cpu_transcoder),VACTIVE (crtc_vdisplay -1 ) |VTOTAL (crtc_vtotal -1 )); }
@@ -2826,7 +2826,7 @@ static void intel_get_transcoder_timings(struct intel_crtc *crtc, adjusted_mode->crtc_hsync_start =REG_FIELD_GET (HSYNC_START_MASK , tmp) +1 ; adjusted_mode->crtc_hsync_end =REG_FIELD_GET (HSYNC_END_MASK , tmp) +1 ; - tmp =intel_de_read (dev_priv,TRANS_VTOTAL (cpu_transcoder)); + tmp =intel_de_read (dev_priv,TRANS_VTOTAL (dev_priv, cpu_transcoder)); adjusted_mode->crtc_vdisplay =REG_FIELD_GET (VACTIVE_MASK , tmp) +1 ; adjusted_mode->crtc_vtotal =REG_FIELD_GET (VTOTAL_MASK , tmp) +1 ;
@@ -8196,7 +8196,7 @@ void i830_enable_pipe(struct drm_i915_private *dev_priv, enum pipe pipe) HBLANK_START(640 - 1) | HBLANK_END(800 - 1));intel_de_write (dev_priv,TRANS_HSYNC (dev_priv, cpu_transcoder),HSYNC_START (656 -1 ) |HSYNC_END (752 -1 )); -intel_de_write (dev_priv,TRANS_VTOTAL (cpu_transcoder), +intel_de_write (dev_priv,TRANS_VTOTAL (dev_priv, cpu_transcoder),VACTIVE (480 -1 ) |VTOTAL (525 -1 ));intel_de_write (dev_priv,TRANS_VBLANK (cpu_transcoder),VBLANK_START (480 -1 ) |VBLANK_END (525 -1 ));
drivers/gpu/drm/i915/display/intel_pch_display.c +1 -1
@@ -231,7 +231,7 @@ static void ilk_pch_transcoder_set_timings(const struct intel_crtc_state *crtc_s intel_de_read(dev_priv, TRANS_HSYNC(dev_priv, cpu_transcoder)));intel_de_write (dev_priv,PCH_TRANS_VTOTAL (pch_transcoder), -intel_de_read (dev_priv,TRANS_VTOTAL (cpu_transcoder))); +intel_de_read (dev_priv,TRANS_VTOTAL (dev_priv, cpu_transcoder)));intel_de_write (dev_priv,PCH_TRANS_VBLANK (pch_transcoder),intel_de_read (dev_priv,TRANS_VBLANK (cpu_transcoder))); intel_de_write(dev_priv, PCH_TRANS_VSYNC(pch_transcoder),
drivers/gpu/drm/i915/gvt/handlers.c +1 -1
@@ -678,7 +678,7 @@ static void vgpu_update_refresh_rate(struct intel_vgpu *vgpu)/* Get H/V total from transcoder timing */ htotal = (vgpu_vreg_t (vgpu,TRANS_HTOTAL (dev_priv,TRANSCODER_A )) >>TRANS_HTOTAL_SHIFT ); - vtotal = (vgpu_vreg_t (vgpu,TRANS_VTOTAL (TRANSCODER_A )) >>TRANS_VTOTAL_SHIFT ); + vtotal = (vgpu_vreg_t (vgpu,TRANS_VTOTAL (dev_priv,TRANSCODER_A )) >>TRANS_VTOTAL_SHIFT );if (dp_br && link_n && htotal && vtotal) {u64 pixel_clk =0 ;
drivers/gpu/drm/i915/i915_reg.h +1 -1
@@ -1220,7 +1220,7 @@#define TRANS_HTOTAL (dev_priv, trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_HTOTAL_A)#define TRANS_HBLANK (dev_priv, trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_HBLANK_A)#define TRANS_HSYNC (dev_priv, trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_HSYNC_A) -#define TRANS_VTOTAL (trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_VTOTAL_A) +#define TRANS_VTOTAL (dev_priv, trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_VTOTAL_A)#define TRANS_VBLANK (trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_VBLANK_A)#define TRANS_VSYNC (trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_VSYNC_A)#define BCLRPAT (trans) _MMIO_TRANS2(dev_priv, (trans), _BCLRPAT_A)
drivers/gpu/drm/i915/intel_gvt_mmio_table.c +4 -4
@@ -234,7 +234,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (TRANS_HTOTAL (dev_priv,TRANSCODER_A ));MMIO_D (TRANS_HBLANK (dev_priv,TRANSCODER_A ));MMIO_D (TRANS_HSYNC (dev_priv,TRANSCODER_A )); -MMIO_D (TRANS_VTOTAL (TRANSCODER_A )); +MMIO_D (TRANS_VTOTAL (dev_priv,TRANSCODER_A ));MMIO_D (TRANS_VBLANK (TRANSCODER_A ));MMIO_D (TRANS_VSYNC (TRANSCODER_A ));MMIO_D (BCLRPAT (TRANSCODER_A ));
@@ -243,7 +243,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (TRANS_HTOTAL (dev_priv,TRANSCODER_B ));MMIO_D (TRANS_HBLANK (dev_priv,TRANSCODER_B ));MMIO_D (TRANS_HSYNC (dev_priv,TRANSCODER_B )); -MMIO_D (TRANS_VTOTAL (TRANSCODER_B )); +MMIO_D (TRANS_VTOTAL (dev_priv,TRANSCODER_B ));MMIO_D (TRANS_VBLANK (TRANSCODER_B ));MMIO_D (TRANS_VSYNC (TRANSCODER_B ));MMIO_D (BCLRPAT (TRANSCODER_B ));
@@ -252,7 +252,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (TRANS_HTOTAL (dev_priv,TRANSCODER_C ));MMIO_D (TRANS_HBLANK (dev_priv,TRANSCODER_C ));MMIO_D (TRANS_HSYNC (dev_priv,TRANSCODER_C )); -MMIO_D (TRANS_VTOTAL (TRANSCODER_C )); +MMIO_D (TRANS_VTOTAL (dev_priv,TRANSCODER_C ));MMIO_D (TRANS_VBLANK (TRANSCODER_C ));MMIO_D (TRANS_VSYNC (TRANSCODER_C ));MMIO_D (BCLRPAT (TRANSCODER_C ));
@@ -261,7 +261,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (TRANS_HTOTAL (dev_priv,TRANSCODER_EDP ));MMIO_D (TRANS_HBLANK (dev_priv,TRANSCODER_EDP ));MMIO_D (TRANS_HSYNC (dev_priv,TRANSCODER_EDP )); -MMIO_D (TRANS_VTOTAL (TRANSCODER_EDP )); +MMIO_D (TRANS_VTOTAL (dev_priv,TRANSCODER_EDP ));MMIO_D (TRANS_VBLANK (TRANSCODER_EDP ));MMIO_D (TRANS_VSYNC (TRANSCODER_EDP ));MMIO_D (BCLRPAT (TRANSCODER_EDP ));
Signature · 1 line
2.39.2
Re: [PATCH 06/65] drm/i915: pass dev_priv explicitly to TRANS_VTOTAL
Quoted 2 lines · Jani Nikula
Avoid the implicit
dev_privlocal variable use, and passdev_privexplicitly to theTRANS_VTOTALregister macro.
Quoted 170 lines
Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/display/icl_dsi.c | 2 +- drivers/gpu/drm/i915/display/intel_crt.c | 3 ++- drivers/gpu/drm/i915/display/intel_display.c | 10 +++++----- drivers/gpu/drm/i915/display/intel_pch_display.c | 2 +- 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 ++++---- 7 files changed, 15 insertions(+), 14 deletions(-)drivers/gpu/drm/i915/display/icl_dsi.c +1
-1@@ -953,7 +953,7 @@ gen11_dsi_set_transcoder_timings(struct intel_encoder *encoder,* struct drm_display_mode. * For interlace mode: program required pixel minus 2 */ -intel_de_write (dev_priv,TRANS_VTOTAL (dsi_trans), +intel_de_write (dev_priv,TRANS_VTOTAL (dev_priv, dsi_trans),VACTIVE (vactive -1 ) |VTOTAL (vtotal -1 )); }drivers/gpu/drm/i915/display/intel_crt.c +2
-1@@ -708,7 +708,8 @@ intel_crt_load_detect(struct intel_crt *crt, enum pipe pipe)drm_dbg_kms (&dev_priv->drm,"starting load-detect on CRT\n" ); save_bclrpat =intel_de_read (dev_priv,BCLRPAT (cpu_transcoder)); - save_vtotal =intel_de_read (dev_priv,TRANS_VTOTAL (cpu_transcoder)); + save_vtotal =intel_de_read (dev_priv, +TRANS_VTOTAL (dev_priv, cpu_transcoder)); vblank =intel_de_read (dev_priv,TRANS_VBLANK (cpu_transcoder)); vtotal =REG_FIELD_GET (VTOTAL_MASK , save_vtotal) +1 ;drivers/gpu/drm/i915/display/intel_display.c +5
-5@@ -2720,7 +2720,7 @@ static void intel_set_transcoder_timings(const struct intel_crtc_state *crtc_staHSYNC_START (adjusted_mode->crtc_hsync_start -1 ) | HSYNC_END(adjusted_mode->crtc_hsync_end - 1)); -intel_de_write (dev_priv,TRANS_VTOTAL (cpu_transcoder), +intel_de_write (dev_priv,TRANS_VTOTAL (dev_priv, cpu_transcoder),VACTIVE (crtc_vdisplay -1 ) |VTOTAL (crtc_vtotal -1 )); intel_de_write(dev_priv, TRANS_VBLANK(cpu_transcoder),@@ -2736,7 +2736,7 @@ static void intel_set_transcoder_timings(const struct intel_crtc_state *crtc_sta* bits. */ if (IS_HASWELL (dev_priv) && cpu_transcoder ==TRANSCODER_EDP && (pipe ==PIPE_B || pipe ==PIPE_C )) -intel_de_write (dev_priv,TRANS_VTOTAL (pipe), +intel_de_write (dev_priv,TRANS_VTOTAL (dev_priv, pipe),VACTIVE (crtc_vdisplay -1 ) |VTOTAL (crtc_vtotal -1 )); }@@ -2767,7 +2767,7 @@ static void intel_set_transcoder_timings_lrr(const struct intel_crtc_state *crtc* The double buffer latch point for TRANS_VTOTAL * is the transcoder's undelayed vblank. */ -intel_de_write (dev_priv,TRANS_VTOTAL (cpu_transcoder), +intel_de_write (dev_priv,TRANS_VTOTAL (dev_priv, cpu_transcoder),VACTIVE (crtc_vdisplay -1 ) |VTOTAL (crtc_vtotal -1 )); }@@ -2826,7 +2826,7 @@ static void intel_get_transcoder_timings(struct intel_crtc *crtc, adjusted_mode->crtc_hsync_start =REG_FIELD_GET (HSYNC_START_MASK , tmp) +1 ; adjusted_mode->crtc_hsync_end =REG_FIELD_GET (HSYNC_END_MASK , tmp) +1 ; - tmp =intel_de_read (dev_priv,TRANS_VTOTAL (cpu_transcoder)); + tmp =intel_de_read (dev_priv,TRANS_VTOTAL (dev_priv, cpu_transcoder)); adjusted_mode->crtc_vdisplay =REG_FIELD_GET (VACTIVE_MASK , tmp) +1 ; adjusted_mode->crtc_vtotal =REG_FIELD_GET (VTOTAL_MASK , tmp) +1 ;@@ -8196,7 +8196,7 @@ void i830_enable_pipe(struct drm_i915_private *dev_priv, enum pipe pipe) HBLANK_START(640 - 1) | HBLANK_END(800 - 1));intel_de_write (dev_priv,TRANS_HSYNC (dev_priv, cpu_transcoder),HSYNC_START (656 -1 ) |HSYNC_END (752 -1 )); -intel_de_write (dev_priv,TRANS_VTOTAL (cpu_transcoder), +intel_de_write (dev_priv,TRANS_VTOTAL (dev_priv, cpu_transcoder),VACTIVE (480 -1 ) |VTOTAL (525 -1 ));intel_de_write (dev_priv,TRANS_VBLANK (cpu_transcoder),VBLANK_START (480 -1 ) |VBLANK_END (525 -1 ));drivers/gpu/drm/i915/display/intel_pch_display.c +1
-1@@ -231,7 +231,7 @@ static void ilk_pch_transcoder_set_timings(const struct intel_crtc_state *crtc_s intel_de_read(dev_priv, TRANS_HSYNC(dev_priv, cpu_transcoder)));intel_de_write (dev_priv,PCH_TRANS_VTOTAL (pch_transcoder), -intel_de_read (dev_priv,TRANS_VTOTAL (cpu_transcoder))); +intel_de_read (dev_priv,TRANS_VTOTAL (dev_priv, cpu_transcoder)));intel_de_write (dev_priv,PCH_TRANS_VBLANK (pch_transcoder),intel_de_read (dev_priv,TRANS_VBLANK (cpu_transcoder))); intel_de_write(dev_priv, PCH_TRANS_VSYNC(pch_transcoder),drivers/gpu/drm/i915/gvt/handlers.c +1
-1@@ -678,7 +678,7 @@ static void vgpu_update_refresh_rate(struct intel_vgpu *vgpu)/* Get H/V total from transcoder timing */ htotal = (vgpu_vreg_t (vgpu,TRANS_HTOTAL (dev_priv,TRANSCODER_A )) >>TRANS_HTOTAL_SHIFT ); - vtotal = (vgpu_vreg_t (vgpu,TRANS_VTOTAL (TRANSCODER_A )) >>TRANS_VTOTAL_SHIFT ); + vtotal = (vgpu_vreg_t (vgpu,TRANS_VTOTAL (dev_priv,TRANSCODER_A )) >>TRANS_VTOTAL_SHIFT );if (dp_br && link_n && htotal && vtotal) {u64 pixel_clk =0 ;drivers/gpu/drm/i915/i915_reg.h +1
-1@@ -1220,7 +1220,7 @@#define TRANS_HTOTAL (dev_priv, trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_HTOTAL_A)#define TRANS_HBLANK (dev_priv, trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_HBLANK_A)#define TRANS_HSYNC (dev_priv, trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_HSYNC_A) -#define TRANS_VTOTAL (trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_VTOTAL_A) +#define TRANS_VTOTAL (dev_priv, trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_VTOTAL_A)#define TRANS_VBLANK (trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_VBLANK_A)#define TRANS_VSYNC (trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_VSYNC_A)#define BCLRPAT (trans) _MMIO_TRANS2(dev_priv, (trans), _BCLRPAT_A)drivers/gpu/drm/i915/intel_gvt_mmio_table.c +4
-4@@ -234,7 +234,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (TRANS_HTOTAL (dev_priv,TRANSCODER_A ));MMIO_D (TRANS_HBLANK (dev_priv,TRANSCODER_A ));MMIO_D (TRANS_HSYNC (dev_priv,TRANSCODER_A )); -MMIO_D (TRANS_VTOTAL (TRANSCODER_A )); +MMIO_D (TRANS_VTOTAL (dev_priv,TRANSCODER_A ));MMIO_D (TRANS_VBLANK (TRANSCODER_A ));MMIO_D (TRANS_VSYNC (TRANSCODER_A ));MMIO_D (BCLRPAT (TRANSCODER_A ));@@ -243,7 +243,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (TRANS_HTOTAL (dev_priv,TRANSCODER_B ));MMIO_D (TRANS_HBLANK (dev_priv,TRANSCODER_B ));MMIO_D (TRANS_HSYNC (dev_priv,TRANSCODER_B )); -MMIO_D (TRANS_VTOTAL (TRANSCODER_B )); +MMIO_D (TRANS_VTOTAL (dev_priv,TRANSCODER_B ));MMIO_D (TRANS_VBLANK (TRANSCODER_B ));MMIO_D (TRANS_VSYNC (TRANSCODER_B ));MMIO_D (BCLRPAT (TRANSCODER_B ));@@ -252,7 +252,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (TRANS_HTOTAL (dev_priv,TRANSCODER_C ));MMIO_D (TRANS_HBLANK (dev_priv,TRANSCODER_C ));MMIO_D (TRANS_HSYNC (dev_priv,TRANSCODER_C )); -MMIO_D (TRANS_VTOTAL (TRANSCODER_C )); +MMIO_D (TRANS_VTOTAL (dev_priv,TRANSCODER_C ));MMIO_D (TRANS_VBLANK (TRANSCODER_C ));MMIO_D (TRANS_VSYNC (TRANSCODER_C ));MMIO_D (BCLRPAT (TRANSCODER_C ));@@ -261,7 +261,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (TRANS_HTOTAL (dev_priv,TRANSCODER_EDP ));MMIO_D (TRANS_HBLANK (dev_priv,TRANSCODER_EDP ));MMIO_D (TRANS_HSYNC (dev_priv,TRANSCODER_EDP )); -MMIO_D (TRANS_VTOTAL (TRANSCODER_EDP )); +MMIO_D (TRANS_VTOTAL (dev_priv,TRANSCODER_EDP ));MMIO_D (TRANS_VBLANK (TRANSCODER_EDP ));MMIO_D (TRANS_VSYNC (TRANSCODER_EDP ));MMIO_D (BCLRPAT (TRANSCODER_EDP ));Signature · 1 line
2.39.2
PATCH 7/65 drm/i915: pass dev_priv explicitly to TRANS_VBLANK
In reply to Jani NikulaAvoid the implicit dev_priv local variable use, and pass dev_priv explicitly to the TRANS_VBLANK register macro.
--- drivers/gpu/drm/i915/display/icl_dsi.c | 3 ++- drivers/gpu/drm/i915/display/intel_crt.c | 10 +++++++--- drivers/gpu/drm/i915/display/intel_display.c | 9 +++++---- drivers/gpu/drm/i915/display/intel_pch_display.c | 2 +- drivers/gpu/drm/i915/i915_reg.h | 2 +- drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 8 ++++---- 6 files changed, 20 insertions(+), 14 deletions(-)
drivers/gpu/drm/i915/display/icl_dsi.c +2 -1
@@ -995,7 +995,8 @@ gen11_dsi_set_transcoder_timings(struct intel_encoder *encoder,if (DISPLAY_VER (dev_priv) >=12 ) {for_each_dsi_port (port, intel_dsi->ports) { dsi_trans =dsi_port_to_transcoder (port); -intel_de_write (dev_priv,TRANS_VBLANK (dsi_trans), +intel_de_write (dev_priv, +TRANS_VBLANK (dev_priv, dsi_trans),VBLANK_START (vactive -1 ) |VBLANK_END (vtotal -1 )); } }
drivers/gpu/drm/i915/display/intel_crt.c +7 -3
@@ -710,7 +710,8 @@ intel_crt_load_detect(struct intel_crt *crt, enum pipe pipe) save_bclrpat =intel_de_read (dev_priv,BCLRPAT (cpu_transcoder)); save_vtotal =intel_de_read (dev_priv,TRANS_VTOTAL (dev_priv, cpu_transcoder)); - vblank =intel_de_read (dev_priv,TRANS_VBLANK (cpu_transcoder)); + vblank =intel_de_read (dev_priv, +TRANS_VBLANK (dev_priv, cpu_transcoder)); vtotal =REG_FIELD_GET (VTOTAL_MASK , save_vtotal) +1 ; vactive =REG_FIELD_GET (VACTIVE_MASK , save_vtotal) +1 ;
@@ -749,7 +750,8 @@ intel_crt_load_detect(struct intel_crt *crt, enum pipe pipe)u32 vsync_start =REG_FIELD_GET (VSYNC_START_MASK , vsync) +1 ; vblank_start = vsync_start; -intel_de_write (dev_priv,TRANS_VBLANK (cpu_transcoder), +intel_de_write (dev_priv, +TRANS_VBLANK (dev_priv, cpu_transcoder),VBLANK_START (vblank_start -1 ) |VBLANK_END (vblank_end -1 )); restore_vblank = true;
@@ -782,7 +784,9 @@ intel_crt_load_detect(struct intel_crt *crt, enum pipe pipe)/* restore vblank if necessary */ if (restore_vblank) -intel_de_write (dev_priv,TRANS_VBLANK (cpu_transcoder), vblank); +intel_de_write (dev_priv, +TRANS_VBLANK (dev_priv, cpu_transcoder), + vblank);/* * If more than 3/4 of the scanline detected a monitor, * then it is assumed to be present. This works even on i830,
drivers/gpu/drm/i915/display/intel_display.c +5 -4
@@ -2723,7 +2723,7 @@ static void intel_set_transcoder_timings(const struct intel_crtc_state *crtc_staintel_de_write (dev_priv,TRANS_VTOTAL (dev_priv, cpu_transcoder),VACTIVE (crtc_vdisplay -1 ) |VTOTAL (crtc_vtotal -1 )); -intel_de_write (dev_priv,TRANS_VBLANK (cpu_transcoder), +intel_de_write (dev_priv,TRANS_VBLANK (dev_priv, cpu_transcoder),VBLANK_START (crtc_vblank_start -1 ) |VBLANK_END (crtc_vblank_end -1 )); intel_de_write(dev_priv, TRANS_VSYNC(cpu_transcoder),
@@ -2760,7 +2760,7 @@ static void intel_set_transcoder_timings_lrr(const struct intel_crtc_state *crtc* The hardware actually ignores TRANS_VBLANK.VBLANK_END in DP mode. * But let's write it anyway to keep the state checker happy. */ -intel_de_write (dev_priv,TRANS_VBLANK (cpu_transcoder), +intel_de_write (dev_priv,TRANS_VBLANK (dev_priv, cpu_transcoder),VBLANK_START (crtc_vblank_start -1 ) |VBLANK_END (crtc_vblank_end -1 ));/*
@@ -2832,7 +2832,8 @@ static void intel_get_transcoder_timings(struct intel_crtc *crtc,/* FIXME TGL+ DSI transcoders have this! */ if (!transcoder_is_dsi (cpu_transcoder)) { - tmp =intel_de_read (dev_priv,TRANS_VBLANK (cpu_transcoder)); + tmp =intel_de_read (dev_priv, +TRANS_VBLANK (dev_priv, cpu_transcoder)); adjusted_mode->crtc_vblank_start =REG_FIELD_GET (VBLANK_START_MASK , tmp) +1 ; adjusted_mode->crtc_vblank_end =REG_FIELD_GET (VBLANK_END_MASK , tmp) +1 ; }
@@ -8198,7 +8199,7 @@ void i830_enable_pipe(struct drm_i915_private *dev_priv, enum pipe pipe) HSYNC_START(656 - 1) | HSYNC_END(752 - 1));intel_de_write (dev_priv,TRANS_VTOTAL (dev_priv, cpu_transcoder),VACTIVE (480 -1 ) |VTOTAL (525 -1 )); -intel_de_write (dev_priv,TRANS_VBLANK (cpu_transcoder), +intel_de_write (dev_priv,TRANS_VBLANK (dev_priv, cpu_transcoder),VBLANK_START (480 -1 ) |VBLANK_END (525 -1 ));intel_de_write (dev_priv,TRANS_VSYNC (cpu_transcoder),VSYNC_START (490 -1 ) |VSYNC_END (492 -1 ));
drivers/gpu/drm/i915/display/intel_pch_display.c +1 -1
@@ -233,7 +233,7 @@ static void ilk_pch_transcoder_set_timings(const struct intel_crtc_state *crtc_sintel_de_write (dev_priv,PCH_TRANS_VTOTAL (pch_transcoder),intel_de_read (dev_priv,TRANS_VTOTAL (dev_priv, cpu_transcoder)));intel_de_write (dev_priv,PCH_TRANS_VBLANK (pch_transcoder), -intel_de_read (dev_priv,TRANS_VBLANK (cpu_transcoder))); +intel_de_read (dev_priv,TRANS_VBLANK (dev_priv, cpu_transcoder)));intel_de_write (dev_priv,PCH_TRANS_VSYNC (pch_transcoder),intel_de_read (dev_priv,TRANS_VSYNC (cpu_transcoder))); intel_de_write(dev_priv, PCH_TRANS_VSYNCSHIFT(pch_transcoder),
drivers/gpu/drm/i915/i915_reg.h +1 -1
@@ -1221,7 +1221,7 @@#define TRANS_HBLANK (dev_priv, trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_HBLANK_A)#define TRANS_HSYNC (dev_priv, trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_HSYNC_A)#define TRANS_VTOTAL (dev_priv, trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_VTOTAL_A) -#define TRANS_VBLANK (trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_VBLANK_A) +#define TRANS_VBLANK (dev_priv, trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_VBLANK_A)#define TRANS_VSYNC (trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_VSYNC_A)#define BCLRPAT (trans) _MMIO_TRANS2(dev_priv, (trans), _BCLRPAT_A)#define TRANS_VSYNCSHIFT (trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_VSYNCSHIFT_A)
drivers/gpu/drm/i915/intel_gvt_mmio_table.c +4 -4
@@ -235,7 +235,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (TRANS_HBLANK (dev_priv,TRANSCODER_A ));MMIO_D (TRANS_HSYNC (dev_priv,TRANSCODER_A ));MMIO_D (TRANS_VTOTAL (dev_priv,TRANSCODER_A )); -MMIO_D (TRANS_VBLANK (TRANSCODER_A )); +MMIO_D (TRANS_VBLANK (dev_priv,TRANSCODER_A ));MMIO_D (TRANS_VSYNC (TRANSCODER_A ));MMIO_D (BCLRPAT (TRANSCODER_A ));MMIO_D (TRANS_VSYNCSHIFT (TRANSCODER_A ));
@@ -244,7 +244,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (TRANS_HBLANK (dev_priv,TRANSCODER_B ));MMIO_D (TRANS_HSYNC (dev_priv,TRANSCODER_B ));MMIO_D (TRANS_VTOTAL (dev_priv,TRANSCODER_B )); -MMIO_D (TRANS_VBLANK (TRANSCODER_B )); +MMIO_D (TRANS_VBLANK (dev_priv,TRANSCODER_B ));MMIO_D (TRANS_VSYNC (TRANSCODER_B ));MMIO_D (BCLRPAT (TRANSCODER_B ));MMIO_D (TRANS_VSYNCSHIFT (TRANSCODER_B ));
@@ -253,7 +253,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (TRANS_HBLANK (dev_priv,TRANSCODER_C ));MMIO_D (TRANS_HSYNC (dev_priv,TRANSCODER_C ));MMIO_D (TRANS_VTOTAL (dev_priv,TRANSCODER_C )); -MMIO_D (TRANS_VBLANK (TRANSCODER_C )); +MMIO_D (TRANS_VBLANK (dev_priv,TRANSCODER_C ));MMIO_D (TRANS_VSYNC (TRANSCODER_C ));MMIO_D (BCLRPAT (TRANSCODER_C ));MMIO_D (TRANS_VSYNCSHIFT (TRANSCODER_C ));
@@ -262,7 +262,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (TRANS_HBLANK (dev_priv,TRANSCODER_EDP ));MMIO_D (TRANS_HSYNC (dev_priv,TRANSCODER_EDP ));MMIO_D (TRANS_VTOTAL (dev_priv,TRANSCODER_EDP )); -MMIO_D (TRANS_VBLANK (TRANSCODER_EDP )); +MMIO_D (TRANS_VBLANK (dev_priv,TRANSCODER_EDP ));MMIO_D (TRANS_VSYNC (TRANSCODER_EDP ));MMIO_D (BCLRPAT (TRANSCODER_EDP ));MMIO_D (TRANS_VSYNCSHIFT (TRANSCODER_EDP ));
Signature · 1 line
2.39.2
Re: [PATCH 07/65] drm/i915: pass dev_priv explicitly to TRANS_VBLANK
Quoted 2 lines · Jani Nikula
Avoid the implicit
dev_privlocal variable use, and passdev_privexplicitly to theTRANS_VBLANKregister macro.
Quoted 170 lines
Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/display/icl_dsi.c | 3 ++- drivers/gpu/drm/i915/display/intel_crt.c | 10 +++++++--- drivers/gpu/drm/i915/display/intel_display.c | 9 +++++---- drivers/gpu/drm/i915/display/intel_pch_display.c | 2 +- drivers/gpu/drm/i915/i915_reg.h | 2 +- drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 8 ++++---- 6 files changed, 20 insertions(+), 14 deletions(-)drivers/gpu/drm/i915/display/icl_dsi.c +2
-1@@ -995,7 +995,8 @@ gen11_dsi_set_transcoder_timings(struct intel_encoder *encoder,if (DISPLAY_VER (dev_priv) >=12 ) {for_each_dsi_port (port, intel_dsi->ports) { dsi_trans =dsi_port_to_transcoder (port); -intel_de_write (dev_priv,TRANS_VBLANK (dsi_trans), +intel_de_write (dev_priv, +TRANS_VBLANK (dev_priv, dsi_trans),VBLANK_START (vactive -1 ) |VBLANK_END (vtotal -1 )); } }drivers/gpu/drm/i915/display/intel_crt.c +7
-3@@ -710,7 +710,8 @@ intel_crt_load_detect(struct intel_crt *crt, enum pipe pipe) save_bclrpat =intel_de_read (dev_priv,BCLRPAT (cpu_transcoder)); save_vtotal =intel_de_read (dev_priv,TRANS_VTOTAL (dev_priv, cpu_transcoder)); - vblank =intel_de_read (dev_priv,TRANS_VBLANK (cpu_transcoder)); + vblank =intel_de_read (dev_priv, +TRANS_VBLANK (dev_priv, cpu_transcoder)); vtotal =REG_FIELD_GET (VTOTAL_MASK , save_vtotal) +1 ; vactive =REG_FIELD_GET (VACTIVE_MASK , save_vtotal) +1 ;@@ -749,7 +750,8 @@ intel_crt_load_detect(struct intel_crt *crt, enum pipe pipe)u32 vsync_start =REG_FIELD_GET (VSYNC_START_MASK , vsync) +1 ; vblank_start = vsync_start; -intel_de_write (dev_priv,TRANS_VBLANK (cpu_transcoder), +intel_de_write (dev_priv, +TRANS_VBLANK (dev_priv, cpu_transcoder),VBLANK_START (vblank_start -1 ) |VBLANK_END (vblank_end -1 )); restore_vblank = true;@@ -782,7 +784,9 @@ intel_crt_load_detect(struct intel_crt *crt, enum pipe pipe)/* restore vblank if necessary */ if (restore_vblank) -intel_de_write (dev_priv,TRANS_VBLANK (cpu_transcoder), vblank); +intel_de_write (dev_priv, +TRANS_VBLANK (dev_priv, cpu_transcoder), + vblank);/* * If more than 3/4 of the scanline detected a monitor, * then it is assumed to be present. This works even on i830, drivers/gpu/drm/i915/display/intel_display.c +5
-4@@ -2723,7 +2723,7 @@ static void intel_set_transcoder_timings(const struct intel_crtc_state *crtc_staintel_de_write (dev_priv,TRANS_VTOTAL (dev_priv, cpu_transcoder),VACTIVE (crtc_vdisplay -1 ) |VTOTAL (crtc_vtotal -1 )); -intel_de_write (dev_priv,TRANS_VBLANK (cpu_transcoder), +intel_de_write (dev_priv,TRANS_VBLANK (dev_priv, cpu_transcoder),VBLANK_START (crtc_vblank_start -1 ) |VBLANK_END (crtc_vblank_end -1 )); intel_de_write(dev_priv, TRANS_VSYNC(cpu_transcoder),@@ -2760,7 +2760,7 @@ static void intel_set_transcoder_timings_lrr(const struct intel_crtc_state *crtc* The hardware actually ignores TRANS_VBLANK.VBLANK_END in DP mode. * But let's write it anyway to keep the state checker happy. */ -intel_de_write (dev_priv,TRANS_VBLANK (cpu_transcoder), +intel_de_write (dev_priv,TRANS_VBLANK (dev_priv, cpu_transcoder),VBLANK_START (crtc_vblank_start -1 ) |VBLANK_END (crtc_vblank_end -1 ));/* @@ -2832,7 +2832,8 @@ static void intel_get_transcoder_timings(struct intel_crtc *crtc,/* FIXME TGL+ DSI transcoders have this! */ if (!transcoder_is_dsi (cpu_transcoder)) { - tmp =intel_de_read (dev_priv,TRANS_VBLANK (cpu_transcoder)); + tmp =intel_de_read (dev_priv, +TRANS_VBLANK (dev_priv, cpu_transcoder)); adjusted_mode->crtc_vblank_start =REG_FIELD_GET (VBLANK_START_MASK , tmp) +1 ; adjusted_mode->crtc_vblank_end =REG_FIELD_GET (VBLANK_END_MASK , tmp) +1 ; }@@ -8198,7 +8199,7 @@ void i830_enable_pipe(struct drm_i915_private *dev_priv, enum pipe pipe) HSYNC_START(656 - 1) | HSYNC_END(752 - 1));intel_de_write (dev_priv,TRANS_VTOTAL (dev_priv, cpu_transcoder),VACTIVE (480 -1 ) |VTOTAL (525 -1 )); -intel_de_write (dev_priv,TRANS_VBLANK (cpu_transcoder), +intel_de_write (dev_priv,TRANS_VBLANK (dev_priv, cpu_transcoder),VBLANK_START (480 -1 ) |VBLANK_END (525 -1 ));intel_de_write (dev_priv,TRANS_VSYNC (cpu_transcoder),VSYNC_START (490 -1 ) |VSYNC_END (492 -1 ));drivers/gpu/drm/i915/display/intel_pch_display.c +1
-1@@ -233,7 +233,7 @@ static void ilk_pch_transcoder_set_timings(const struct intel_crtc_state *crtc_sintel_de_write (dev_priv,PCH_TRANS_VTOTAL (pch_transcoder),intel_de_read (dev_priv,TRANS_VTOTAL (dev_priv, cpu_transcoder)));intel_de_write (dev_priv,PCH_TRANS_VBLANK (pch_transcoder), -intel_de_read (dev_priv,TRANS_VBLANK (cpu_transcoder))); +intel_de_read (dev_priv,TRANS_VBLANK (dev_priv, cpu_transcoder)));intel_de_write (dev_priv,PCH_TRANS_VSYNC (pch_transcoder),intel_de_read (dev_priv,TRANS_VSYNC (cpu_transcoder))); intel_de_write(dev_priv, PCH_TRANS_VSYNCSHIFT(pch_transcoder),drivers/gpu/drm/i915/i915_reg.h +1
-1@@ -1221,7 +1221,7 @@#define TRANS_HBLANK (dev_priv, trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_HBLANK_A)#define TRANS_HSYNC (dev_priv, trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_HSYNC_A)#define TRANS_VTOTAL (dev_priv, trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_VTOTAL_A) -#define TRANS_VBLANK (trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_VBLANK_A) +#define TRANS_VBLANK (dev_priv, trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_VBLANK_A)#define TRANS_VSYNC (trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_VSYNC_A)#define BCLRPAT (trans) _MMIO_TRANS2(dev_priv, (trans), _BCLRPAT_A)#define TRANS_VSYNCSHIFT (trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_VSYNCSHIFT_A)drivers/gpu/drm/i915/intel_gvt_mmio_table.c +4
-4@@ -235,7 +235,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (TRANS_HBLANK (dev_priv,TRANSCODER_A ));MMIO_D (TRANS_HSYNC (dev_priv,TRANSCODER_A ));MMIO_D (TRANS_VTOTAL (dev_priv,TRANSCODER_A )); -MMIO_D (TRANS_VBLANK (TRANSCODER_A )); +MMIO_D (TRANS_VBLANK (dev_priv,TRANSCODER_A ));MMIO_D (TRANS_VSYNC (TRANSCODER_A ));MMIO_D (BCLRPAT (TRANSCODER_A ));MMIO_D (TRANS_VSYNCSHIFT (TRANSCODER_A ));@@ -244,7 +244,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (TRANS_HBLANK (dev_priv,TRANSCODER_B ));MMIO_D (TRANS_HSYNC (dev_priv,TRANSCODER_B ));MMIO_D (TRANS_VTOTAL (dev_priv,TRANSCODER_B )); -MMIO_D (TRANS_VBLANK (TRANSCODER_B )); +MMIO_D (TRANS_VBLANK (dev_priv,TRANSCODER_B ));MMIO_D (TRANS_VSYNC (TRANSCODER_B ));MMIO_D (BCLRPAT (TRANSCODER_B ));MMIO_D (TRANS_VSYNCSHIFT (TRANSCODER_B ));@@ -253,7 +253,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (TRANS_HBLANK (dev_priv,TRANSCODER_C ));MMIO_D (TRANS_HSYNC (dev_priv,TRANSCODER_C ));MMIO_D (TRANS_VTOTAL (dev_priv,TRANSCODER_C )); -MMIO_D (TRANS_VBLANK (TRANSCODER_C )); +MMIO_D (TRANS_VBLANK (dev_priv,TRANSCODER_C ));MMIO_D (TRANS_VSYNC (TRANSCODER_C ));MMIO_D (BCLRPAT (TRANSCODER_C ));MMIO_D (TRANS_VSYNCSHIFT (TRANSCODER_C ));@@ -262,7 +262,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (TRANS_HBLANK (dev_priv,TRANSCODER_EDP ));MMIO_D (TRANS_HSYNC (dev_priv,TRANSCODER_EDP ));MMIO_D (TRANS_VTOTAL (dev_priv,TRANSCODER_EDP )); -MMIO_D (TRANS_VBLANK (TRANSCODER_EDP )); +MMIO_D (TRANS_VBLANK (dev_priv,TRANSCODER_EDP ));MMIO_D (TRANS_VSYNC (TRANSCODER_EDP ));MMIO_D (BCLRPAT (TRANSCODER_EDP ));MMIO_D (TRANS_VSYNCSHIFT (TRANSCODER_EDP ));Signature · 1 line
2.39.2
PATCH 8/65 drm/i915: pass dev_priv explicitly to TRANS_VSYNC
In reply to Jani NikulaAvoid the implicit dev_priv local variable use, and pass dev_priv explicitly to the TRANS_VSYNC register macro.
--- drivers/gpu/drm/i915/display/icl_dsi.c | 3 ++- drivers/gpu/drm/i915/display/intel_crt.c | 3 ++- drivers/gpu/drm/i915/display/intel_display.c | 6 +++--- drivers/gpu/drm/i915/display/intel_pch_display.c | 2 +- drivers/gpu/drm/i915/i915_reg.h | 2 +- drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 8 ++++---- 6 files changed, 13 insertions(+), 11 deletions(-)
drivers/gpu/drm/i915/display/icl_dsi.c +2 -1
@@ -967,7 +967,8 @@ gen11_dsi_set_transcoder_timings(struct intel_encoder *encoder,if (is_vid_mode (intel_dsi)) {for_each_dsi_port (port, intel_dsi->ports) { dsi_trans =dsi_port_to_transcoder (port); -intel_de_write (dev_priv,TRANS_VSYNC (dsi_trans), +intel_de_write (dev_priv, +TRANS_VSYNC (dev_priv, dsi_trans),VSYNC_START (vsync_start -1 ) |VSYNC_END (vsync_end -1 )); } }
drivers/gpu/drm/i915/display/intel_crt.c +2 -1
@@ -746,7 +746,8 @@ intel_crt_load_detect(struct intel_crt *crt, enum pipe pipe)* Yes, this will flicker */ if (vblank_start <= vactive && vblank_end >= vtotal) { -u32 vsync =intel_de_read (dev_priv,TRANS_VSYNC (cpu_transcoder)); +u32 vsync =intel_de_read (dev_priv, +TRANS_VSYNC (dev_priv, cpu_transcoder));u32 vsync_start =REG_FIELD_GET (VSYNC_START_MASK , vsync) +1 ; vblank_start = vsync_start;
drivers/gpu/drm/i915/display/intel_display.c +3 -3
@@ -2726,7 +2726,7 @@ static void intel_set_transcoder_timings(const struct intel_crtc_state *crtc_staintel_de_write (dev_priv,TRANS_VBLANK (dev_priv, cpu_transcoder),VBLANK_START (crtc_vblank_start -1 ) |VBLANK_END (crtc_vblank_end -1 )); -intel_de_write (dev_priv,TRANS_VSYNC (cpu_transcoder), +intel_de_write (dev_priv,TRANS_VSYNC (dev_priv, cpu_transcoder),VSYNC_START (adjusted_mode->crtc_vsync_start -1 ) |VSYNC_END (adjusted_mode->crtc_vsync_end -1 ));
@@ -2837,7 +2837,7 @@ static void intel_get_transcoder_timings(struct intel_crtc *crtc, adjusted_mode->crtc_vblank_start =REG_FIELD_GET (VBLANK_START_MASK , tmp) +1 ; adjusted_mode->crtc_vblank_end =REG_FIELD_GET (VBLANK_END_MASK , tmp) +1 ; } - tmp =intel_de_read (dev_priv,TRANS_VSYNC (cpu_transcoder)); + tmp =intel_de_read (dev_priv,TRANS_VSYNC (dev_priv, cpu_transcoder)); adjusted_mode->crtc_vsync_start =REG_FIELD_GET (VSYNC_START_MASK , tmp) +1 ; adjusted_mode->crtc_vsync_end =REG_FIELD_GET (VSYNC_END_MASK , tmp) +1 ;
@@ -8201,7 +8201,7 @@ void i830_enable_pipe(struct drm_i915_private *dev_priv, enum pipe pipe) VACTIVE(480 - 1) | VTOTAL(525 - 1));intel_de_write (dev_priv,TRANS_VBLANK (dev_priv, cpu_transcoder),VBLANK_START (480 -1 ) |VBLANK_END (525 -1 )); -intel_de_write (dev_priv,TRANS_VSYNC (cpu_transcoder), +intel_de_write (dev_priv,TRANS_VSYNC (dev_priv, cpu_transcoder),VSYNC_START (490 -1 ) |VSYNC_END (492 -1 ));intel_de_write (dev_priv,PIPESRC (pipe),PIPESRC_WIDTH (640 -1 ) |PIPESRC_HEIGHT (480 -1 ));
drivers/gpu/drm/i915/display/intel_pch_display.c +1 -1
@@ -235,7 +235,7 @@ static void ilk_pch_transcoder_set_timings(const struct intel_crtc_state *crtc_sintel_de_write (dev_priv,PCH_TRANS_VBLANK (pch_transcoder),intel_de_read (dev_priv,TRANS_VBLANK (dev_priv, cpu_transcoder)));intel_de_write (dev_priv,PCH_TRANS_VSYNC (pch_transcoder), -intel_de_read (dev_priv,TRANS_VSYNC (cpu_transcoder))); +intel_de_read (dev_priv,TRANS_VSYNC (dev_priv, cpu_transcoder)));intel_de_write (dev_priv,PCH_TRANS_VSYNCSHIFT (pch_transcoder),intel_de_read (dev_priv,TRANS_VSYNCSHIFT (cpu_transcoder))); }
drivers/gpu/drm/i915/i915_reg.h +1 -1
@@ -1222,7 +1222,7 @@#define TRANS_HSYNC (dev_priv, trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_HSYNC_A)#define TRANS_VTOTAL (dev_priv, trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_VTOTAL_A)#define TRANS_VBLANK (dev_priv, trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_VBLANK_A) -#define TRANS_VSYNC (trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_VSYNC_A) +#define TRANS_VSYNC (dev_priv, trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_VSYNC_A)#define BCLRPAT (trans) _MMIO_TRANS2(dev_priv, (trans), _BCLRPAT_A)#define TRANS_VSYNCSHIFT (trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_VSYNCSHIFT_A)#define PIPESRC (pipe) _MMIO_TRANS2(dev_priv, (pipe), _PIPEASRC)
drivers/gpu/drm/i915/intel_gvt_mmio_table.c +4 -4
@@ -236,7 +236,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (TRANS_HSYNC (dev_priv,TRANSCODER_A ));MMIO_D (TRANS_VTOTAL (dev_priv,TRANSCODER_A ));MMIO_D (TRANS_VBLANK (dev_priv,TRANSCODER_A )); -MMIO_D (TRANS_VSYNC (TRANSCODER_A )); +MMIO_D (TRANS_VSYNC (dev_priv,TRANSCODER_A ));MMIO_D (BCLRPAT (TRANSCODER_A ));MMIO_D (TRANS_VSYNCSHIFT (TRANSCODER_A ));MMIO_D (PIPESRC (TRANSCODER_A ));
@@ -245,7 +245,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (TRANS_HSYNC (dev_priv,TRANSCODER_B ));MMIO_D (TRANS_VTOTAL (dev_priv,TRANSCODER_B ));MMIO_D (TRANS_VBLANK (dev_priv,TRANSCODER_B )); -MMIO_D (TRANS_VSYNC (TRANSCODER_B )); +MMIO_D (TRANS_VSYNC (dev_priv,TRANSCODER_B ));MMIO_D (BCLRPAT (TRANSCODER_B ));MMIO_D (TRANS_VSYNCSHIFT (TRANSCODER_B ));MMIO_D (PIPESRC (TRANSCODER_B ));
@@ -254,7 +254,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (TRANS_HSYNC (dev_priv,TRANSCODER_C ));MMIO_D (TRANS_VTOTAL (dev_priv,TRANSCODER_C ));MMIO_D (TRANS_VBLANK (dev_priv,TRANSCODER_C )); -MMIO_D (TRANS_VSYNC (TRANSCODER_C )); +MMIO_D (TRANS_VSYNC (dev_priv,TRANSCODER_C ));MMIO_D (BCLRPAT (TRANSCODER_C ));MMIO_D (TRANS_VSYNCSHIFT (TRANSCODER_C ));MMIO_D (PIPESRC (TRANSCODER_C ));
@@ -263,7 +263,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (TRANS_HSYNC (dev_priv,TRANSCODER_EDP ));MMIO_D (TRANS_VTOTAL (dev_priv,TRANSCODER_EDP ));MMIO_D (TRANS_VBLANK (dev_priv,TRANSCODER_EDP )); -MMIO_D (TRANS_VSYNC (TRANSCODER_EDP )); +MMIO_D (TRANS_VSYNC (dev_priv,TRANSCODER_EDP ));MMIO_D (BCLRPAT (TRANSCODER_EDP ));MMIO_D (TRANS_VSYNCSHIFT (TRANSCODER_EDP ));MMIO_D (PIPE_DATA_M1 (TRANSCODER_A ));
Signature · 1 line
2.39.2
Re: [PATCH 08/65] drm/i915: pass dev_priv explicitly to TRANS_VSYNC
Quoted 2 lines · Jani Nikula
Avoid the implicit
dev_privlocal variable use, and passdev_privexplicitly to theTRANS_VSYNCregister macro.
Quoted 139 lines
Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/display/icl_dsi.c | 3 ++- drivers/gpu/drm/i915/display/intel_crt.c | 3 ++- drivers/gpu/drm/i915/display/intel_display.c | 6 +++--- drivers/gpu/drm/i915/display/intel_pch_display.c | 2 +- drivers/gpu/drm/i915/i915_reg.h | 2 +- drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 8 ++++---- 6 files changed, 13 insertions(+), 11 deletions(-)drivers/gpu/drm/i915/display/icl_dsi.c +2
-1@@ -967,7 +967,8 @@ gen11_dsi_set_transcoder_timings(struct intel_encoder *encoder,if (is_vid_mode (intel_dsi)) {for_each_dsi_port (port, intel_dsi->ports) { dsi_trans =dsi_port_to_transcoder (port); -intel_de_write (dev_priv,TRANS_VSYNC (dsi_trans), +intel_de_write (dev_priv, +TRANS_VSYNC (dev_priv, dsi_trans),VSYNC_START (vsync_start -1 ) |VSYNC_END (vsync_end -1 )); } }drivers/gpu/drm/i915/display/intel_crt.c +2
-1@@ -746,7 +746,8 @@ intel_crt_load_detect(struct intel_crt *crt, enum pipe pipe)* Yes, this will flicker */ if (vblank_start <= vactive && vblank_end >= vtotal) { -u32 vsync =intel_de_read (dev_priv,TRANS_VSYNC (cpu_transcoder)); +u32 vsync =intel_de_read (dev_priv, +TRANS_VSYNC (dev_priv, cpu_transcoder));u32 vsync_start =REG_FIELD_GET (VSYNC_START_MASK , vsync) +1 ; vblank_start = vsync_start;drivers/gpu/drm/i915/display/intel_display.c +3
-3@@ -2726,7 +2726,7 @@ static void intel_set_transcoder_timings(const struct intel_crtc_state *crtc_staintel_de_write (dev_priv,TRANS_VBLANK (dev_priv, cpu_transcoder),VBLANK_START (crtc_vblank_start -1 ) |VBLANK_END (crtc_vblank_end -1 )); -intel_de_write (dev_priv,TRANS_VSYNC (cpu_transcoder), +intel_de_write (dev_priv,TRANS_VSYNC (dev_priv, cpu_transcoder),VSYNC_START (adjusted_mode->crtc_vsync_start -1 ) |VSYNC_END (adjusted_mode->crtc_vsync_end -1 ));@@ -2837,7 +2837,7 @@ static void intel_get_transcoder_timings(struct intel_crtc *crtc, adjusted_mode->crtc_vblank_start =REG_FIELD_GET (VBLANK_START_MASK , tmp) +1 ; adjusted_mode->crtc_vblank_end =REG_FIELD_GET (VBLANK_END_MASK , tmp) +1 ; } - tmp =intel_de_read (dev_priv,TRANS_VSYNC (cpu_transcoder)); + tmp =intel_de_read (dev_priv,TRANS_VSYNC (dev_priv, cpu_transcoder)); adjusted_mode->crtc_vsync_start =REG_FIELD_GET (VSYNC_START_MASK , tmp) +1 ; adjusted_mode->crtc_vsync_end =REG_FIELD_GET (VSYNC_END_MASK , tmp) +1 ;@@ -8201,7 +8201,7 @@ void i830_enable_pipe(struct drm_i915_private *dev_priv, enum pipe pipe) VACTIVE(480 - 1) | VTOTAL(525 - 1));intel_de_write (dev_priv,TRANS_VBLANK (dev_priv, cpu_transcoder),VBLANK_START (480 -1 ) |VBLANK_END (525 -1 )); -intel_de_write (dev_priv,TRANS_VSYNC (cpu_transcoder), +intel_de_write (dev_priv,TRANS_VSYNC (dev_priv, cpu_transcoder),VSYNC_START (490 -1 ) |VSYNC_END (492 -1 ));intel_de_write (dev_priv,PIPESRC (pipe),PIPESRC_WIDTH (640 -1 ) |PIPESRC_HEIGHT (480 -1 ));drivers/gpu/drm/i915/display/intel_pch_display.c +1
-1@@ -235,7 +235,7 @@ static void ilk_pch_transcoder_set_timings(const struct intel_crtc_state *crtc_sintel_de_write (dev_priv,PCH_TRANS_VBLANK (pch_transcoder),intel_de_read (dev_priv,TRANS_VBLANK (dev_priv, cpu_transcoder)));intel_de_write (dev_priv,PCH_TRANS_VSYNC (pch_transcoder), -intel_de_read (dev_priv,TRANS_VSYNC (cpu_transcoder))); +intel_de_read (dev_priv,TRANS_VSYNC (dev_priv, cpu_transcoder)));intel_de_write (dev_priv,PCH_TRANS_VSYNCSHIFT (pch_transcoder),intel_de_read (dev_priv,TRANS_VSYNCSHIFT (cpu_transcoder))); }drivers/gpu/drm/i915/i915_reg.h +1
-1@@ -1222,7 +1222,7 @@#define TRANS_HSYNC (dev_priv, trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_HSYNC_A)#define TRANS_VTOTAL (dev_priv, trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_VTOTAL_A)#define TRANS_VBLANK (dev_priv, trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_VBLANK_A) -#define TRANS_VSYNC (trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_VSYNC_A) +#define TRANS_VSYNC (dev_priv, trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_VSYNC_A)#define BCLRPAT (trans) _MMIO_TRANS2(dev_priv, (trans), _BCLRPAT_A)#define TRANS_VSYNCSHIFT (trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_VSYNCSHIFT_A)#define PIPESRC (pipe) _MMIO_TRANS2(dev_priv, (pipe), _PIPEASRC)drivers/gpu/drm/i915/intel_gvt_mmio_table.c +4
-4@@ -236,7 +236,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (TRANS_HSYNC (dev_priv,TRANSCODER_A ));MMIO_D (TRANS_VTOTAL (dev_priv,TRANSCODER_A ));MMIO_D (TRANS_VBLANK (dev_priv,TRANSCODER_A )); -MMIO_D (TRANS_VSYNC (TRANSCODER_A )); +MMIO_D (TRANS_VSYNC (dev_priv,TRANSCODER_A ));MMIO_D (BCLRPAT (TRANSCODER_A ));MMIO_D (TRANS_VSYNCSHIFT (TRANSCODER_A ));MMIO_D (PIPESRC (TRANSCODER_A ));@@ -245,7 +245,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (TRANS_HSYNC (dev_priv,TRANSCODER_B ));MMIO_D (TRANS_VTOTAL (dev_priv,TRANSCODER_B ));MMIO_D (TRANS_VBLANK (dev_priv,TRANSCODER_B )); -MMIO_D (TRANS_VSYNC (TRANSCODER_B )); +MMIO_D (TRANS_VSYNC (dev_priv,TRANSCODER_B ));MMIO_D (BCLRPAT (TRANSCODER_B ));MMIO_D (TRANS_VSYNCSHIFT (TRANSCODER_B ));MMIO_D (PIPESRC (TRANSCODER_B ));@@ -254,7 +254,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (TRANS_HSYNC (dev_priv,TRANSCODER_C ));MMIO_D (TRANS_VTOTAL (dev_priv,TRANSCODER_C ));MMIO_D (TRANS_VBLANK (dev_priv,TRANSCODER_C )); -MMIO_D (TRANS_VSYNC (TRANSCODER_C )); +MMIO_D (TRANS_VSYNC (dev_priv,TRANSCODER_C ));MMIO_D (BCLRPAT (TRANSCODER_C ));MMIO_D (TRANS_VSYNCSHIFT (TRANSCODER_C ));MMIO_D (PIPESRC (TRANSCODER_C ));@@ -263,7 +263,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (TRANS_HSYNC (dev_priv,TRANSCODER_EDP ));MMIO_D (TRANS_VTOTAL (dev_priv,TRANSCODER_EDP ));MMIO_D (TRANS_VBLANK (dev_priv,TRANSCODER_EDP )); -MMIO_D (TRANS_VSYNC (TRANSCODER_EDP )); +MMIO_D (TRANS_VSYNC (dev_priv,TRANSCODER_EDP ));MMIO_D (BCLRPAT (TRANSCODER_EDP ));MMIO_D (TRANS_VSYNCSHIFT (TRANSCODER_EDP ));MMIO_D (PIPE_DATA_M1 (TRANSCODER_A ));Signature · 1 line
2.39.2
PATCH 9/65 drm/i915: pass dev_priv explicitly to BCLRPAT
In reply to Jani NikulaAvoid the implicit dev_priv local variable use, and pass dev_priv explicitly to the BCLRPAT register macro.
--- drivers/gpu/drm/i915/display/intel_crt.c | 10 ++++++---- drivers/gpu/drm/i915/display/intel_display.c | 2 +- drivers/gpu/drm/i915/i915_reg.h | 2 +- drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 8 ++++---- 4 files changed, 12 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/display/intel_crt.c +6 -4
@@ -193,7 +193,7 @@ static void intel_crt_set_dpms(struct intel_encoder *encoder, adpa |=ADPA_PIPE_SEL (crtc->pipe);if (!HAS_PCH_SPLIT (dev_priv)) -intel_de_write (dev_priv,BCLRPAT (crtc->pipe),0 ); +intel_de_write (dev_priv,BCLRPAT (dev_priv, crtc->pipe),0 );switch (mode) {case DRM_MODE_DPMS_ON :
@@ -707,7 +707,8 @@ intel_crt_load_detect(struct intel_crt *crt, enum pipe pipe)drm_dbg_kms (&dev_priv->drm,"starting load-detect on CRT\n" ); - save_bclrpat =intel_de_read (dev_priv,BCLRPAT (cpu_transcoder)); + save_bclrpat =intel_de_read (dev_priv, +BCLRPAT (dev_priv, cpu_transcoder)); save_vtotal =intel_de_read (dev_priv,TRANS_VTOTAL (dev_priv, cpu_transcoder)); vblank = intel_de_read(dev_priv,
@@ -720,7 +721,7 @@ intel_crt_load_detect(struct intel_crt *crt, enum pipe pipe) vblank_end =REG_FIELD_GET (VBLANK_END_MASK , vblank) +1 ;/* Set the border color to purple. */ -intel_de_write (dev_priv,BCLRPAT (cpu_transcoder),0x500050 ); +intel_de_write (dev_priv,BCLRPAT (dev_priv, cpu_transcoder),0x500050 );if (DISPLAY_VER (dev_priv) !=2 ) {u32 transconf =intel_de_read (dev_priv,TRANSCONF (cpu_transcoder));
@@ -800,7 +801,8 @@ intel_crt_load_detect(struct intel_crt *crt, enum pipe pipe) }/* Restore previous settings */ -intel_de_write (dev_priv,BCLRPAT (cpu_transcoder), save_bclrpat); +intel_de_write (dev_priv,BCLRPAT (dev_priv, cpu_transcoder), + save_bclrpat);return status; }
drivers/gpu/drm/i915/display/intel_display.c +1 -1
@@ -1870,7 +1870,7 @@ static void i9xx_pfit_enable(const struct intel_crtc_state *crtc_state)/* Border color in case we don't scale up to the full screen. Black by * default, change to something else for debugging. */ -intel_de_write (dev_priv,BCLRPAT (crtc->pipe),0 ); +intel_de_write (dev_priv,BCLRPAT (dev_priv, crtc->pipe),0 ); }/* Prefer intel_encoder_is_combo() */
drivers/gpu/drm/i915/i915_reg.h +1 -1
@@ -1223,7 +1223,7 @@#define TRANS_VTOTAL (dev_priv, trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_VTOTAL_A)#define TRANS_VBLANK (dev_priv, trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_VBLANK_A)#define TRANS_VSYNC (dev_priv, trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_VSYNC_A) -#define BCLRPAT (trans) _MMIO_TRANS2(dev_priv, (trans), _BCLRPAT_A) +#define BCLRPAT (dev_priv, trans) _MMIO_TRANS2(dev_priv, (trans), _BCLRPAT_A)#define TRANS_VSYNCSHIFT (trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_VSYNCSHIFT_A)#define PIPESRC (pipe) _MMIO_TRANS2(dev_priv, (pipe), _PIPEASRC)#define TRANS_MULT (trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_MULT_A)
drivers/gpu/drm/i915/intel_gvt_mmio_table.c +4 -4
@@ -237,7 +237,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (TRANS_VTOTAL (dev_priv,TRANSCODER_A ));MMIO_D (TRANS_VBLANK (dev_priv,TRANSCODER_A ));MMIO_D (TRANS_VSYNC (dev_priv,TRANSCODER_A )); -MMIO_D (BCLRPAT (TRANSCODER_A )); +MMIO_D (BCLRPAT (dev_priv,TRANSCODER_A ));MMIO_D (TRANS_VSYNCSHIFT (TRANSCODER_A ));MMIO_D (PIPESRC (TRANSCODER_A ));MMIO_D (TRANS_HTOTAL (dev_priv,TRANSCODER_B ));
@@ -246,7 +246,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (TRANS_VTOTAL (dev_priv,TRANSCODER_B ));MMIO_D (TRANS_VBLANK (dev_priv,TRANSCODER_B ));MMIO_D (TRANS_VSYNC (dev_priv,TRANSCODER_B )); -MMIO_D (BCLRPAT (TRANSCODER_B )); +MMIO_D (BCLRPAT (dev_priv,TRANSCODER_B ));MMIO_D (TRANS_VSYNCSHIFT (TRANSCODER_B ));MMIO_D (PIPESRC (TRANSCODER_B ));MMIO_D (TRANS_HTOTAL (dev_priv,TRANSCODER_C ));
@@ -255,7 +255,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (TRANS_VTOTAL (dev_priv,TRANSCODER_C ));MMIO_D (TRANS_VBLANK (dev_priv,TRANSCODER_C ));MMIO_D (TRANS_VSYNC (dev_priv,TRANSCODER_C )); -MMIO_D (BCLRPAT (TRANSCODER_C )); +MMIO_D (BCLRPAT (dev_priv,TRANSCODER_C ));MMIO_D (TRANS_VSYNCSHIFT (TRANSCODER_C ));MMIO_D (PIPESRC (TRANSCODER_C ));MMIO_D (TRANS_HTOTAL (dev_priv,TRANSCODER_EDP ));
@@ -264,7 +264,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (TRANS_VTOTAL (dev_priv,TRANSCODER_EDP ));MMIO_D (TRANS_VBLANK (dev_priv,TRANSCODER_EDP ));MMIO_D (TRANS_VSYNC (dev_priv,TRANSCODER_EDP )); -MMIO_D (BCLRPAT (TRANSCODER_EDP )); +MMIO_D (BCLRPAT (dev_priv,TRANSCODER_EDP ));MMIO_D (TRANS_VSYNCSHIFT (TRANSCODER_EDP ));MMIO_D (PIPE_DATA_M1 (TRANSCODER_A ));MMIO_D (PIPE_DATA_N1 (TRANSCODER_A ));
Signature · 1 line
2.39.2
Re: [PATCH 09/65] drm/i915: pass dev_priv explicitly to BCLRPAT
Quoted 2 lines · Jani Nikula
Avoid the implicit
dev_privlocal variable use, and passdev_privexplicitly to the BCLRPAT register macro.
Quoted 120 lines
Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/display/intel_crt.c | 10 ++++++---- drivers/gpu/drm/i915/display/intel_display.c | 2 +- drivers/gpu/drm/i915/i915_reg.h | 2 +- drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 8 ++++---- 4 files changed, 12 insertions(+), 10 deletions(-)drivers/gpu/drm/i915/display/intel_crt.c +6
-4@@ -193,7 +193,7 @@ static void intel_crt_set_dpms(struct intel_encoder *encoder, adpa |=ADPA_PIPE_SEL (crtc->pipe);if (!HAS_PCH_SPLIT (dev_priv)) -intel_de_write (dev_priv,BCLRPAT (crtc->pipe),0 ); +intel_de_write (dev_priv,BCLRPAT (dev_priv, crtc->pipe),0 );switch (mode) {case DRM_MODE_DPMS_ON :@@ -707,7 +707,8 @@ intel_crt_load_detect(struct intel_crt *crt, enum pipe pipe)drm_dbg_kms (&dev_priv->drm,"starting load-detect on CRT\n" ); - save_bclrpat =intel_de_read (dev_priv,BCLRPAT (cpu_transcoder)); + save_bclrpat =intel_de_read (dev_priv, +BCLRPAT (dev_priv, cpu_transcoder)); save_vtotal =intel_de_read (dev_priv,TRANS_VTOTAL (dev_priv, cpu_transcoder)); vblank = intel_de_read(dev_priv,@@ -720,7 +721,7 @@ intel_crt_load_detect(struct intel_crt *crt, enum pipe pipe) vblank_end =REG_FIELD_GET (VBLANK_END_MASK , vblank) +1 ;/* Set the border color to purple. */ -intel_de_write (dev_priv,BCLRPAT (cpu_transcoder),0x500050 ); +intel_de_write (dev_priv,BCLRPAT (dev_priv, cpu_transcoder),0x500050 );if (DISPLAY_VER (dev_priv) !=2 ) {u32 transconf =intel_de_read (dev_priv,TRANSCONF (cpu_transcoder));@@ -800,7 +801,8 @@ intel_crt_load_detect(struct intel_crt *crt, enum pipe pipe) }/* Restore previous settings */ -intel_de_write (dev_priv,BCLRPAT (cpu_transcoder), save_bclrpat); +intel_de_write (dev_priv,BCLRPAT (dev_priv, cpu_transcoder), + save_bclrpat);return status; }drivers/gpu/drm/i915/display/intel_display.c +1
-1@@ -1870,7 +1870,7 @@ static void i9xx_pfit_enable(const struct intel_crtc_state *crtc_state)/* Border color in case we don't scale up to the full screen. Black by * default, change to something else for debugging. */ -intel_de_write (dev_priv,BCLRPAT (crtc->pipe),0 ); +intel_de_write (dev_priv,BCLRPAT (dev_priv, crtc->pipe),0 ); }/* Prefer intel_encoder_is_combo() */ drivers/gpu/drm/i915/i915_reg.h +1
-1@@ -1223,7 +1223,7 @@#define TRANS_VTOTAL (dev_priv, trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_VTOTAL_A)#define TRANS_VBLANK (dev_priv, trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_VBLANK_A)#define TRANS_VSYNC (dev_priv, trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_VSYNC_A) -#define BCLRPAT (trans) _MMIO_TRANS2(dev_priv, (trans), _BCLRPAT_A) +#define BCLRPAT (dev_priv, trans) _MMIO_TRANS2(dev_priv, (trans), _BCLRPAT_A)#define TRANS_VSYNCSHIFT (trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_VSYNCSHIFT_A)#define PIPESRC (pipe) _MMIO_TRANS2(dev_priv, (pipe), _PIPEASRC)#define TRANS_MULT (trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_MULT_A)drivers/gpu/drm/i915/intel_gvt_mmio_table.c +4
-4@@ -237,7 +237,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (TRANS_VTOTAL (dev_priv,TRANSCODER_A ));MMIO_D (TRANS_VBLANK (dev_priv,TRANSCODER_A ));MMIO_D (TRANS_VSYNC (dev_priv,TRANSCODER_A )); -MMIO_D (BCLRPAT (TRANSCODER_A )); +MMIO_D (BCLRPAT (dev_priv,TRANSCODER_A ));MMIO_D (TRANS_VSYNCSHIFT (TRANSCODER_A ));MMIO_D (PIPESRC (TRANSCODER_A ));MMIO_D (TRANS_HTOTAL (dev_priv,TRANSCODER_B ));@@ -246,7 +246,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (TRANS_VTOTAL (dev_priv,TRANSCODER_B ));MMIO_D (TRANS_VBLANK (dev_priv,TRANSCODER_B ));MMIO_D (TRANS_VSYNC (dev_priv,TRANSCODER_B )); -MMIO_D (BCLRPAT (TRANSCODER_B )); +MMIO_D (BCLRPAT (dev_priv,TRANSCODER_B ));MMIO_D (TRANS_VSYNCSHIFT (TRANSCODER_B ));MMIO_D (PIPESRC (TRANSCODER_B ));MMIO_D (TRANS_HTOTAL (dev_priv,TRANSCODER_C ));@@ -255,7 +255,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (TRANS_VTOTAL (dev_priv,TRANSCODER_C ));MMIO_D (TRANS_VBLANK (dev_priv,TRANSCODER_C ));MMIO_D (TRANS_VSYNC (dev_priv,TRANSCODER_C )); -MMIO_D (BCLRPAT (TRANSCODER_C )); +MMIO_D (BCLRPAT (dev_priv,TRANSCODER_C ));MMIO_D (TRANS_VSYNCSHIFT (TRANSCODER_C ));MMIO_D (PIPESRC (TRANSCODER_C ));MMIO_D (TRANS_HTOTAL (dev_priv,TRANSCODER_EDP ));@@ -264,7 +264,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (TRANS_VTOTAL (dev_priv,TRANSCODER_EDP ));MMIO_D (TRANS_VBLANK (dev_priv,TRANSCODER_EDP ));MMIO_D (TRANS_VSYNC (dev_priv,TRANSCODER_EDP )); -MMIO_D (BCLRPAT (TRANSCODER_EDP )); +MMIO_D (BCLRPAT (dev_priv,TRANSCODER_EDP ));MMIO_D (TRANS_VSYNCSHIFT (TRANSCODER_EDP ));MMIO_D (PIPE_DATA_M1 (TRANSCODER_A ));MMIO_D (PIPE_DATA_N1 (TRANSCODER_A ));Signature · 1 line
2.39.2
PATCH 10/65 drm/i915: pass dev_priv explicitly to TRANS_VSYNCSHIFT
In reply to Jani NikulaAvoid the implicit dev_priv local variable use, and pass dev_priv explicitly to the TRANS_VSYNCSHIFT register macro.
--- drivers/gpu/drm/i915/display/icl_dsi.c | 3 ++- drivers/gpu/drm/i915/display/intel_display.c | 3 ++- drivers/gpu/drm/i915/display/intel_pch_display.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(+), 8 deletions(-)
drivers/gpu/drm/i915/display/icl_dsi.c +2 -1
@@ -982,7 +982,8 @@ gen11_dsi_set_transcoder_timings(struct intel_encoder *encoder,if (is_vid_mode (intel_dsi)) {for_each_dsi_port (port, intel_dsi->ports) { dsi_trans =dsi_port_to_transcoder (port); -intel_de_write (dev_priv,TRANS_VSYNCSHIFT (dsi_trans), +intel_de_write (dev_priv, +TRANS_VSYNCSHIFT (dev_priv, dsi_trans), vsync_shift); } }
drivers/gpu/drm/i915/display/intel_display.c +2 -1
@@ -2707,7 +2707,8 @@ static void intel_set_transcoder_timings(const struct intel_crtc_state *crtc_sta }if (DISPLAY_VER (dev_priv) >=4 ) -intel_de_write (dev_priv,TRANS_VSYNCSHIFT (cpu_transcoder), +intel_de_write (dev_priv, +TRANS_VSYNCSHIFT (dev_priv, cpu_transcoder), vsyncshift); intel_de_write(dev_priv, TRANS_HTOTAL(dev_priv, cpu_transcoder),
drivers/gpu/drm/i915/display/intel_pch_display.c +1 -1
@@ -237,7 +237,7 @@ static void ilk_pch_transcoder_set_timings(const struct intel_crtc_state *crtc_sintel_de_write (dev_priv,PCH_TRANS_VSYNC (pch_transcoder),intel_de_read (dev_priv,TRANS_VSYNC (dev_priv, cpu_transcoder)));intel_de_write (dev_priv,PCH_TRANS_VSYNCSHIFT (pch_transcoder), -intel_de_read (dev_priv,TRANS_VSYNCSHIFT (cpu_transcoder))); +intel_de_read (dev_priv,TRANS_VSYNCSHIFT (dev_priv, cpu_transcoder))); }static void ilk_enable_pch_transcoder (const struct intel_crtc_state *crtc_state)
drivers/gpu/drm/i915/i915_reg.h +1 -1
@@ -1224,7 +1224,7 @@#define TRANS_VBLANK (dev_priv, trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_VBLANK_A)#define TRANS_VSYNC (dev_priv, trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_VSYNC_A)#define BCLRPAT (dev_priv, trans) _MMIO_TRANS2(dev_priv, (trans), _BCLRPAT_A) -#define TRANS_VSYNCSHIFT (trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_VSYNCSHIFT_A) +#define TRANS_VSYNCSHIFT (dev_priv, trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_VSYNCSHIFT_A)#define PIPESRC (pipe) _MMIO_TRANS2(dev_priv, (pipe), _PIPEASRC)#define TRANS_MULT (trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_MULT_A)
drivers/gpu/drm/i915/intel_gvt_mmio_table.c +4 -4
@@ -238,7 +238,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (TRANS_VBLANK (dev_priv,TRANSCODER_A ));MMIO_D (TRANS_VSYNC (dev_priv,TRANSCODER_A ));MMIO_D (BCLRPAT (dev_priv,TRANSCODER_A )); -MMIO_D (TRANS_VSYNCSHIFT (TRANSCODER_A )); +MMIO_D (TRANS_VSYNCSHIFT (dev_priv,TRANSCODER_A ));MMIO_D (PIPESRC (TRANSCODER_A ));MMIO_D (TRANS_HTOTAL (dev_priv,TRANSCODER_B ));MMIO_D (TRANS_HBLANK (dev_priv,TRANSCODER_B ));
@@ -247,7 +247,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (TRANS_VBLANK (dev_priv,TRANSCODER_B ));MMIO_D (TRANS_VSYNC (dev_priv,TRANSCODER_B ));MMIO_D (BCLRPAT (dev_priv,TRANSCODER_B )); -MMIO_D (TRANS_VSYNCSHIFT (TRANSCODER_B )); +MMIO_D (TRANS_VSYNCSHIFT (dev_priv,TRANSCODER_B ));MMIO_D (PIPESRC (TRANSCODER_B ));MMIO_D (TRANS_HTOTAL (dev_priv,TRANSCODER_C ));MMIO_D (TRANS_HBLANK (dev_priv,TRANSCODER_C ));
@@ -256,7 +256,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (TRANS_VBLANK (dev_priv,TRANSCODER_C ));MMIO_D (TRANS_VSYNC (dev_priv,TRANSCODER_C ));MMIO_D (BCLRPAT (dev_priv,TRANSCODER_C )); -MMIO_D (TRANS_VSYNCSHIFT (TRANSCODER_C )); +MMIO_D (TRANS_VSYNCSHIFT (dev_priv,TRANSCODER_C ));MMIO_D (PIPESRC (TRANSCODER_C ));MMIO_D (TRANS_HTOTAL (dev_priv,TRANSCODER_EDP ));MMIO_D (TRANS_HBLANK (dev_priv,TRANSCODER_EDP ));
@@ -265,7 +265,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (TRANS_VBLANK (dev_priv,TRANSCODER_EDP ));MMIO_D (TRANS_VSYNC (dev_priv,TRANSCODER_EDP ));MMIO_D (BCLRPAT (dev_priv,TRANSCODER_EDP )); -MMIO_D (TRANS_VSYNCSHIFT (TRANSCODER_EDP )); +MMIO_D (TRANS_VSYNCSHIFT (dev_priv,TRANSCODER_EDP ));MMIO_D (PIPE_DATA_M1 (TRANSCODER_A ));MMIO_D (PIPE_DATA_N1 (TRANSCODER_A ));MMIO_D (PIPE_DATA_M2 (TRANSCODER_A ));
Signature · 1 line
2.39.2
Re: [PATCH 10/65] drm/i915: pass dev_priv explicitly to TRANS_VSYNCSHIFT
Quoted 2 lines · Jani Nikula
Avoid the implicit
dev_privlocal variable use, and passdev_privexplicitly to theTRANS_VSYNCSHIFTregister macro.
Quoted 107 lines
Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/display/icl_dsi.c | 3 ++- drivers/gpu/drm/i915/display/intel_display.c | 3 ++- drivers/gpu/drm/i915/display/intel_pch_display.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(+), 8 deletions(-)drivers/gpu/drm/i915/display/icl_dsi.c +2
-1@@ -982,7 +982,8 @@ gen11_dsi_set_transcoder_timings(struct intel_encoder *encoder,if (is_vid_mode (intel_dsi)) {for_each_dsi_port (port, intel_dsi->ports) { dsi_trans =dsi_port_to_transcoder (port); -intel_de_write (dev_priv,TRANS_VSYNCSHIFT (dsi_trans), +intel_de_write (dev_priv, +TRANS_VSYNCSHIFT (dev_priv, dsi_trans), vsync_shift); } }drivers/gpu/drm/i915/display/intel_display.c +2
-1@@ -2707,7 +2707,8 @@ static void intel_set_transcoder_timings(const struct intel_crtc_state *crtc_sta }if (DISPLAY_VER (dev_priv) >=4 ) -intel_de_write (dev_priv,TRANS_VSYNCSHIFT (cpu_transcoder), +intel_de_write (dev_priv, +TRANS_VSYNCSHIFT (dev_priv, cpu_transcoder), vsyncshift); intel_de_write(dev_priv, TRANS_HTOTAL(dev_priv, cpu_transcoder),drivers/gpu/drm/i915/display/intel_pch_display.c +1
-1@@ -237,7 +237,7 @@ static void ilk_pch_transcoder_set_timings(const struct intel_crtc_state *crtc_sintel_de_write (dev_priv,PCH_TRANS_VSYNC (pch_transcoder),intel_de_read (dev_priv,TRANS_VSYNC (dev_priv, cpu_transcoder)));intel_de_write (dev_priv,PCH_TRANS_VSYNCSHIFT (pch_transcoder), -intel_de_read (dev_priv,TRANS_VSYNCSHIFT (cpu_transcoder))); +intel_de_read (dev_priv,TRANS_VSYNCSHIFT (dev_priv, cpu_transcoder))); }static void ilk_enable_pch_transcoder (const struct intel_crtc_state *crtc_state)drivers/gpu/drm/i915/i915_reg.h +1
-1@@ -1224,7 +1224,7 @@#define TRANS_VBLANK (dev_priv, trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_VBLANK_A)#define TRANS_VSYNC (dev_priv, trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_VSYNC_A)#define BCLRPAT (dev_priv, trans) _MMIO_TRANS2(dev_priv, (trans), _BCLRPAT_A) -#define TRANS_VSYNCSHIFT (trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_VSYNCSHIFT_A) +#define TRANS_VSYNCSHIFT (dev_priv, trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_VSYNCSHIFT_A)#define PIPESRC (pipe) _MMIO_TRANS2(dev_priv, (pipe), _PIPEASRC)#define TRANS_MULT (trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_MULT_A)drivers/gpu/drm/i915/intel_gvt_mmio_table.c +4
-4@@ -238,7 +238,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (TRANS_VBLANK (dev_priv,TRANSCODER_A ));MMIO_D (TRANS_VSYNC (dev_priv,TRANSCODER_A ));MMIO_D (BCLRPAT (dev_priv,TRANSCODER_A )); -MMIO_D (TRANS_VSYNCSHIFT (TRANSCODER_A )); +MMIO_D (TRANS_VSYNCSHIFT (dev_priv,TRANSCODER_A ));MMIO_D (PIPESRC (TRANSCODER_A ));MMIO_D (TRANS_HTOTAL (dev_priv,TRANSCODER_B ));MMIO_D (TRANS_HBLANK (dev_priv,TRANSCODER_B ));@@ -247,7 +247,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (TRANS_VBLANK (dev_priv,TRANSCODER_B ));MMIO_D (TRANS_VSYNC (dev_priv,TRANSCODER_B ));MMIO_D (BCLRPAT (dev_priv,TRANSCODER_B )); -MMIO_D (TRANS_VSYNCSHIFT (TRANSCODER_B )); +MMIO_D (TRANS_VSYNCSHIFT (dev_priv,TRANSCODER_B ));MMIO_D (PIPESRC (TRANSCODER_B ));MMIO_D (TRANS_HTOTAL (dev_priv,TRANSCODER_C ));MMIO_D (TRANS_HBLANK (dev_priv,TRANSCODER_C ));@@ -256,7 +256,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (TRANS_VBLANK (dev_priv,TRANSCODER_C ));MMIO_D (TRANS_VSYNC (dev_priv,TRANSCODER_C ));MMIO_D (BCLRPAT (dev_priv,TRANSCODER_C )); -MMIO_D (TRANS_VSYNCSHIFT (TRANSCODER_C )); +MMIO_D (TRANS_VSYNCSHIFT (dev_priv,TRANSCODER_C ));MMIO_D (PIPESRC (TRANSCODER_C ));MMIO_D (TRANS_HTOTAL (dev_priv,TRANSCODER_EDP ));MMIO_D (TRANS_HBLANK (dev_priv,TRANSCODER_EDP ));@@ -265,7 +265,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (TRANS_VBLANK (dev_priv,TRANSCODER_EDP ));MMIO_D (TRANS_VSYNC (dev_priv,TRANSCODER_EDP ));MMIO_D (BCLRPAT (dev_priv,TRANSCODER_EDP )); -MMIO_D (TRANS_VSYNCSHIFT (TRANSCODER_EDP )); +MMIO_D (TRANS_VSYNCSHIFT (dev_priv,TRANSCODER_EDP ));MMIO_D (PIPE_DATA_M1 (TRANSCODER_A ));MMIO_D (PIPE_DATA_N1 (TRANSCODER_A ));MMIO_D (PIPE_DATA_M2 (TRANSCODER_A ));Signature · 1 line
2.39.2
PATCH 11/65 drm/i915: pass dev_priv explicitly to PIPESRC
In reply to Jani NikulaAvoid the implicit dev_priv local variable use, and pass dev_priv explicitly to the PIPESRC register macro.
--- drivers/gpu/drm/i915/display/i9xx_plane.c | 2 +- drivers/gpu/drm/i915/display/intel_display.c | 6 +++--- drivers/gpu/drm/i915/gvt/fb_decoder.c | 6 +++--- drivers/gpu/drm/i915/i915_reg.h | 2 +- drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-)
drivers/gpu/drm/i915/display/i9xx_plane.c +1 -1
@@ -1053,7 +1053,7 @@ i9xx_get_initial_plane_config(struct intel_crtc *crtc,drm_WARN_ON (&dev_priv->drm, offset !=0 ); - val =intel_de_read (dev_priv,PIPESRC (pipe)); + val =intel_de_read (dev_priv,PIPESRC (dev_priv, pipe)); fb->width =REG_FIELD_GET (PIPESRC_WIDTH_MASK , val) +1 ; fb->height =REG_FIELD_GET (PIPESRC_HEIGHT_MASK , val) +1 ;
drivers/gpu/drm/i915/display/intel_display.c +3 -3
@@ -2784,7 +2784,7 @@ static void intel_set_pipe_src_size(const struct intel_crtc_state *crtc_state)/* pipesrc controls the size that is scaled from, which should * always be the user's requested size. */ -intel_de_write (dev_priv,PIPESRC (pipe), +intel_de_write (dev_priv,PIPESRC (dev_priv, pipe),PIPESRC_WIDTH (width -1 ) |PIPESRC_HEIGHT (height -1 )); }
@@ -2878,7 +2878,7 @@ static void intel_get_pipe_src_size(struct intel_crtc *crtc,struct drm_i915_private *dev_priv =to_i915 (dev);u32 tmp; - tmp =intel_de_read (dev_priv,PIPESRC (crtc->pipe)); + tmp =intel_de_read (dev_priv,PIPESRC (dev_priv, crtc->pipe)); drm_rect_init(&pipe_config->pipe_src, 0, 0, REG_FIELD_GET(PIPESRC_WIDTH_MASK, tmp) + 1,
@@ -8204,7 +8204,7 @@ void i830_enable_pipe(struct drm_i915_private *dev_priv, enum pipe pipe) VBLANK_START(480 - 1) | VBLANK_END(525 - 1));intel_de_write (dev_priv,TRANS_VSYNC (dev_priv, cpu_transcoder),VSYNC_START (490 -1 ) |VSYNC_END (492 -1 )); -intel_de_write (dev_priv,PIPESRC (pipe), +intel_de_write (dev_priv,PIPESRC (dev_priv, pipe),PIPESRC_WIDTH (640 -1 ) |PIPESRC_HEIGHT (480 -1 ));intel_de_write (dev_priv,FP0 (pipe), fp);
drivers/gpu/drm/i915/gvt/fb_decoder.c +3 -3
@@ -267,11 +267,11 @@ int intel_vgpu_decode_primary_plane(struct intel_vgpu *vgpu, (_PRI_PLANE_STRIDE_MASK >> 6) : _PRI_PLANE_STRIDE_MASK, plane->bpp); - plane->width = (vgpu_vreg_t (vgpu,PIPESRC (pipe)) & _PIPE_H_SRCSZ_MASK) >> + plane->width = (vgpu_vreg_t (vgpu,PIPESRC (dev_priv, pipe)) & _PIPE_H_SRCSZ_MASK) >> _PIPE_H_SRCSZ_SHIFT; plane->width +=1 ; - plane->height = (vgpu_vreg_t (vgpu,PIPESRC (pipe)) & - _PIPE_V_SRCSZ_MASK) >> _PIPE_V_SRCSZ_SHIFT; + plane->height = (vgpu_vreg_t (vgpu,PIPESRC (dev_priv, pipe)) & + _PIPE_V_SRCSZ_MASK) >> _PIPE_V_SRCSZ_SHIFT; plane->height +=1 ;/* raw height is one minus the real value */ val =vgpu_vreg_t (vgpu,DSPTILEOFF (dev_priv, pipe));
drivers/gpu/drm/i915/i915_reg.h +1 -1
@@ -1225,7 +1225,7 @@#define TRANS_VSYNC (dev_priv, trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_VSYNC_A)#define BCLRPAT (dev_priv, trans) _MMIO_TRANS2(dev_priv, (trans), _BCLRPAT_A)#define TRANS_VSYNCSHIFT (dev_priv, trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_VSYNCSHIFT_A) -#define PIPESRC (pipe) _MMIO_TRANS2(dev_priv, (pipe), _PIPEASRC) +#define PIPESRC (dev_priv, pipe) _MMIO_TRANS2(dev_priv, (pipe), _PIPEASRC)#define TRANS_MULT (trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_MULT_A)/* VRR registers */
drivers/gpu/drm/i915/intel_gvt_mmio_table.c +3 -3
@@ -239,7 +239,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (TRANS_VSYNC (dev_priv,TRANSCODER_A ));MMIO_D (BCLRPAT (dev_priv,TRANSCODER_A ));MMIO_D (TRANS_VSYNCSHIFT (dev_priv,TRANSCODER_A )); -MMIO_D (PIPESRC (TRANSCODER_A )); +MMIO_D (PIPESRC (dev_priv,TRANSCODER_A ));MMIO_D (TRANS_HTOTAL (dev_priv,TRANSCODER_B ));MMIO_D (TRANS_HBLANK (dev_priv,TRANSCODER_B ));MMIO_D (TRANS_HSYNC (dev_priv,TRANSCODER_B ));
@@ -248,7 +248,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (TRANS_VSYNC (dev_priv,TRANSCODER_B ));MMIO_D (BCLRPAT (dev_priv,TRANSCODER_B ));MMIO_D (TRANS_VSYNCSHIFT (dev_priv,TRANSCODER_B )); -MMIO_D (PIPESRC (TRANSCODER_B )); +MMIO_D (PIPESRC (dev_priv,TRANSCODER_B ));MMIO_D (TRANS_HTOTAL (dev_priv,TRANSCODER_C ));MMIO_D (TRANS_HBLANK (dev_priv,TRANSCODER_C ));MMIO_D (TRANS_HSYNC (dev_priv,TRANSCODER_C ));
@@ -257,7 +257,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (TRANS_VSYNC (dev_priv,TRANSCODER_C ));MMIO_D (BCLRPAT (dev_priv,TRANSCODER_C ));MMIO_D (TRANS_VSYNCSHIFT (dev_priv,TRANSCODER_C )); -MMIO_D (PIPESRC (TRANSCODER_C )); +MMIO_D (PIPESRC (dev_priv,TRANSCODER_C ));MMIO_D (TRANS_HTOTAL (dev_priv,TRANSCODER_EDP ));MMIO_D (TRANS_HBLANK (dev_priv,TRANSCODER_EDP ));MMIO_D (TRANS_HSYNC (dev_priv,TRANSCODER_EDP ));
Signature · 1 line
2.39.2
Re: [PATCH 11/65] drm/i915: pass dev_priv explicitly to PIPESRC
Quoted 2 lines · Jani Nikula
Avoid the implicit
dev_privlocal variable use, and passdev_privexplicitly to the PIPESRC register macro.
Quoted 120 lines
Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/display/i9xx_plane.c | 2 +- drivers/gpu/drm/i915/display/intel_display.c | 6 +++--- drivers/gpu/drm/i915/gvt/fb_decoder.c | 6 +++--- drivers/gpu/drm/i915/i915_reg.h | 2 +- drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-)drivers/gpu/drm/i915/display/i9xx_plane.c +1
-1@@ -1053,7 +1053,7 @@ i9xx_get_initial_plane_config(struct intel_crtc *crtc,drm_WARN_ON (&dev_priv->drm, offset !=0 ); - val =intel_de_read (dev_priv,PIPESRC (pipe)); + val =intel_de_read (dev_priv,PIPESRC (dev_priv, pipe)); fb->width =REG_FIELD_GET (PIPESRC_WIDTH_MASK , val) +1 ; fb->height =REG_FIELD_GET (PIPESRC_HEIGHT_MASK , val) +1 ;drivers/gpu/drm/i915/display/intel_display.c +3
-3@@ -2784,7 +2784,7 @@ static void intel_set_pipe_src_size(const struct intel_crtc_state *crtc_state)/* pipesrc controls the size that is scaled from, which should * always be the user's requested size. */ -intel_de_write (dev_priv,PIPESRC (pipe), +intel_de_write (dev_priv,PIPESRC (dev_priv, pipe),PIPESRC_WIDTH (width -1 ) |PIPESRC_HEIGHT (height -1 )); }@@ -2878,7 +2878,7 @@ static void intel_get_pipe_src_size(struct intel_crtc *crtc,struct drm_i915_private *dev_priv =to_i915 (dev);u32 tmp; - tmp =intel_de_read (dev_priv,PIPESRC (crtc->pipe)); + tmp =intel_de_read (dev_priv,PIPESRC (dev_priv, crtc->pipe)); drm_rect_init(&pipe_config->pipe_src, 0, 0, REG_FIELD_GET(PIPESRC_WIDTH_MASK, tmp) + 1,@@ -8204,7 +8204,7 @@ void i830_enable_pipe(struct drm_i915_private *dev_priv, enum pipe pipe) VBLANK_START(480 - 1) | VBLANK_END(525 - 1));intel_de_write (dev_priv,TRANS_VSYNC (dev_priv, cpu_transcoder),VSYNC_START (490 -1 ) |VSYNC_END (492 -1 )); -intel_de_write (dev_priv,PIPESRC (pipe), +intel_de_write (dev_priv,PIPESRC (dev_priv, pipe),PIPESRC_WIDTH (640 -1 ) |PIPESRC_HEIGHT (480 -1 ));intel_de_write (dev_priv,FP0 (pipe), fp);drivers/gpu/drm/i915/gvt/fb_decoder.c +3
-3@@ -267,11 +267,11 @@ int intel_vgpu_decode_primary_plane(struct intel_vgpu *vgpu, (_PRI_PLANE_STRIDE_MASK >> 6) : _PRI_PLANE_STRIDE_MASK, plane->bpp); - plane->width = (vgpu_vreg_t (vgpu,PIPESRC (pipe)) & _PIPE_H_SRCSZ_MASK) >> + plane->width = (vgpu_vreg_t (vgpu,PIPESRC (dev_priv, pipe)) & _PIPE_H_SRCSZ_MASK) >> _PIPE_H_SRCSZ_SHIFT; plane->width +=1 ; - plane->height = (vgpu_vreg_t (vgpu,PIPESRC (pipe)) & - _PIPE_V_SRCSZ_MASK) >> _PIPE_V_SRCSZ_SHIFT; + plane->height = (vgpu_vreg_t (vgpu,PIPESRC (dev_priv, pipe)) & + _PIPE_V_SRCSZ_MASK) >> _PIPE_V_SRCSZ_SHIFT; plane->height +=1 ;/* raw height is one minus the real value */ val =vgpu_vreg_t (vgpu,DSPTILEOFF (dev_priv, pipe));drivers/gpu/drm/i915/i915_reg.h +1
-1@@ -1225,7 +1225,7 @@#define TRANS_VSYNC (dev_priv, trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_VSYNC_A)#define BCLRPAT (dev_priv, trans) _MMIO_TRANS2(dev_priv, (trans), _BCLRPAT_A)#define TRANS_VSYNCSHIFT (dev_priv, trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_VSYNCSHIFT_A) -#define PIPESRC (pipe) _MMIO_TRANS2(dev_priv, (pipe), _PIPEASRC) +#define PIPESRC (dev_priv, pipe) _MMIO_TRANS2(dev_priv, (pipe), _PIPEASRC)#define TRANS_MULT (trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_MULT_A)/* VRR registers */ drivers/gpu/drm/i915/intel_gvt_mmio_table.c +3
-3@@ -239,7 +239,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (TRANS_VSYNC (dev_priv,TRANSCODER_A ));MMIO_D (BCLRPAT (dev_priv,TRANSCODER_A ));MMIO_D (TRANS_VSYNCSHIFT (dev_priv,TRANSCODER_A )); -MMIO_D (PIPESRC (TRANSCODER_A )); +MMIO_D (PIPESRC (dev_priv,TRANSCODER_A ));MMIO_D (TRANS_HTOTAL (dev_priv,TRANSCODER_B ));MMIO_D (TRANS_HBLANK (dev_priv,TRANSCODER_B ));MMIO_D (TRANS_HSYNC (dev_priv,TRANSCODER_B ));@@ -248,7 +248,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (TRANS_VSYNC (dev_priv,TRANSCODER_B ));MMIO_D (BCLRPAT (dev_priv,TRANSCODER_B ));MMIO_D (TRANS_VSYNCSHIFT (dev_priv,TRANSCODER_B )); -MMIO_D (PIPESRC (TRANSCODER_B )); +MMIO_D (PIPESRC (dev_priv,TRANSCODER_B ));MMIO_D (TRANS_HTOTAL (dev_priv,TRANSCODER_C ));MMIO_D (TRANS_HBLANK (dev_priv,TRANSCODER_C ));MMIO_D (TRANS_HSYNC (dev_priv,TRANSCODER_C ));@@ -257,7 +257,7 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (TRANS_VSYNC (dev_priv,TRANSCODER_C ));MMIO_D (BCLRPAT (dev_priv,TRANSCODER_C ));MMIO_D (TRANS_VSYNCSHIFT (dev_priv,TRANSCODER_C )); -MMIO_D (PIPESRC (TRANSCODER_C )); +MMIO_D (PIPESRC (dev_priv,TRANSCODER_C ));MMIO_D (TRANS_HTOTAL (dev_priv,TRANSCODER_EDP ));MMIO_D (TRANS_HBLANK (dev_priv,TRANSCODER_EDP ));MMIO_D (TRANS_HSYNC (dev_priv,TRANSCODER_EDP ));Signature · 1 line
2.39.2
PATCH 12/65 drm/i915: pass dev_priv explicitly to TRANS_MULT
In reply to Jani NikulaAvoid the implicit dev_priv local variable use, and pass dev_priv explicitly to the TRANS_MULT register macro.
--- 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 | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +2 -2
@@ -1646,7 +1646,7 @@ static void hsw_configure_cpu_transcoder(const struct intel_crtc_state *crtc_staintel_vrr_set_transcoder_timings (crtc_state);if (cpu_transcoder !=TRANSCODER_EDP ) -intel_de_write (dev_priv,TRANS_MULT (cpu_transcoder), +intel_de_write (dev_priv,TRANS_MULT (dev_priv, cpu_transcoder), crtc_state->pixel_multiplier -1 );hsw_set_frame_start_delay (crtc_state);
@@ -3861,7 +3861,7 @@ static bool hsw_get_pipe_config(struct intel_crtc *crtc, !transcoder_is_dsi(pipe_config->cpu_transcoder)) { pipe_config->pixel_multiplier = intel_de_read(dev_priv, - TRANS_MULT(pipe_config->cpu_transcoder)) + 1; + TRANS_MULT(dev_priv, pipe_config->cpu_transcoder)) + 1; } else { pipe_config->pixel_multiplier =1 ; }
drivers/gpu/drm/i915/i915_reg.h +1 -1
@@ -1226,7 +1226,7 @@#define BCLRPAT (dev_priv, trans) _MMIO_TRANS2(dev_priv, (trans), _BCLRPAT_A)#define TRANS_VSYNCSHIFT (dev_priv, trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_VSYNCSHIFT_A)#define PIPESRC (dev_priv, pipe) _MMIO_TRANS2(dev_priv, (pipe), _PIPEASRC) -#define TRANS_MULT (trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_MULT_A) +#define TRANS_MULT (dev_priv, trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_MULT_A)/* VRR registers */ #define _TRANS_VRR_CTL_A 0x60420
drivers/gpu/drm/i915/intel_gvt_mmio_table.c +3 -3
@@ -506,9 +506,9 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (GAMMA_MODE (PIPE_A ));MMIO_D (GAMMA_MODE (PIPE_B ));MMIO_D (GAMMA_MODE (PIPE_C )); -MMIO_D (TRANS_MULT (TRANSCODER_A )); -MMIO_D (TRANS_MULT (TRANSCODER_B )); -MMIO_D (TRANS_MULT (TRANSCODER_C )); +MMIO_D (TRANS_MULT (dev_priv,TRANSCODER_A )); +MMIO_D (TRANS_MULT (dev_priv,TRANSCODER_B )); +MMIO_D (TRANS_MULT (dev_priv,TRANSCODER_C ));MMIO_D (HSW_TVIDEO_DIP_CTL (dev_priv,TRANSCODER_A ));MMIO_D (HSW_TVIDEO_DIP_CTL (dev_priv,TRANSCODER_B ));MMIO_D (HSW_TVIDEO_DIP_CTL (dev_priv,TRANSCODER_C ));
Signature · 1 line
2.39.2
Re: [PATCH 12/65] drm/i915: pass dev_priv explicitly to TRANS_MULT
Quoted 2 lines · Jani Nikula
Avoid the implicit
dev_privlocal variable use, and passdev_privexplicitly to theTRANS_MULTregister macro.
Quoted 63 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 | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-)drivers/gpu/drm/i915/display/intel_display.c +2
-2@@ -1646,7 +1646,7 @@ static void hsw_configure_cpu_transcoder(const struct intel_crtc_state *crtc_staintel_vrr_set_transcoder_timings (crtc_state);if (cpu_transcoder !=TRANSCODER_EDP ) -intel_de_write (dev_priv,TRANS_MULT (cpu_transcoder), +intel_de_write (dev_priv,TRANS_MULT (dev_priv, cpu_transcoder), crtc_state->pixel_multiplier -1 );hsw_set_frame_start_delay (crtc_state);@@ -3861,7 +3861,7 @@ static bool hsw_get_pipe_config(struct intel_crtc *crtc, !transcoder_is_dsi(pipe_config->cpu_transcoder)) { pipe_config->pixel_multiplier = intel_de_read(dev_priv, - TRANS_MULT(pipe_config->cpu_transcoder)) + 1; + TRANS_MULT(dev_priv, pipe_config->cpu_transcoder)) + 1; } else { pipe_config->pixel_multiplier =1 ; }drivers/gpu/drm/i915/i915_reg.h +1
-1@@ -1226,7 +1226,7 @@#define BCLRPAT (dev_priv, trans) _MMIO_TRANS2(dev_priv, (trans), _BCLRPAT_A)#define TRANS_VSYNCSHIFT (dev_priv, trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_VSYNCSHIFT_A)#define PIPESRC (dev_priv, pipe) _MMIO_TRANS2(dev_priv, (pipe), _PIPEASRC) -#define TRANS_MULT (trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_MULT_A) +#define TRANS_MULT (dev_priv, trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_MULT_A)/* VRR registers */ #define _TRANS_VRR_CTL_A 0x60420drivers/gpu/drm/i915/intel_gvt_mmio_table.c +3
-3@@ -506,9 +506,9 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (GAMMA_MODE (PIPE_A ));MMIO_D (GAMMA_MODE (PIPE_B ));MMIO_D (GAMMA_MODE (PIPE_C )); -MMIO_D (TRANS_MULT (TRANSCODER_A )); -MMIO_D (TRANS_MULT (TRANSCODER_B )); -MMIO_D (TRANS_MULT (TRANSCODER_C )); +MMIO_D (TRANS_MULT (dev_priv,TRANSCODER_A )); +MMIO_D (TRANS_MULT (dev_priv,TRANSCODER_B )); +MMIO_D (TRANS_MULT (dev_priv,TRANSCODER_C ));MMIO_D (HSW_TVIDEO_DIP_CTL (dev_priv,TRANSCODER_A ));MMIO_D (HSW_TVIDEO_DIP_CTL (dev_priv,TRANSCODER_B ));MMIO_D (HSW_TVIDEO_DIP_CTL (dev_priv,TRANSCODER_C ));Signature · 1 line
2.39.2
PATCH 13/65 drm/i915: pass dev_priv explicitly to PORT_HOTPLUG_EN
In reply to Jani NikulaAvoid the implicit dev_priv local variable use, and pass dev_priv explicitly to the PORT_HOTPLUG_EN register macro.
--- drivers/gpu/drm/i915/display/intel_crt.c | 2 +- drivers/gpu/drm/i915/display/intel_hotplug_irq.c | 3 ++- drivers/gpu/drm/i915/i915_reg.h | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/display/intel_crt.c +1 -1
@@ -603,7 +603,7 @@ static bool intel_crt_detect_hotplug(struct drm_connector *connector)CRT_HOTPLUG_FORCE_DETECT , CRT_HOTPLUG_FORCE_DETECT);/* wait for FORCE_DETECT to go off */ -if (intel_de_wait_for_clear (dev_priv,PORT_HOTPLUG_EN , +if (intel_de_wait_for_clear (dev_priv,PORT_HOTPLUG_EN (dev_priv),CRT_HOTPLUG_FORCE_DETECT ,1000 ))drm_dbg_kms (&dev_priv->drm,"timed out waiting for FORCE_DETECT to go off" );
drivers/gpu/drm/i915/display/intel_hotplug_irq.c +2 -1
@@ -186,7 +186,8 @@ void i915_hotplug_interrupt_update_locked(struct drm_i915_private *dev_priv,lockdep_assert_held (&dev_priv->irq_lock);drm_WARN_ON (&dev_priv->drm, bits & ~mask); -intel_uncore_rmw (&dev_priv->uncore,PORT_HOTPLUG_EN , mask, bits); +intel_uncore_rmw (&dev_priv->uncore,PORT_HOTPLUG_EN (dev_priv), mask, + bits); }/**
drivers/gpu/drm/i915/i915_reg.h +1 -1
@@ -1378,7 +1378,7 @@/* Hotplug control (945+ only) */ -#define PORT_HOTPLUG_EN _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x61110) +#define PORT_HOTPLUG_EN (dev_priv) _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x61110)#define PORTB_HOTPLUG_INT_EN (1 << 29)#define PORTC_HOTPLUG_INT_EN (1 << 28)#define PORTD_HOTPLUG_INT_EN (1 << 27)
Signature · 1 line
2.39.2
Re: [PATCH 13/65] drm/i915: pass dev_priv explicitly to PORT_HOTPLUG_EN
Quoted 2 lines · Jani Nikula
Avoid the implicit
dev_privlocal variable use, and passdev_privexplicitly to thePORT_HOTPLUG_ENregister macro.
Quoted 51 lines
Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/display/intel_crt.c | 2 +- drivers/gpu/drm/i915/display/intel_hotplug_irq.c | 3 ++- drivers/gpu/drm/i915/i915_reg.h | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-)drivers/gpu/drm/i915/display/intel_crt.c +1
-1@@ -603,7 +603,7 @@ static bool intel_crt_detect_hotplug(struct drm_connector *connector)CRT_HOTPLUG_FORCE_DETECT , CRT_HOTPLUG_FORCE_DETECT);/* wait for FORCE_DETECT to go off */ -if (intel_de_wait_for_clear (dev_priv,PORT_HOTPLUG_EN , +if (intel_de_wait_for_clear (dev_priv,PORT_HOTPLUG_EN (dev_priv),CRT_HOTPLUG_FORCE_DETECT ,1000 ))drm_dbg_kms (&dev_priv->drm,"timed out waiting for FORCE_DETECT to go off" );drivers/gpu/drm/i915/display/intel_hotplug_irq.c +2
-1@@ -186,7 +186,8 @@ void i915_hotplug_interrupt_update_locked(struct drm_i915_private *dev_priv,lockdep_assert_held (&dev_priv->irq_lock);drm_WARN_ON (&dev_priv->drm, bits & ~mask); -intel_uncore_rmw (&dev_priv->uncore,PORT_HOTPLUG_EN , mask, bits); +intel_uncore_rmw (&dev_priv->uncore,PORT_HOTPLUG_EN (dev_priv), mask, + bits); }/** drivers/gpu/drm/i915/i915_reg.h +1
-1@@ -1378,7 +1378,7 @@/* Hotplug control (945+ only) */ -#define PORT_HOTPLUG_EN _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x61110) +#define PORT_HOTPLUG_EN (dev_priv) _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x61110)#define PORTB_HOTPLUG_INT_EN (1 << 29)#define PORTC_HOTPLUG_INT_EN (1 << 28)#define PORTD_HOTPLUG_INT_EN (1 << 27)Signature · 1 line
2.39.2
PATCH 14/65 drm/i915: pass dev_priv explicitly to PORT_HOTPLUG_STAT
In reply to Jani NikulaAvoid the implicit dev_priv local variable use, and pass dev_priv explicitly to the PORT_HOTPLUG_STAT register macro.
--- drivers/gpu/drm/i915/display/g4x_dp.c | 2 +- drivers/gpu/drm/i915/display/intel_crt.c | 5 +++-- drivers/gpu/drm/i915/display/intel_display_irq.c | 2 +- drivers/gpu/drm/i915/display/intel_hotplug_irq.c | 9 ++++++--- drivers/gpu/drm/i915/i915_irq.c | 5 +++-- drivers/gpu/drm/i915/i915_reg.h | 2 +- 6 files changed, 15 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/display/g4x_dp.c +1 -1
@@ -1228,7 +1228,7 @@ static bool g4x_digital_port_connected(struct intel_encoder *encoder)return false; } -return intel_de_read (dev_priv,PORT_HOTPLUG_STAT ) & bit; +return intel_de_read (dev_priv,PORT_HOTPLUG_STAT (dev_priv)) & bit; }static bool ilk_digital_port_connected (struct intel_encoder *encoder)
drivers/gpu/drm/i915/display/intel_crt.c +3 -2
@@ -609,12 +609,13 @@ static bool intel_crt_detect_hotplug(struct drm_connector *connector) "timed out waiting for FORCE_DETECT to go off"); } - stat =intel_de_read (dev_priv,PORT_HOTPLUG_STAT ); + stat =intel_de_read (dev_priv,PORT_HOTPLUG_STAT (dev_priv));if ((stat &CRT_HOTPLUG_MONITOR_MASK ) !=CRT_HOTPLUG_MONITOR_NONE ) ret = true;/* clear the interrupt we just generated, if any */ -intel_de_write (dev_priv,PORT_HOTPLUG_STAT ,CRT_HOTPLUG_INT_STATUS ); +intel_de_write (dev_priv,PORT_HOTPLUG_STAT (dev_priv), +CRT_HOTPLUG_INT_STATUS );i915_hotplug_interrupt_update (dev_priv,CRT_HOTPLUG_FORCE_DETECT ,0 );
drivers/gpu/drm/i915/display/intel_display_irq.c +1 -1
@@ -1377,7 +1377,7 @@ void vlv_display_irq_reset(struct drm_i915_private *dev_priv)intel_uncore_write (uncore,DPINVGTT ,DPINVGTT_STATUS_MASK_VLV );i915_hotplug_interrupt_update_locked (dev_priv,0xffffffff ,0 ); -intel_uncore_rmw (uncore,PORT_HOTPLUG_STAT ,0 ,0 ); +intel_uncore_rmw (uncore,PORT_HOTPLUG_STAT (dev_priv),0 ,0 );i9xx_pipestat_irq_reset (dev_priv);
drivers/gpu/drm/i915/display/intel_hotplug_irq.c +6 -3
@@ -435,18 +435,21 @@ u32 i9xx_hpd_irq_ack(struct drm_i915_private *dev_priv)* bits can itself generate a new hotplug interrupt :( */ for (i =0 ; i <10 ; i++) { -u32 tmp =intel_uncore_read (&dev_priv->uncore,PORT_HOTPLUG_STAT ) & hotplug_status_mask; +u32 tmp =intel_uncore_read (&dev_priv->uncore, +PORT_HOTPLUG_STAT (dev_priv)) & hotplug_status_mask;if (tmp ==0 )return hotplug_status; hotplug_status |= tmp; -intel_uncore_write (&dev_priv->uncore,PORT_HOTPLUG_STAT , hotplug_status); +intel_uncore_write (&dev_priv->uncore, +PORT_HOTPLUG_STAT (dev_priv), + hotplug_status); }drm_WARN_ONCE (&dev_priv->drm,1 ,"PORT_HOTPLUG_STAT did not clear (0x%08x)\n" , -intel_uncore_read (&dev_priv->uncore,PORT_HOTPLUG_STAT )); +intel_uncore_read (&dev_priv->uncore,PORT_HOTPLUG_STAT (dev_priv)));return hotplug_status; }
drivers/gpu/drm/i915/i915_irq.c +3 -2
@@ -1040,7 +1040,8 @@ static void i915_irq_reset(struct drm_i915_private *dev_priv)if (I915_HAS_HOTPLUG (dev_priv)) {i915_hotplug_interrupt_update (dev_priv,0xffffffff ,0 ); -intel_uncore_rmw (&dev_priv->uncore,PORT_HOTPLUG_STAT ,0 ,0 ); +intel_uncore_rmw (&dev_priv->uncore, +PORT_HOTPLUG_STAT (dev_priv),0 ,0 ); }i9xx_pipestat_irq_reset (dev_priv);
@@ -1149,7 +1150,7 @@ static void i965_irq_reset(struct drm_i915_private *dev_priv)struct intel_uncore *uncore = &dev_priv->uncore;i915_hotplug_interrupt_update (dev_priv,0xffffffff ,0 ); -intel_uncore_rmw (uncore,PORT_HOTPLUG_STAT ,0 ,0 ); +intel_uncore_rmw (uncore,PORT_HOTPLUG_STAT (dev_priv),0 ,0 );i9xx_pipestat_irq_reset (dev_priv);
drivers/gpu/drm/i915/i915_reg.h +1 -1
@@ -1408,7 +1408,7 @@#define CRT_HOTPLUG_DETECT_VOLTAGE_325MV (0 << 2)#define CRT_HOTPLUG_DETECT_VOLTAGE_475MV (1 << 2) -#define PORT_HOTPLUG_STAT _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x61114) +#define PORT_HOTPLUG_STAT (dev_priv) _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x61114)/* HDMI/DP bits are g4x+ */ #define PORTD_HOTPLUG_LIVE_STATUS_G4X (1 << 27)#define PORTC_HOTPLUG_LIVE_STATUS_G4X (1 << 28)
Signature · 1 line
2.39.2
Re: [PATCH 14/65] drm/i915: pass dev_priv explicitly to PORT_HOTPLUG_STAT
Quoted 2 lines · Jani Nikula
Avoid the implicit
dev_privlocal variable use, and passdev_privexplicitly to thePORT_HOTPLUG_STATregister macro.
Quoted 125 lines
Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/display/g4x_dp.c | 2 +- drivers/gpu/drm/i915/display/intel_crt.c | 5 +++-- drivers/gpu/drm/i915/display/intel_display_irq.c | 2 +- drivers/gpu/drm/i915/display/intel_hotplug_irq.c | 9 ++++++--- drivers/gpu/drm/i915/i915_irq.c | 5 +++-- drivers/gpu/drm/i915/i915_reg.h | 2 +- 6 files changed, 15 insertions(+), 10 deletions(-)drivers/gpu/drm/i915/display/g4x_dp.c +1
-1@@ -1228,7 +1228,7 @@ static bool g4x_digital_port_connected(struct intel_encoder *encoder)return false; } -return intel_de_read (dev_priv,PORT_HOTPLUG_STAT ) & bit; +return intel_de_read (dev_priv,PORT_HOTPLUG_STAT (dev_priv)) & bit; }static bool ilk_digital_port_connected (struct intel_encoder *encoder)drivers/gpu/drm/i915/display/intel_crt.c +3
-2@@ -609,12 +609,13 @@ static bool intel_crt_detect_hotplug(struct drm_connector *connector) "timed out waiting for FORCE_DETECT to go off"); } - stat =intel_de_read (dev_priv,PORT_HOTPLUG_STAT ); + stat =intel_de_read (dev_priv,PORT_HOTPLUG_STAT (dev_priv));if ((stat &CRT_HOTPLUG_MONITOR_MASK ) !=CRT_HOTPLUG_MONITOR_NONE ) ret = true;/* clear the interrupt we just generated, if any */ -intel_de_write (dev_priv,PORT_HOTPLUG_STAT ,CRT_HOTPLUG_INT_STATUS ); +intel_de_write (dev_priv,PORT_HOTPLUG_STAT (dev_priv), +CRT_HOTPLUG_INT_STATUS );i915_hotplug_interrupt_update (dev_priv,CRT_HOTPLUG_FORCE_DETECT ,0 );drivers/gpu/drm/i915/display/intel_display_irq.c +1
-1@@ -1377,7 +1377,7 @@ void vlv_display_irq_reset(struct drm_i915_private *dev_priv)intel_uncore_write (uncore,DPINVGTT ,DPINVGTT_STATUS_MASK_VLV );i915_hotplug_interrupt_update_locked (dev_priv,0xffffffff ,0 ); -intel_uncore_rmw (uncore,PORT_HOTPLUG_STAT ,0 ,0 ); +intel_uncore_rmw (uncore,PORT_HOTPLUG_STAT (dev_priv),0 ,0 );i9xx_pipestat_irq_reset (dev_priv);drivers/gpu/drm/i915/display/intel_hotplug_irq.c +6
-3@@ -435,18 +435,21 @@ u32 i9xx_hpd_irq_ack(struct drm_i915_private *dev_priv)* bits can itself generate a new hotplug interrupt :( */ for (i =0 ; i <10 ; i++) { -u32 tmp =intel_uncore_read (&dev_priv->uncore,PORT_HOTPLUG_STAT ) & hotplug_status_mask; +u32 tmp =intel_uncore_read (&dev_priv->uncore, +PORT_HOTPLUG_STAT (dev_priv)) & hotplug_status_mask;if (tmp ==0 )return hotplug_status; hotplug_status |= tmp; -intel_uncore_write (&dev_priv->uncore,PORT_HOTPLUG_STAT , hotplug_status); +intel_uncore_write (&dev_priv->uncore, +PORT_HOTPLUG_STAT (dev_priv), + hotplug_status); }drm_WARN_ONCE (&dev_priv->drm,1 ,"PORT_HOTPLUG_STAT did not clear (0x%08x)\n" , -intel_uncore_read (&dev_priv->uncore,PORT_HOTPLUG_STAT )); +intel_uncore_read (&dev_priv->uncore,PORT_HOTPLUG_STAT (dev_priv)));return hotplug_status; }drivers/gpu/drm/i915/i915_irq.c +3
-2@@ -1040,7 +1040,8 @@ static void i915_irq_reset(struct drm_i915_private *dev_priv)if (I915_HAS_HOTPLUG (dev_priv)) {i915_hotplug_interrupt_update (dev_priv,0xffffffff ,0 ); -intel_uncore_rmw (&dev_priv->uncore,PORT_HOTPLUG_STAT ,0 ,0 ); +intel_uncore_rmw (&dev_priv->uncore, +PORT_HOTPLUG_STAT (dev_priv),0 ,0 ); }i9xx_pipestat_irq_reset (dev_priv);@@ -1149,7 +1150,7 @@ static void i965_irq_reset(struct drm_i915_private *dev_priv)struct intel_uncore *uncore = &dev_priv->uncore;i915_hotplug_interrupt_update (dev_priv,0xffffffff ,0 ); -intel_uncore_rmw (uncore,PORT_HOTPLUG_STAT ,0 ,0 ); +intel_uncore_rmw (uncore,PORT_HOTPLUG_STAT (dev_priv),0 ,0 );i9xx_pipestat_irq_reset (dev_priv);drivers/gpu/drm/i915/i915_reg.h +1
-1@@ -1408,7 +1408,7 @@#define CRT_HOTPLUG_DETECT_VOLTAGE_325MV (0 << 2)#define CRT_HOTPLUG_DETECT_VOLTAGE_475MV (1 << 2) -#define PORT_HOTPLUG_STAT _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x61114) +#define PORT_HOTPLUG_STAT (dev_priv) _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x61114)/* HDMI/DP bits are g4x+ */ #define PORTD_HOTPLUG_LIVE_STATUS_G4X (1 << 27)#define PORTC_HOTPLUG_LIVE_STATUS_G4X (1 << 28)Signature · 1 line
2.39.2
PATCH 15/65 drm/i915: pass dev_priv explicitly to PFIT_CONTROL
In reply to Jani NikulaAvoid the implicit dev_priv local variable use, and pass dev_priv explicitly to the PFIT_CONTROL register macro.
--- drivers/gpu/drm/i915/display/intel_display.c | 11 ++++++----- drivers/gpu/drm/i915/display/intel_lvds.c | 2 +- drivers/gpu/drm/i915/display/intel_overlay.c | 2 +- drivers/gpu/drm/i915/i915_reg.h | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +6 -5
@@ -1861,12 +1861,13 @@ static void i9xx_pfit_enable(const struct intel_crtc_state *crtc_state)* according to register description and PRM. */ drm_WARN_ON (&dev_priv->drm, -intel_de_read (dev_priv,PFIT_CONTROL ) &PFIT_ENABLE ); +intel_de_read (dev_priv,PFIT_CONTROL (dev_priv)) &PFIT_ENABLE );assert_transcoder_disabled (dev_priv, crtc_state->cpu_transcoder);intel_de_write (dev_priv,PFIT_PGM_RATIOS , crtc_state->gmch_pfit.pgm_ratios); -intel_de_write (dev_priv,PFIT_CONTROL , crtc_state->gmch_pfit.control); +intel_de_write (dev_priv,PFIT_CONTROL (dev_priv), + crtc_state->gmch_pfit.control);/* Border color in case we don't scale up to the full screen. Black by * default, change to something else for debugging. */
@@ -2195,8 +2196,8 @@ static void i9xx_pfit_disable(const struct intel_crtc_state *old_crtc_state)assert_transcoder_disabled (dev_priv, old_crtc_state->cpu_transcoder);drm_dbg_kms (&dev_priv->drm,"disabling pfit, current: 0x%08x\n" , -intel_de_read (dev_priv,PFIT_CONTROL )); -intel_de_write (dev_priv,PFIT_CONTROL ,0 ); +intel_de_read (dev_priv,PFIT_CONTROL (dev_priv))); +intel_de_write (dev_priv,PFIT_CONTROL (dev_priv),0 ); } static void i9xx_crtc_disable(struct intel_atomic_state *state,
@@ -2974,7 +2975,7 @@ static void i9xx_get_pfit_config(struct intel_crtc_state *crtc_state)if (!i9xx_has_pfit (dev_priv))return ; - tmp =intel_de_read (dev_priv,PFIT_CONTROL ); + tmp =intel_de_read (dev_priv,PFIT_CONTROL (dev_priv));if (!(tmp &PFIT_ENABLE ))return ;
drivers/gpu/drm/i915/display/intel_lvds.c +1 -1
@@ -148,7 +148,7 @@ static void intel_lvds_get_config(struct intel_encoder *encoder,/* gen2/3 store dither state in pfit control, needs to match */ if (DISPLAY_VER (dev_priv) <4 ) { - tmp =intel_de_read (dev_priv,PFIT_CONTROL ); + tmp =intel_de_read (dev_priv,PFIT_CONTROL (dev_priv)); crtc_state->gmch_pfit.control |= tmp &PFIT_PANEL_8TO6_DITHER_ENABLE ; }
drivers/gpu/drm/i915/display/intel_overlay.c +1 -1
@@ -950,7 +950,7 @@ static void update_pfit_vscale_ratio(struct intel_overlay *overlay) }else {u32 tmp; -if (intel_de_read (dev_priv,PFIT_CONTROL ) &PFIT_VERT_AUTO_SCALE ) +if (intel_de_read (dev_priv,PFIT_CONTROL (dev_priv)) &PFIT_VERT_AUTO_SCALE ) tmp =intel_de_read (dev_priv,PFIT_AUTO_RATIOS );else tmp =intel_de_read (dev_priv,PFIT_PGM_RATIOS );
drivers/gpu/drm/i915/i915_reg.h +1 -1
@@ -1588,7 +1588,7 @@#define VIDEO_DIP_ENABLE_AS_ADL REG_BIT(23)/* Panel fitting */ -#define PFIT_CONTROL _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x61230) +#define PFIT_CONTROL (dev_priv) _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x61230)#define PFIT_ENABLE REG_BIT(31)#define PFIT_PIPE_MASK REG_GENMASK(30, 29)/* 965+ */ #define PFIT_PIPE (pipe) REG_FIELD_PREP(PFIT_PIPE_MASK, (pipe))
Signature · 1 line
2.39.2
Re: [PATCH 15/65] drm/i915: pass dev_priv explicitly to PFIT_CONTROL
Quoted 2 lines · Jani Nikula
Avoid the implicit
dev_privlocal variable use, and passdev_privexplicitly to thePFIT_CONTROLregister macro.
Quoted 91 lines
Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/display/intel_display.c | 11 ++++++----- drivers/gpu/drm/i915/display/intel_lvds.c | 2 +- drivers/gpu/drm/i915/display/intel_overlay.c | 2 +- drivers/gpu/drm/i915/i915_reg.h | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-)drivers/gpu/drm/i915/display/intel_display.c +6
-5@@ -1861,12 +1861,13 @@ static void i9xx_pfit_enable(const struct intel_crtc_state *crtc_state)* according to register description and PRM. */ drm_WARN_ON (&dev_priv->drm, -intel_de_read (dev_priv,PFIT_CONTROL ) &PFIT_ENABLE ); +intel_de_read (dev_priv,PFIT_CONTROL (dev_priv)) &PFIT_ENABLE );assert_transcoder_disabled (dev_priv, crtc_state->cpu_transcoder);intel_de_write (dev_priv,PFIT_PGM_RATIOS , crtc_state->gmch_pfit.pgm_ratios); -intel_de_write (dev_priv,PFIT_CONTROL , crtc_state->gmch_pfit.control); +intel_de_write (dev_priv,PFIT_CONTROL (dev_priv), + crtc_state->gmch_pfit.control);/* Border color in case we don't scale up to the full screen. Black by * default, change to something else for debugging. */ @@ -2195,8 +2196,8 @@ static void i9xx_pfit_disable(const struct intel_crtc_state *old_crtc_state)assert_transcoder_disabled (dev_priv, old_crtc_state->cpu_transcoder);drm_dbg_kms (&dev_priv->drm,"disabling pfit, current: 0x%08x\n" , -intel_de_read (dev_priv,PFIT_CONTROL )); -intel_de_write (dev_priv,PFIT_CONTROL ,0 ); +intel_de_read (dev_priv,PFIT_CONTROL (dev_priv))); +intel_de_write (dev_priv,PFIT_CONTROL (dev_priv),0 ); } static void i9xx_crtc_disable(struct intel_atomic_state *state,@@ -2974,7 +2975,7 @@ static void i9xx_get_pfit_config(struct intel_crtc_state *crtc_state)if (!i9xx_has_pfit (dev_priv))return ; - tmp =intel_de_read (dev_priv,PFIT_CONTROL ); + tmp =intel_de_read (dev_priv,PFIT_CONTROL (dev_priv));if (!(tmp &PFIT_ENABLE ))return ;drivers/gpu/drm/i915/display/intel_lvds.c +1
-1@@ -148,7 +148,7 @@ static void intel_lvds_get_config(struct intel_encoder *encoder,/* gen2/3 store dither state in pfit control, needs to match */ if (DISPLAY_VER (dev_priv) <4 ) { - tmp =intel_de_read (dev_priv,PFIT_CONTROL ); + tmp =intel_de_read (dev_priv,PFIT_CONTROL (dev_priv)); crtc_state->gmch_pfit.control |= tmp &PFIT_PANEL_8TO6_DITHER_ENABLE ; }drivers/gpu/drm/i915/display/intel_overlay.c +1
-1@@ -950,7 +950,7 @@ static void update_pfit_vscale_ratio(struct intel_overlay *overlay) }else {u32 tmp; -if (intel_de_read (dev_priv,PFIT_CONTROL ) &PFIT_VERT_AUTO_SCALE ) +if (intel_de_read (dev_priv,PFIT_CONTROL (dev_priv)) &PFIT_VERT_AUTO_SCALE ) tmp =intel_de_read (dev_priv,PFIT_AUTO_RATIOS );else tmp =intel_de_read (dev_priv,PFIT_PGM_RATIOS );drivers/gpu/drm/i915/i915_reg.h +1
-1@@ -1588,7 +1588,7 @@#define VIDEO_DIP_ENABLE_AS_ADL REG_BIT(23)/* Panel fitting */ -#define PFIT_CONTROL _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x61230) +#define PFIT_CONTROL (dev_priv) _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x61230)#define PFIT_ENABLE REG_BIT(31)#define PFIT_PIPE_MASK REG_GENMASK(30, 29)/* 965+ */ #define PFIT_PIPE (pipe) REG_FIELD_PREP(PFIT_PIPE_MASK, (pipe))Signature · 1 line
2.39.2
PATCH 16/65 drm/i915: pass dev_priv explicitly to PFIT_PGM_RATIOS
In reply to Jani NikulaAvoid the implicit dev_priv local variable use, and pass dev_priv explicitly to the PFIT_PGM_RATIOS register macro.
--- drivers/gpu/drm/i915/display/intel_display.c | 4 ++-- drivers/gpu/drm/i915/display/intel_overlay.c | 5 +++-- drivers/gpu/drm/i915/i915_reg.h | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +2 -2
@@ -1864,7 +1864,7 @@ static void i9xx_pfit_enable(const struct intel_crtc_state *crtc_state) intel_de_read(dev_priv, PFIT_CONTROL(dev_priv)) & PFIT_ENABLE);assert_transcoder_disabled (dev_priv, crtc_state->cpu_transcoder); -intel_de_write (dev_priv,PFIT_PGM_RATIOS , +intel_de_write (dev_priv,PFIT_PGM_RATIOS (dev_priv), crtc_state->gmch_pfit.pgm_ratios);intel_de_write (dev_priv,PFIT_CONTROL (dev_priv), crtc_state->gmch_pfit.control);
@@ -2990,7 +2990,7 @@ static void i9xx_get_pfit_config(struct intel_crtc_state *crtc_state) crtc_state->gmch_pfit.control = tmp; crtc_state->gmch_pfit.pgm_ratios = -intel_de_read (dev_priv,PFIT_PGM_RATIOS ); +intel_de_read (dev_priv,PFIT_PGM_RATIOS (dev_priv)); } static enum intel_output_format
drivers/gpu/drm/i915/display/intel_overlay.c +3 -2
@@ -943,7 +943,7 @@ static void update_pfit_vscale_ratio(struct intel_overlay *overlay)* line with the intel documentation for the i965 */ if (DISPLAY_VER (dev_priv) >=4 ) { -u32 tmp =intel_de_read (dev_priv,PFIT_PGM_RATIOS ); +u32 tmp =intel_de_read (dev_priv,PFIT_PGM_RATIOS (dev_priv));/* on i965 use the PGM reg to read out the autoscaler values */ ratio =REG_FIELD_GET (PFIT_VERT_SCALE_MASK_965 , tmp);
@@ -953,7 +953,8 @@ static void update_pfit_vscale_ratio(struct intel_overlay *overlay)if (intel_de_read (dev_priv,PFIT_CONTROL (dev_priv)) &PFIT_VERT_AUTO_SCALE ) tmp =intel_de_read (dev_priv,PFIT_AUTO_RATIOS );else - tmp =intel_de_read (dev_priv,PFIT_PGM_RATIOS ); + tmp =intel_de_read (dev_priv, +PFIT_PGM_RATIOS (dev_priv)); ratio =REG_FIELD_GET (PFIT_VERT_SCALE_MASK , tmp); }
drivers/gpu/drm/i915/i915_reg.h +1 -1
@@ -1609,7 +1609,7 @@#define PFIT_HORIZ_AUTO_SCALE REG_BIT(5)/* pre-965 */ #define PFIT_PANEL_8TO6_DITHER_ENABLE REG_BIT(3)/* pre-965 */ -#define PFIT_PGM_RATIOS _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x61234) +#define PFIT_PGM_RATIOS (dev_priv) _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x61234)#define PFIT_VERT_SCALE_MASK REG_GENMASK(31, 20)/* pre-965 */ #define PFIT_VERT_SCALE (x) REG_FIELD_PREP(PFIT_VERT_SCALE_MASK, (x))#define PFIT_HORIZ_SCALE_MASK REG_GENMASK(15, 4)/* pre-965 */
Signature · 1 line
2.39.2
Re: [PATCH 16/65] drm/i915: pass dev_priv explicitly to PFIT_PGM_RATIOS
Quoted 3 lines · Jani Nikula
Avoid the implicit
dev_privlocal variable use, and passdev_privexplicitly to thePFIT_PGM_RATIOSregister macro.
Quoted 68 lines
Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/display/intel_display.c | 4 ++-- drivers/gpu/drm/i915/display/intel_overlay.c | 5 +++-- drivers/gpu/drm/i915/i915_reg.h | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-)drivers/gpu/drm/i915/display/intel_display.c +2
-2@@ -1864,7 +1864,7 @@ static void i9xx_pfit_enable(const struct intel_crtc_state *crtc_state) intel_de_read(dev_priv, PFIT_CONTROL(dev_priv)) & PFIT_ENABLE);assert_transcoder_disabled (dev_priv, crtc_state->cpu_transcoder); -intel_de_write (dev_priv,PFIT_PGM_RATIOS , +intel_de_write (dev_priv,PFIT_PGM_RATIOS (dev_priv), crtc_state->gmch_pfit.pgm_ratios);intel_de_write (dev_priv,PFIT_CONTROL (dev_priv), crtc_state->gmch_pfit.control);@@ -2990,7 +2990,7 @@ static void i9xx_get_pfit_config(struct intel_crtc_state *crtc_state) crtc_state->gmch_pfit.control = tmp; crtc_state->gmch_pfit.pgm_ratios = -intel_de_read (dev_priv,PFIT_PGM_RATIOS ); +intel_de_read (dev_priv,PFIT_PGM_RATIOS (dev_priv)); } static enum intel_output_formatdrivers/gpu/drm/i915/display/intel_overlay.c +3
-2@@ -943,7 +943,7 @@ static void update_pfit_vscale_ratio(struct intel_overlay *overlay)* line with the intel documentation for the i965 */ if (DISPLAY_VER (dev_priv) >=4 ) { -u32 tmp =intel_de_read (dev_priv,PFIT_PGM_RATIOS ); +u32 tmp =intel_de_read (dev_priv,PFIT_PGM_RATIOS (dev_priv));/* on i965 use the PGM reg to read out the autoscaler values */ ratio =REG_FIELD_GET (PFIT_VERT_SCALE_MASK_965 , tmp);@@ -953,7 +953,8 @@ static void update_pfit_vscale_ratio(struct intel_overlay *overlay)if (intel_de_read (dev_priv,PFIT_CONTROL (dev_priv)) &PFIT_VERT_AUTO_SCALE ) tmp =intel_de_read (dev_priv,PFIT_AUTO_RATIOS );else - tmp =intel_de_read (dev_priv,PFIT_PGM_RATIOS ); + tmp =intel_de_read (dev_priv, +PFIT_PGM_RATIOS (dev_priv)); ratio =REG_FIELD_GET (PFIT_VERT_SCALE_MASK , tmp); }drivers/gpu/drm/i915/i915_reg.h +1
-1@@ -1609,7 +1609,7 @@#define PFIT_HORIZ_AUTO_SCALE REG_BIT(5)/* pre-965 */ #define PFIT_PANEL_8TO6_DITHER_ENABLE REG_BIT(3)/* pre-965 */ -#define PFIT_PGM_RATIOS _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x61234) +#define PFIT_PGM_RATIOS (dev_priv) _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x61234)#define PFIT_VERT_SCALE_MASK REG_GENMASK(31, 20)/* pre-965 */ #define PFIT_VERT_SCALE (x) REG_FIELD_PREP(PFIT_VERT_SCALE_MASK, (x))#define PFIT_HORIZ_SCALE_MASK REG_GENMASK(15, 4)/* pre-965 */ Signature · 1 line
2.39.2
PATCH 17/65 drm/i915: pass dev_priv explicitly to PFIT_AUTO_RATIOS
In reply to Jani NikulaAvoid the implicit dev_priv local variable use, and pass dev_priv explicitly to the PFIT_AUTO_RATIOS register macro.
--- drivers/gpu/drm/i915/display/intel_overlay.c | 3 ++- drivers/gpu/drm/i915/i915_reg.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/display/intel_overlay.c +2 -1
@@ -951,7 +951,8 @@ static void update_pfit_vscale_ratio(struct intel_overlay *overlay)u32 tmp;if (intel_de_read (dev_priv,PFIT_CONTROL (dev_priv)) &PFIT_VERT_AUTO_SCALE ) - tmp =intel_de_read (dev_priv,PFIT_AUTO_RATIOS ); + tmp =intel_de_read (dev_priv, +PFIT_AUTO_RATIOS (dev_priv));else tmp =intel_de_read (dev_priv,PFIT_PGM_RATIOS (dev_priv));
drivers/gpu/drm/i915/i915_reg.h +1 -1
@@ -1617,7 +1617,7 @@#define PFIT_VERT_SCALE_MASK_965 REG_GENMASK(28, 16)/* 965+ */ #define PFIT_HORIZ_SCALE_MASK_965 REG_GENMASK(12, 0)/* 965+ */ -#define PFIT_AUTO_RATIOS _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x61238) +#define PFIT_AUTO_RATIOS (dev_priv) _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x61238)#define PCH_GTC_CTL _MMIO(0xe7000)#define PCH_GTC_ENABLE (1 << 31)
Signature · 1 line
2.39.2
Re: [PATCH 17/65] drm/i915: pass dev_priv explicitly to PFIT_AUTO_RATIOS
Quoted 2 lines · Jani Nikula
Avoid the implicit
dev_privlocal variable use, and passdev_privexplicitly to thePFIT_AUTO_RATIOSregister macro.
Quoted 37 lines
Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/display/intel_overlay.c | 3 ++- drivers/gpu/drm/i915/i915_reg.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/display/intel_overlay.c +2
-1@@ -951,7 +951,8 @@ static void update_pfit_vscale_ratio(struct intel_overlay *overlay)u32 tmp;if (intel_de_read (dev_priv,PFIT_CONTROL (dev_priv)) &PFIT_VERT_AUTO_SCALE ) - tmp =intel_de_read (dev_priv,PFIT_AUTO_RATIOS ); + tmp =intel_de_read (dev_priv, +PFIT_AUTO_RATIOS (dev_priv));else tmp =intel_de_read (dev_priv,PFIT_PGM_RATIOS (dev_priv));drivers/gpu/drm/i915/i915_reg.h +1
-1@@ -1617,7 +1617,7 @@#define PFIT_VERT_SCALE_MASK_965 REG_GENMASK(28, 16)/* 965+ */ #define PFIT_HORIZ_SCALE_MASK_965 REG_GENMASK(12, 0)/* 965+ */ -#define PFIT_AUTO_RATIOS _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x61238) +#define PFIT_AUTO_RATIOS (dev_priv) _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x61238)#define PCH_GTC_CTL _MMIO(0xe7000)#define PCH_GTC_ENABLE (1 << 31)Signature · 1 line
2.39.2
PATCH 18/65 drm/i915: pass dev_priv explicitly to TRANSCONF
In reply to Jani NikulaAvoid the implicit dev_priv local variable use, and pass dev_priv explicitly to the TRANSCONF register macro.
--- drivers/gpu/drm/i915/display/icl_dsi.c | 12 +++-- drivers/gpu/drm/i915/display/intel_crt.c | 11 ++-- drivers/gpu/drm/i915/display/intel_display.c | 52 +++++++++++-------- .../i915/display/intel_display_power_well.c | 8 +-- drivers/gpu/drm/i915/display/intel_drrs.c | 2 +- drivers/gpu/drm/i915/display/intel_fdi.c | 6 +-- .../gpu/drm/i915/display/intel_pch_display.c | 7 +-- drivers/gpu/drm/i915/display/vlv_dsi.c | 3 +- drivers/gpu/drm/i915/gvt/display.c | 12 ++--- drivers/gpu/drm/i915/gvt/handlers.c | 12 +++-- drivers/gpu/drm/i915/i915_reg.h | 2 +- drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 8 +-- 12 files changed, 76 insertions(+), 59 deletions(-)
drivers/gpu/drm/i915/display/icl_dsi.c +7 -5
@@ -1013,10 +1013,11 @@ static void gen11_dsi_enable_transcoder(struct intel_encoder *encoder)for_each_dsi_port (port, intel_dsi->ports) { dsi_trans =dsi_port_to_transcoder (port); -intel_de_rmw (dev_priv,TRANSCONF (dsi_trans),0 ,TRANSCONF_ENABLE ); +intel_de_rmw (dev_priv,TRANSCONF (dev_priv, dsi_trans),0 , +TRANSCONF_ENABLE );/* wait for transcoder to be enabled */ -if (intel_de_wait_for_set (dev_priv,TRANSCONF (dsi_trans), +if (intel_de_wait_for_set (dev_priv,TRANSCONF (dev_priv, dsi_trans),TRANSCONF_STATE_ENABLE ,10 ))drm_err (&dev_priv->drm,"DSI transcoder not enabled\n" );
@@ -1279,10 +1280,11 @@ static void gen11_dsi_disable_transcoder(struct intel_encoder *encoder) dsi_trans =dsi_port_to_transcoder (port);/* disable transcoder */ -intel_de_rmw (dev_priv,TRANSCONF (dsi_trans),TRANSCONF_ENABLE ,0 ); +intel_de_rmw (dev_priv,TRANSCONF (dev_priv, dsi_trans), +TRANSCONF_ENABLE ,0 );/* wait for transcoder to be disabled */ -if (intel_de_wait_for_clear (dev_priv,TRANSCONF (dsi_trans), +if (intel_de_wait_for_clear (dev_priv,TRANSCONF (dev_priv, dsi_trans),TRANSCONF_STATE_ENABLE ,50 ))drm_err (&dev_priv->drm,"DSI trancoder not disabled\n" );
@@ -1714,7 +1716,7 @@ static bool gen11_dsi_get_hw_state(struct intel_encoder *encoder, goto out; } - tmp =intel_de_read (dev_priv,TRANSCONF (dsi_trans)); + tmp =intel_de_read (dev_priv,TRANSCONF (dev_priv, dsi_trans)); ret = tmp &TRANSCONF_ENABLE ; } out:
drivers/gpu/drm/i915/display/intel_crt.c +7 -4
@@ -725,11 +725,13 @@ intel_crt_load_detect(struct intel_crt *crt, enum pipe pipe)intel_de_write (dev_priv,BCLRPAT (dev_priv, cpu_transcoder),0x500050 );if (DISPLAY_VER (dev_priv) !=2 ) { -u32 transconf =intel_de_read (dev_priv,TRANSCONF (cpu_transcoder)); +u32 transconf =intel_de_read (dev_priv, +TRANSCONF (dev_priv, cpu_transcoder)); -intel_de_write (dev_priv,TRANSCONF (cpu_transcoder), +intel_de_write (dev_priv,TRANSCONF (dev_priv, cpu_transcoder), transconf |TRANSCONF_FORCE_BORDER ); -intel_de_posting_read (dev_priv,TRANSCONF (cpu_transcoder)); +intel_de_posting_read (dev_priv, +TRANSCONF (dev_priv, cpu_transcoder));/* Wait for next Vblank to substitue * border color for Color info */ intel_crtc_wait_for_next_vblank (intel_crtc_for_pipe (dev_priv, pipe));
@@ -738,7 +740,8 @@ intel_crt_load_detect(struct intel_crt *crt, enum pipe pipe) connector_status_connected : connector_status_disconnected; -intel_de_write (dev_priv,TRANSCONF (cpu_transcoder), transconf); +intel_de_write (dev_priv,TRANSCONF (dev_priv, cpu_transcoder), + transconf); }else {bool restore_vblank = false;int count, detect;
drivers/gpu/drm/i915/display/intel_display.c +29 -23
150 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_display_power_well.c +4 -4
@@ -1044,9 +1044,9 @@ static bool i9xx_always_on_power_well_enabled(struct drm_i915_private *dev_priv,static void i830_pipes_power_well_enable (struct drm_i915_private *dev_priv,struct i915_power_well *power_well) { -if ((intel_de_read (dev_priv,TRANSCONF (PIPE_A )) &TRANSCONF_ENABLE ) ==0 ) +if ((intel_de_read (dev_priv,TRANSCONF (dev_priv,PIPE_A )) &TRANSCONF_ENABLE ) ==0 )i830_enable_pipe (dev_priv,PIPE_A ); -if ((intel_de_read (dev_priv,TRANSCONF (PIPE_B )) &TRANSCONF_ENABLE ) ==0 ) +if ((intel_de_read (dev_priv,TRANSCONF (dev_priv,PIPE_B )) &TRANSCONF_ENABLE ) ==0 )i830_enable_pipe (dev_priv,PIPE_B ); }
@@ -1060,8 +1060,8 @@ static void i830_pipes_power_well_disable(struct drm_i915_private *dev_priv,static bool i830_pipes_power_well_enabled (struct drm_i915_private *dev_priv,struct i915_power_well *power_well) { -return intel_de_read (dev_priv,TRANSCONF (PIPE_A )) &TRANSCONF_ENABLE && -intel_de_read (dev_priv,TRANSCONF (PIPE_B )) &TRANSCONF_ENABLE ; +return intel_de_read (dev_priv,TRANSCONF (dev_priv,PIPE_A )) &TRANSCONF_ENABLE && +intel_de_read (dev_priv,TRANSCONF (dev_priv,PIPE_B )) &TRANSCONF_ENABLE ; } static void i830_pipes_power_well_sync_hw(struct drm_i915_private *dev_priv,
drivers/gpu/drm/i915/display/intel_drrs.c +1 -1
@@ -85,7 +85,7 @@ intel_drrs_set_refresh_rate_pipeconf(struct intel_crtc *crtc,else bit =TRANSCONF_REFRESH_RATE_ALT_ILK ; -intel_de_rmw (dev_priv,TRANSCONF (cpu_transcoder), +intel_de_rmw (dev_priv,TRANSCONF (dev_priv, cpu_transcoder), bit, refresh_rate ==DRRS_REFRESH_RATE_LOW ? bit :0 ); }
drivers/gpu/drm/i915/display/intel_fdi.c +3 -3
@@ -1034,7 +1034,7 @@ void ilk_fdi_pll_enable(const struct intel_crtc_state *crtc_state) temp =intel_de_read (dev_priv, reg); temp &= ~(FDI_DP_PORT_WIDTH_MASK | (0x7 <<16 )); temp |=FDI_DP_PORT_WIDTH (crtc_state->fdi_lanes); - temp |= (intel_de_read (dev_priv,TRANSCONF (pipe)) &TRANSCONF_BPC_MASK ) <<11 ; + temp |= (intel_de_read (dev_priv,TRANSCONF (dev_priv, pipe)) &TRANSCONF_BPC_MASK ) <<11 ;intel_de_write (dev_priv, reg, temp |FDI_RX_PLL_ENABLE );intel_de_posting_read (dev_priv, reg);
@@ -1090,7 +1090,7 @@ void ilk_fdi_disable(struct intel_crtc *crtc) reg =FDI_RX_CTL (pipe); temp =intel_de_read (dev_priv, reg); temp &= ~(0x7 <<16 ); - temp |= (intel_de_read (dev_priv,TRANSCONF (pipe)) &TRANSCONF_BPC_MASK ) <<11 ; + temp |= (intel_de_read (dev_priv,TRANSCONF (dev_priv, pipe)) &TRANSCONF_BPC_MASK ) <<11 ;intel_de_write (dev_priv, reg, temp & ~FDI_RX_ENABLE );intel_de_posting_read (dev_priv, reg);
@@ -1116,7 +1116,7 @@ void ilk_fdi_disable(struct intel_crtc *crtc) }/* BPC in FDI rx is consistent with that in TRANSCONF */ temp &= ~(0x07 <<16 ); - temp |= (intel_de_read (dev_priv,TRANSCONF (pipe)) &TRANSCONF_BPC_MASK ) <<11 ; + temp |= (intel_de_read (dev_priv,TRANSCONF (dev_priv, pipe)) &TRANSCONF_BPC_MASK ) <<11 ;intel_de_write (dev_priv, reg, temp);intel_de_posting_read (dev_priv, reg);
drivers/gpu/drm/i915/display/intel_pch_display.c +4 -3
@@ -271,7 +271,7 @@ static void ilk_enable_pch_transcoder(const struct intel_crtc_state *crtc_state) reg =PCH_TRANSCONF (pipe); val =intel_de_read (dev_priv, reg); - pipeconf_val =intel_de_read (dev_priv,TRANSCONF (pipe)); + pipeconf_val =intel_de_read (dev_priv,TRANSCONF (dev_priv, pipe));if (HAS_PCH_IBX (dev_priv)) {/* Configure frame start delay to match the CPU */
@@ -413,7 +413,7 @@ void ilk_pch_enable(struct intel_atomic_state *state, intel_crtc_has_dp_encoder(crtc_state)) {const struct drm_display_mode *adjusted_mode = &crtc_state->hw.adjusted_mode; -u32 bpc = (intel_de_read (dev_priv,TRANSCONF (pipe)) &TRANSCONF_BPC_MASK ) >>5 ; +u32 bpc = (intel_de_read (dev_priv,TRANSCONF (dev_priv, pipe)) &TRANSCONF_BPC_MASK ) >>5 ;i915_reg_t reg =TRANS_DP_CTL (pipe);enum port port;
@@ -557,7 +557,8 @@ static void lpt_enable_pch_transcoder(const struct intel_crtc_state *crtc_state)intel_de_write (dev_priv,TRANS_CHICKEN2 (PIPE_A ), val); val =TRANS_ENABLE ; - pipeconf_val =intel_de_read (dev_priv,TRANSCONF (cpu_transcoder)); + pipeconf_val =intel_de_read (dev_priv, +TRANSCONF (dev_priv, cpu_transcoder));if ((pipeconf_val &TRANSCONF_INTERLACE_MASK_HSW ) ==TRANSCONF_INTERLACE_IF_ID_ILK ) val |=TRANS_INTERLACE_INTERLACED ;
drivers/gpu/drm/i915/display/vlv_dsi.c +2 -1
@@ -972,7 +972,8 @@ static bool intel_dsi_get_hw_state(struct intel_encoder *encoder,*/ if ((IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv)) && port ==PORT_C ) - enabled =intel_de_read (display,TRANSCONF (PIPE_B )) &TRANSCONF_ENABLE ; + enabled =intel_de_read (display, +TRANSCONF (dev_priv,PIPE_B )) &TRANSCONF_ENABLE ;/* Try command mode if video mode not enabled */ if (!enabled) {
drivers/gpu/drm/i915/gvt/display.c +6 -6
@@ -67,7 +67,7 @@ static int edp_pipe_is_enabled(struct intel_vgpu *vgpu) {struct drm_i915_private *dev_priv = vgpu->gvt->gt->i915; -if (!(vgpu_vreg_t (vgpu,TRANSCONF (TRANSCODER_EDP )) &TRANSCONF_ENABLE )) +if (!(vgpu_vreg_t (vgpu,TRANSCONF (dev_priv,TRANSCODER_EDP )) &TRANSCONF_ENABLE ))return 0 ;if (!(vgpu_vreg (vgpu, _TRANS_DDI_FUNC_CTL_EDP) &TRANS_DDI_FUNC_ENABLE ))
@@ -83,7 +83,7 @@ int pipe_is_enabled(struct intel_vgpu *vgpu, int pipe) pipe < PIPE_A || pipe >= I915_MAX_PIPES))return -EINVAL ; -if (vgpu_vreg_t (vgpu,TRANSCONF (pipe)) &TRANSCONF_ENABLE ) +if (vgpu_vreg_t (vgpu,TRANSCONF (dev_priv, pipe)) &TRANSCONF_ENABLE )return 1 ; if (edp_pipe_is_enabled(vgpu) &&
@@ -191,7 +191,7 @@ static void emulate_monitor_status_change(struct intel_vgpu *vgpu) GEN8_DE_PORT_HOTPLUG(HPD_PORT_C));for_each_pipe (dev_priv, pipe) { -vgpu_vreg_t (vgpu,TRANSCONF (pipe)) &= +vgpu_vreg_t (vgpu,TRANSCONF (dev_priv, pipe)) &= ~(TRANSCONF_ENABLE |TRANSCONF_STATE_ENABLE );vgpu_vreg_t (vgpu,DSPCNTR (dev_priv, pipe)) &= ~DISP_ENABLE ;vgpu_vreg_t (vgpu,SPRCTL (pipe)) &= ~SPRITE_ENABLE ;
@@ -252,8 +252,8 @@ static void emulate_monitor_status_change(struct intel_vgpu *vgpu)* TRANSCODER_A can be enabled. PORT_x depends on the input of * setup_virtual_dp_monitor. */ -vgpu_vreg_t (vgpu,TRANSCONF (TRANSCODER_A )) |=TRANSCONF_ENABLE ; -vgpu_vreg_t (vgpu,TRANSCONF (TRANSCODER_A )) |=TRANSCONF_STATE_ENABLE ; +vgpu_vreg_t (vgpu,TRANSCONF (dev_priv,TRANSCODER_A )) |=TRANSCONF_ENABLE ; +vgpu_vreg_t (vgpu,TRANSCONF (dev_priv,TRANSCODER_A )) |=TRANSCONF_STATE_ENABLE ;/* * Golden M/N are calculated based on:
@@ -510,7 +510,7 @@ static void emulate_monitor_status_change(struct intel_vgpu *vgpu)vgpu_vreg_t (vgpu,CURCNTR (dev_priv, pipe)) |=MCURSOR_MODE_DISABLE ; } -vgpu_vreg_t (vgpu,TRANSCONF (TRANSCODER_A )) |=TRANSCONF_ENABLE ; +vgpu_vreg_t (vgpu,TRANSCONF (dev_priv,TRANSCODER_A )) |=TRANSCONF_ENABLE ; }static void clean_virtual_dp_monitor (struct intel_vgpu *vgpu,int port_num)
drivers/gpu/drm/i915/gvt/handlers.c +8 -4
@@ -2270,10 +2270,14 @@ static int init_generic_mmio_info(struct intel_gvt *gvt)MMIO_DFH (GEN7_HALF_SLICE_CHICKEN1 ,D_ALL ,F_MODE_MASK |F_CMD_ACCESS ,NULL ,NULL );/* display */ -MMIO_DH (TRANSCONF (TRANSCODER_A ),D_ALL ,NULL , pipeconf_mmio_write); -MMIO_DH (TRANSCONF (TRANSCODER_B ),D_ALL ,NULL , pipeconf_mmio_write); -MMIO_DH (TRANSCONF (TRANSCODER_C ),D_ALL ,NULL , pipeconf_mmio_write); -MMIO_DH (TRANSCONF (TRANSCODER_EDP ),D_ALL ,NULL , pipeconf_mmio_write); +MMIO_DH (TRANSCONF (dev_priv,TRANSCODER_A ),D_ALL ,NULL , + pipeconf_mmio_write); +MMIO_DH (TRANSCONF (dev_priv,TRANSCODER_B ),D_ALL ,NULL , + pipeconf_mmio_write); +MMIO_DH (TRANSCONF (dev_priv,TRANSCODER_C ),D_ALL ,NULL , + pipeconf_mmio_write); +MMIO_DH (TRANSCONF (dev_priv,TRANSCODER_EDP ),D_ALL ,NULL , + pipeconf_mmio_write);MMIO_DH (DSPSURF (dev_priv,PIPE_A ),D_ALL ,NULL , pri_surf_mmio_write);MMIO_DH (REG_50080 (PIPE_A ,PLANE_PRIMARY ),D_ALL ,NULL , reg50080_mmio_write);
drivers/gpu/drm/i915/i915_reg.h +1 -1
@@ -1876,7 +1876,7 @@#define PIPESTAT_INT_ENABLE_MASK 0x7fff0000#define PIPESTAT_INT_STATUS_MASK 0x0000ffff -#define TRANSCONF (trans) _MMIO_PIPE2(dev_priv, (trans), _TRANSACONF) +#define TRANSCONF (dev_priv, trans) _MMIO_PIPE2(dev_priv, (trans), _TRANSACONF)#define PIPEDSL (pipe) _MMIO_PIPE2(dev_priv, pipe, _PIPEADSL)#define PIPEFRAME (pipe) _MMIO_PIPE2(dev_priv, pipe, _PIPEAFRAMEHIGH)#define PIPEFRAMEPIXEL (pipe) _MMIO_PIPE2(dev_priv, pipe, _PIPEAFRAMEPIXEL)
drivers/gpu/drm/i915/intel_gvt_mmio_table.c +4 -4
@@ -130,10 +130,10 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (PIPEDSL (PIPE_B ));MMIO_D (PIPEDSL (PIPE_C ));MMIO_D (PIPEDSL (_PIPE_EDP)); -MMIO_D (TRANSCONF (TRANSCODER_A )); -MMIO_D (TRANSCONF (TRANSCODER_B )); -MMIO_D (TRANSCONF (TRANSCODER_C )); -MMIO_D (TRANSCONF (TRANSCODER_EDP )); +MMIO_D (TRANSCONF (dev_priv,TRANSCODER_A )); +MMIO_D (TRANSCONF (dev_priv,TRANSCODER_B )); +MMIO_D (TRANSCONF (dev_priv,TRANSCODER_C )); +MMIO_D (TRANSCONF (dev_priv,TRANSCODER_EDP ));MMIO_D (PIPESTAT (PIPE_A ));MMIO_D (PIPESTAT (PIPE_B ));MMIO_D (PIPESTAT (PIPE_C ));
Signature · 1 line
2.39.2
Re: [PATCH 18/65] drm/i915: pass dev_priv explicitly to TRANSCONF
Quoted 2 lines · Jani Nikula
Avoid the implicit
dev_privlocal variable use, and passdev_privexplicitly to the TRANSCONF register macro.
Quoted 485 lines
Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/display/icl_dsi.c | 12 +++-- drivers/gpu/drm/i915/display/intel_crt.c | 11 ++-- drivers/gpu/drm/i915/display/intel_display.c | 52 +++++++++++-------- .../i915/display/intel_display_power_well.c | 8 +-- drivers/gpu/drm/i915/display/intel_drrs.c | 2 +- drivers/gpu/drm/i915/display/intel_fdi.c | 6 +-- .../gpu/drm/i915/display/intel_pch_display.c | 7 +-- drivers/gpu/drm/i915/display/vlv_dsi.c | 3 +- drivers/gpu/drm/i915/gvt/display.c | 12 ++--- drivers/gpu/drm/i915/gvt/handlers.c | 12 +++-- drivers/gpu/drm/i915/i915_reg.h | 2 +- drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 8 +-- 12 files changed, 76 insertions(+), 59 deletions(-)drivers/gpu/drm/i915/display/icl_dsi.c +7
-5@@ -1013,10 +1013,11 @@ static void gen11_dsi_enable_transcoder(struct intel_encoder *encoder)for_each_dsi_port (port, intel_dsi->ports) { dsi_trans =dsi_port_to_transcoder (port); -intel_de_rmw (dev_priv,TRANSCONF (dsi_trans),0 ,TRANSCONF_ENABLE ); +intel_de_rmw (dev_priv,TRANSCONF (dev_priv, dsi_trans),0 , +TRANSCONF_ENABLE );/* wait for transcoder to be enabled */ -if (intel_de_wait_for_set (dev_priv,TRANSCONF (dsi_trans), +if (intel_de_wait_for_set (dev_priv,TRANSCONF (dev_priv, dsi_trans),TRANSCONF_STATE_ENABLE ,10 ))drm_err (&dev_priv->drm,"DSI transcoder not enabled\n" );@@ -1279,10 +1280,11 @@ static void gen11_dsi_disable_transcoder(struct intel_encoder *encoder) dsi_trans =dsi_port_to_transcoder (port);/* disable transcoder */ -intel_de_rmw (dev_priv,TRANSCONF (dsi_trans),TRANSCONF_ENABLE ,0 ); +intel_de_rmw (dev_priv,TRANSCONF (dev_priv, dsi_trans), +TRANSCONF_ENABLE ,0 );/* wait for transcoder to be disabled */ -if (intel_de_wait_for_clear (dev_priv,TRANSCONF (dsi_trans), +if (intel_de_wait_for_clear (dev_priv,TRANSCONF (dev_priv, dsi_trans),TRANSCONF_STATE_ENABLE ,50 ))drm_err (&dev_priv->drm,"DSI trancoder not disabled\n" );@@ -1714,7 +1716,7 @@ static bool gen11_dsi_get_hw_state(struct intel_encoder *encoder, goto out; } - tmp =intel_de_read (dev_priv,TRANSCONF (dsi_trans)); + tmp =intel_de_read (dev_priv,TRANSCONF (dev_priv, dsi_trans)); ret = tmp &TRANSCONF_ENABLE ; } out:drivers/gpu/drm/i915/display/intel_crt.c +7
-4@@ -725,11 +725,13 @@ intel_crt_load_detect(struct intel_crt *crt, enum pipe pipe)intel_de_write (dev_priv,BCLRPAT (dev_priv, cpu_transcoder),0x500050 );if (DISPLAY_VER (dev_priv) !=2 ) { -u32 transconf =intel_de_read (dev_priv,TRANSCONF (cpu_transcoder)); +u32 transconf =intel_de_read (dev_priv, +TRANSCONF (dev_priv, cpu_transcoder)); -intel_de_write (dev_priv,TRANSCONF (cpu_transcoder), +intel_de_write (dev_priv,TRANSCONF (dev_priv, cpu_transcoder), transconf |TRANSCONF_FORCE_BORDER ); -intel_de_posting_read (dev_priv,TRANSCONF (cpu_transcoder)); +intel_de_posting_read (dev_priv, +TRANSCONF (dev_priv, cpu_transcoder));/* Wait for next Vblank to substitue * border color for Color info */ intel_crtc_wait_for_next_vblank (intel_crtc_for_pipe (dev_priv, pipe));@@ -738,7 +740,8 @@ intel_crt_load_detect(struct intel_crt *crt, enum pipe pipe) connector_status_connected : connector_status_disconnected; -intel_de_write (dev_priv,TRANSCONF (cpu_transcoder), transconf); +intel_de_write (dev_priv,TRANSCONF (dev_priv, cpu_transcoder), + transconf); }else {bool restore_vblank = false;int count, detect;drivers/gpu/drm/i915/display/intel_display.c +29
-23@@ -307,7 +307,7 @@ intel_wait_for_pipe_off(const struct intel_crtc_state *old_crtc_state)enum transcoder cpu_transcoder = old_crtc_state->cpu_transcoder;/* Wait for the Pipe State to go off */ -if (intel_de_wait_for_clear (dev_priv,TRANSCONF (cpu_transcoder), +if (intel_de_wait_for_clear (dev_priv,TRANSCONF (dev_priv, cpu_transcoder),TRANSCONF_STATE_ENABLE ,100 ))drm_WARN (&dev_priv->drm,1 ,"pipe_off wait timed out\n" ); }else {@@ -329,7 +329,8 @@ void assert_transcoder(struct drm_i915_private *dev_priv, power_domain =POWER_DOMAIN_TRANSCODER (cpu_transcoder); wakeref =intel_display_power_get_if_enabled (dev_priv, power_domain);if (wakeref) { -u32 val =intel_de_read (dev_priv,TRANSCONF (cpu_transcoder)); +u32 val =intel_de_read (dev_priv, +TRANSCONF (dev_priv, cpu_transcoder)); cur_state = !!(val &TRANSCONF_ENABLE );intel_display_power_put (dev_priv, power_domain, wakeref);@@ -453,7 +454,7 @@ void intel_enable_transcoder(const struct intel_crtc_state *new_crtc_state) clear, set); } - val =intel_de_read (dev_priv,TRANSCONF (cpu_transcoder)); + val =intel_de_read (dev_priv,TRANSCONF (dev_priv, cpu_transcoder));if (val &TRANSCONF_ENABLE ) {/* we keep both pipes enabled on 830 */ drm_WARN_ON (&dev_priv->drm, !IS_I830 (dev_priv));@@ -468,9 +469,9 @@ void intel_enable_transcoder(const struct intel_crtc_state *new_crtc_state) TRANSCONF_PIXEL_COUNT_SCALING_X4); } -intel_de_write (dev_priv,TRANSCONF (cpu_transcoder), +intel_de_write (dev_priv,TRANSCONF (dev_priv, cpu_transcoder), val |TRANSCONF_ENABLE ); -intel_de_posting_read (dev_priv,TRANSCONF (cpu_transcoder)); +intel_de_posting_read (dev_priv,TRANSCONF (dev_priv, cpu_transcoder));/* * Until the pipe starts PIPEDSL reads will return a stale value, @@ -499,7 +500,7 @@ void intel_disable_transcoder(const struct intel_crtc_state *old_crtc_state)*/ assert_planes_disabled (crtc); - val =intel_de_read (dev_priv,TRANSCONF (cpu_transcoder)); + val =intel_de_read (dev_priv,TRANSCONF (dev_priv, cpu_transcoder));if ((val &TRANSCONF_ENABLE ) ==0 )return ;@@ -519,7 +520,7 @@ void intel_disable_transcoder(const struct intel_crtc_state *old_crtc_state) old_crtc_state->dsc.compression_enable) val &= ~TRANSCONF_PIXEL_COUNT_SCALING_MASK ; -intel_de_write (dev_priv,TRANSCONF (cpu_transcoder), val); +intel_de_write (dev_priv,TRANSCONF (dev_priv, cpu_transcoder), val);if (DISPLAY_VER (dev_priv) >=12 ) intel_de_rmw(dev_priv, hsw_chicken_trans_reg(dev_priv, cpu_transcoder),@@ -2799,9 +2800,11 @@ static bool intel_pipe_is_interlaced(const struct intel_crtc_state *crtc_state)if (DISPLAY_VER (dev_priv) >=9 ||IS_BROADWELL (dev_priv) ||IS_HASWELL (dev_priv)) -return intel_de_read (dev_priv,TRANSCONF (cpu_transcoder)) &TRANSCONF_INTERLACE_MASK_HSW ; +return intel_de_read (dev_priv, +TRANSCONF (dev_priv, cpu_transcoder)) &TRANSCONF_INTERLACE_MASK_HSW ;else -return intel_de_read (dev_priv,TRANSCONF (cpu_transcoder)) &TRANSCONF_INTERLACE_MASK ; +return intel_de_read (dev_priv, +TRANSCONF (dev_priv, cpu_transcoder)) &TRANSCONF_INTERLACE_MASK ; } static void intel_get_transcoder_timings(struct intel_crtc *crtc,@@ -2952,8 +2955,8 @@ void i9xx_set_pipeconf(const struct intel_crtc_state *crtc_state) val |=TRANSCONF_FRAME_START_DELAY (crtc_state->framestart_delay -1 ); -intel_de_write (dev_priv,TRANSCONF (cpu_transcoder), val); -intel_de_posting_read (dev_priv,TRANSCONF (cpu_transcoder)); +intel_de_write (dev_priv,TRANSCONF (dev_priv, cpu_transcoder), val); +intel_de_posting_read (dev_priv,TRANSCONF (dev_priv, cpu_transcoder)); }static bool i9xx_has_pfit (struct drm_i915_private *dev_priv)@@ -3035,7 +3038,8 @@ static bool i9xx_get_pipe_config(struct intel_crtc *crtc, ret = false; - tmp =intel_de_read (dev_priv,TRANSCONF (pipe_config->cpu_transcoder)); + tmp =intel_de_read (dev_priv, +TRANSCONF (dev_priv, pipe_config->cpu_transcoder));if (!(tmp &TRANSCONF_ENABLE )) goto out;@@ -3182,8 +3186,8 @@ void ilk_set_pipeconf(const struct intel_crtc_state *crtc_state) val |=TRANSCONF_FRAME_START_DELAY (crtc_state->framestart_delay -1 ); val |=TRANSCONF_MSA_TIMING_DELAY (crtc_state->msa_timing_delay); -intel_de_write (dev_priv,TRANSCONF (cpu_transcoder), val); -intel_de_posting_read (dev_priv,TRANSCONF (cpu_transcoder)); +intel_de_write (dev_priv,TRANSCONF (dev_priv, cpu_transcoder), val); +intel_de_posting_read (dev_priv,TRANSCONF (dev_priv, cpu_transcoder)); }static void hsw_set_transconf (const struct intel_crtc_state *crtc_state)@@ -3212,8 +3216,8 @@ static void hsw_set_transconf(const struct intel_crtc_state *crtc_state) crtc_state->output_format != INTEL_OUTPUT_FORMAT_RGB) val |=TRANSCONF_OUTPUT_COLORSPACE_YUV_HSW ; -intel_de_write (dev_priv,TRANSCONF (cpu_transcoder), val); -intel_de_posting_read (dev_priv,TRANSCONF (cpu_transcoder)); +intel_de_write (dev_priv,TRANSCONF (dev_priv, cpu_transcoder), val); +intel_de_posting_read (dev_priv,TRANSCONF (dev_priv, cpu_transcoder)); }static void bdw_set_pipe_misc (const struct intel_crtc_state *crtc_state)@@ -3408,7 +3412,8 @@ static bool ilk_get_pipe_config(struct intel_crtc *crtc, pipe_config->shared_dpll =NULL ; ret = false; - tmp =intel_de_read (dev_priv,TRANSCONF (pipe_config->cpu_transcoder)); + tmp =intel_de_read (dev_priv, +TRANSCONF (dev_priv, pipe_config->cpu_transcoder));if (!(tmp &TRANSCONF_ENABLE )) goto out;@@ -3721,7 +3726,8 @@ static bool hsw_get_transcoder_state(struct intel_crtc *crtc, pipe_config->pch_pfit.force_thru = true; } - tmp =intel_de_read (dev_priv,TRANSCONF (pipe_config->cpu_transcoder)); + tmp =intel_de_read (dev_priv, +TRANSCONF (dev_priv, pipe_config->cpu_transcoder));return tmp &TRANSCONF_ENABLE ; }@@ -3827,7 +3833,7 @@ static bool hsw_get_pipe_config(struct intel_crtc *crtc,if (IS_HASWELL (dev_priv)) {u32 tmp =intel_de_read (dev_priv, -TRANSCONF (pipe_config->cpu_transcoder)); +TRANSCONF (dev_priv, pipe_config->cpu_transcoder));if (tmp &TRANSCONF_OUTPUT_COLORSPACE_YUV_HSW ) pipe_config->output_format =INTEL_OUTPUT_FORMAT_YCBCR444 ;@@ -8238,8 +8244,8 @@ void i830_enable_pipe(struct drm_i915_private *dev_priv, enum pipe pipe)udelay (150 );/* wait for warmup */ } -intel_de_write (dev_priv,TRANSCONF (pipe),TRANSCONF_ENABLE ); -intel_de_posting_read (dev_priv,TRANSCONF (pipe)); +intel_de_write (dev_priv,TRANSCONF (dev_priv, pipe),TRANSCONF_ENABLE ); +intel_de_posting_read (dev_priv,TRANSCONF (dev_priv, pipe));intel_wait_for_pipe_scanline_moving (crtc); }@@ -8262,8 +8268,8 @@ void i830_disable_pipe(struct drm_i915_private *dev_priv, enum pipe pipe)drm_WARN_ON (&dev_priv->drm,intel_de_read (dev_priv,CURCNTR (dev_priv,PIPE_B )) &MCURSOR_MODE_MASK ); -intel_de_write (dev_priv,TRANSCONF (pipe),0 ); -intel_de_posting_read (dev_priv,TRANSCONF (pipe)); +intel_de_write (dev_priv,TRANSCONF (dev_priv, pipe),0 ); +intel_de_posting_read (dev_priv,TRANSCONF (dev_priv, pipe));intel_wait_for_pipe_scanline_stopped (crtc);drivers/gpu/drm/i915/display/intel_display_power_well.c +4
-4@@ -1044,9 +1044,9 @@ static bool i9xx_always_on_power_well_enabled(struct drm_i915_private *dev_priv,static void i830_pipes_power_well_enable (struct drm_i915_private *dev_priv,struct i915_power_well *power_well) { -if ((intel_de_read (dev_priv,TRANSCONF (PIPE_A )) &TRANSCONF_ENABLE ) ==0 ) +if ((intel_de_read (dev_priv,TRANSCONF (dev_priv,PIPE_A )) &TRANSCONF_ENABLE ) ==0 )i830_enable_pipe (dev_priv,PIPE_A ); -if ((intel_de_read (dev_priv,TRANSCONF (PIPE_B )) &TRANSCONF_ENABLE ) ==0 ) +if ((intel_de_read (dev_priv,TRANSCONF (dev_priv,PIPE_B )) &TRANSCONF_ENABLE ) ==0 )i830_enable_pipe (dev_priv,PIPE_B ); }@@ -1060,8 +1060,8 @@ static void i830_pipes_power_well_disable(struct drm_i915_private *dev_priv,static bool i830_pipes_power_well_enabled (struct drm_i915_private *dev_priv,struct i915_power_well *power_well) { -return intel_de_read (dev_priv,TRANSCONF (PIPE_A )) &TRANSCONF_ENABLE && -intel_de_read (dev_priv,TRANSCONF (PIPE_B )) &TRANSCONF_ENABLE ; +return intel_de_read (dev_priv,TRANSCONF (dev_priv,PIPE_A )) &TRANSCONF_ENABLE && +intel_de_read (dev_priv,TRANSCONF (dev_priv,PIPE_B )) &TRANSCONF_ENABLE ; } static void i830_pipes_power_well_sync_hw(struct drm_i915_private *dev_priv,drivers/gpu/drm/i915/display/intel_drrs.c +1
-1@@ -85,7 +85,7 @@ intel_drrs_set_refresh_rate_pipeconf(struct intel_crtc *crtc,else bit =TRANSCONF_REFRESH_RATE_ALT_ILK ; -intel_de_rmw (dev_priv,TRANSCONF (cpu_transcoder), +intel_de_rmw (dev_priv,TRANSCONF (dev_priv, cpu_transcoder), bit, refresh_rate ==DRRS_REFRESH_RATE_LOW ? bit :0 ); }drivers/gpu/drm/i915/display/intel_fdi.c +3
-3@@ -1034,7 +1034,7 @@ void ilk_fdi_pll_enable(const struct intel_crtc_state *crtc_state) temp =intel_de_read (dev_priv, reg); temp &= ~(FDI_DP_PORT_WIDTH_MASK | (0x7 <<16 )); temp |=FDI_DP_PORT_WIDTH (crtc_state->fdi_lanes); - temp |= (intel_de_read (dev_priv,TRANSCONF (pipe)) &TRANSCONF_BPC_MASK ) <<11 ; + temp |= (intel_de_read (dev_priv,TRANSCONF (dev_priv, pipe)) &TRANSCONF_BPC_MASK ) <<11 ;intel_de_write (dev_priv, reg, temp |FDI_RX_PLL_ENABLE );intel_de_posting_read (dev_priv, reg);@@ -1090,7 +1090,7 @@ void ilk_fdi_disable(struct intel_crtc *crtc) reg =FDI_RX_CTL (pipe); temp =intel_de_read (dev_priv, reg); temp &= ~(0x7 <<16 ); - temp |= (intel_de_read (dev_priv,TRANSCONF (pipe)) &TRANSCONF_BPC_MASK ) <<11 ; + temp |= (intel_de_read (dev_priv,TRANSCONF (dev_priv, pipe)) &TRANSCONF_BPC_MASK ) <<11 ;intel_de_write (dev_priv, reg, temp & ~FDI_RX_ENABLE );intel_de_posting_read (dev_priv, reg);@@ -1116,7 +1116,7 @@ void ilk_fdi_disable(struct intel_crtc *crtc) }/* BPC in FDI rx is consistent with that in TRANSCONF */ temp &= ~(0x07 <<16 ); - temp |= (intel_de_read (dev_priv,TRANSCONF (pipe)) &TRANSCONF_BPC_MASK ) <<11 ; + temp |= (intel_de_read (dev_priv,TRANSCONF (dev_priv, pipe)) &TRANSCONF_BPC_MASK ) <<11 ;intel_de_write (dev_priv, reg, temp);intel_de_posting_read (dev_priv, reg);drivers/gpu/drm/i915/display/intel_pch_display.c +4
-3@@ -271,7 +271,7 @@ static void ilk_enable_pch_transcoder(const struct intel_crtc_state *crtc_state) reg =PCH_TRANSCONF (pipe); val =intel_de_read (dev_priv, reg); - pipeconf_val =intel_de_read (dev_priv,TRANSCONF (pipe)); + pipeconf_val =intel_de_read (dev_priv,TRANSCONF (dev_priv, pipe));if (HAS_PCH_IBX (dev_priv)) {/* Configure frame start delay to match the CPU */ @@ -413,7 +413,7 @@ void ilk_pch_enable(struct intel_atomic_state *state, intel_crtc_has_dp_encoder(crtc_state)) {const struct drm_display_mode *adjusted_mode = &crtc_state->hw.adjusted_mode; -u32 bpc = (intel_de_read (dev_priv,TRANSCONF (pipe)) &TRANSCONF_BPC_MASK ) >>5 ; +u32 bpc = (intel_de_read (dev_priv,TRANSCONF (dev_priv, pipe)) &TRANSCONF_BPC_MASK ) >>5 ;i915_reg_t reg =TRANS_DP_CTL (pipe);enum port port;@@ -557,7 +557,8 @@ static void lpt_enable_pch_transcoder(const struct intel_crtc_state *crtc_state)intel_de_write (dev_priv,TRANS_CHICKEN2 (PIPE_A ), val); val =TRANS_ENABLE ; - pipeconf_val =intel_de_read (dev_priv,TRANSCONF (cpu_transcoder)); + pipeconf_val =intel_de_read (dev_priv, +TRANSCONF (dev_priv, cpu_transcoder));if ((pipeconf_val &TRANSCONF_INTERLACE_MASK_HSW ) ==TRANSCONF_INTERLACE_IF_ID_ILK ) val |=TRANS_INTERLACE_INTERLACED ;drivers/gpu/drm/i915/display/vlv_dsi.c +2
-1@@ -972,7 +972,8 @@ static bool intel_dsi_get_hw_state(struct intel_encoder *encoder,*/ if ((IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv)) && port ==PORT_C ) - enabled =intel_de_read (display,TRANSCONF (PIPE_B )) &TRANSCONF_ENABLE ; + enabled =intel_de_read (display, +TRANSCONF (dev_priv,PIPE_B )) &TRANSCONF_ENABLE ;/* Try command mode if video mode not enabled */ if (!enabled) {drivers/gpu/drm/i915/gvt/display.c +6
-6@@ -67,7 +67,7 @@ static int edp_pipe_is_enabled(struct intel_vgpu *vgpu) {struct drm_i915_private *dev_priv = vgpu->gvt->gt->i915; -if (!(vgpu_vreg_t (vgpu,TRANSCONF (TRANSCODER_EDP )) &TRANSCONF_ENABLE )) +if (!(vgpu_vreg_t (vgpu,TRANSCONF (dev_priv,TRANSCODER_EDP )) &TRANSCONF_ENABLE ))return 0 ;if (!(vgpu_vreg (vgpu, _TRANS_DDI_FUNC_CTL_EDP) &TRANS_DDI_FUNC_ENABLE ))@@ -83,7 +83,7 @@ int pipe_is_enabled(struct intel_vgpu *vgpu, int pipe) pipe < PIPE_A || pipe >= I915_MAX_PIPES))return -EINVAL ; -if (vgpu_vreg_t (vgpu,TRANSCONF (pipe)) &TRANSCONF_ENABLE ) +if (vgpu_vreg_t (vgpu,TRANSCONF (dev_priv, pipe)) &TRANSCONF_ENABLE )return 1 ; if (edp_pipe_is_enabled(vgpu) &&@@ -191,7 +191,7 @@ static void emulate_monitor_status_change(struct intel_vgpu *vgpu) GEN8_DE_PORT_HOTPLUG(HPD_PORT_C));for_each_pipe (dev_priv, pipe) { -vgpu_vreg_t (vgpu,TRANSCONF (pipe)) &= +vgpu_vreg_t (vgpu,TRANSCONF (dev_priv, pipe)) &= ~(TRANSCONF_ENABLE |TRANSCONF_STATE_ENABLE );vgpu_vreg_t (vgpu,DSPCNTR (dev_priv, pipe)) &= ~DISP_ENABLE ;vgpu_vreg_t (vgpu,SPRCTL (pipe)) &= ~SPRITE_ENABLE ;@@ -252,8 +252,8 @@ static void emulate_monitor_status_change(struct intel_vgpu *vgpu)* TRANSCODER_A can be enabled. PORT_x depends on the input of * setup_virtual_dp_monitor. */ -vgpu_vreg_t (vgpu,TRANSCONF (TRANSCODER_A )) |=TRANSCONF_ENABLE ; -vgpu_vreg_t (vgpu,TRANSCONF (TRANSCODER_A )) |=TRANSCONF_STATE_ENABLE ; +vgpu_vreg_t (vgpu,TRANSCONF (dev_priv,TRANSCODER_A )) |=TRANSCONF_ENABLE ; +vgpu_vreg_t (vgpu,TRANSCONF (dev_priv,TRANSCODER_A )) |=TRANSCONF_STATE_ENABLE ;/* * Golden M/N are calculated based on: @@ -510,7 +510,7 @@ static void emulate_monitor_status_change(struct intel_vgpu *vgpu)vgpu_vreg_t (vgpu,CURCNTR (dev_priv, pipe)) |=MCURSOR_MODE_DISABLE ; } -vgpu_vreg_t (vgpu,TRANSCONF (TRANSCODER_A )) |=TRANSCONF_ENABLE ; +vgpu_vreg_t (vgpu,TRANSCONF (dev_priv,TRANSCODER_A )) |=TRANSCONF_ENABLE ; }static void clean_virtual_dp_monitor (struct intel_vgpu *vgpu,int port_num)drivers/gpu/drm/i915/gvt/handlers.c +8
-4@@ -2270,10 +2270,14 @@ static int init_generic_mmio_info(struct intel_gvt *gvt)MMIO_DFH (GEN7_HALF_SLICE_CHICKEN1 ,D_ALL ,F_MODE_MASK |F_CMD_ACCESS ,NULL ,NULL );/* display */ -MMIO_DH (TRANSCONF (TRANSCODER_A ),D_ALL ,NULL , pipeconf_mmio_write); -MMIO_DH (TRANSCONF (TRANSCODER_B ),D_ALL ,NULL , pipeconf_mmio_write); -MMIO_DH (TRANSCONF (TRANSCODER_C ),D_ALL ,NULL , pipeconf_mmio_write); -MMIO_DH (TRANSCONF (TRANSCODER_EDP ),D_ALL ,NULL , pipeconf_mmio_write); +MMIO_DH (TRANSCONF (dev_priv,TRANSCODER_A ),D_ALL ,NULL , + pipeconf_mmio_write); +MMIO_DH (TRANSCONF (dev_priv,TRANSCODER_B ),D_ALL ,NULL , + pipeconf_mmio_write); +MMIO_DH (TRANSCONF (dev_priv,TRANSCODER_C ),D_ALL ,NULL , + pipeconf_mmio_write); +MMIO_DH (TRANSCONF (dev_priv,TRANSCODER_EDP ),D_ALL ,NULL , + pipeconf_mmio_write);MMIO_DH (DSPSURF (dev_priv,PIPE_A ),D_ALL ,NULL , pri_surf_mmio_write);MMIO_DH (REG_50080 (PIPE_A ,PLANE_PRIMARY ),D_ALL ,NULL , reg50080_mmio_write);drivers/gpu/drm/i915/i915_reg.h +1
-1@@ -1876,7 +1876,7 @@#define PIPESTAT_INT_ENABLE_MASK 0x7fff0000#define PIPESTAT_INT_STATUS_MASK 0x0000ffff -#define TRANSCONF (trans) _MMIO_PIPE2(dev_priv, (trans), _TRANSACONF) +#define TRANSCONF (dev_priv, trans) _MMIO_PIPE2(dev_priv, (trans), _TRANSACONF)#define PIPEDSL (pipe) _MMIO_PIPE2(dev_priv, pipe, _PIPEADSL)#define PIPEFRAME (pipe) _MMIO_PIPE2(dev_priv, pipe, _PIPEAFRAMEHIGH)#define PIPEFRAMEPIXEL (pipe) _MMIO_PIPE2(dev_priv, pipe, _PIPEAFRAMEPIXEL)drivers/gpu/drm/i915/intel_gvt_mmio_table.c +4
-4@@ -130,10 +130,10 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (PIPEDSL (PIPE_B ));MMIO_D (PIPEDSL (PIPE_C ));MMIO_D (PIPEDSL (_PIPE_EDP)); -MMIO_D (TRANSCONF (TRANSCODER_A )); -MMIO_D (TRANSCONF (TRANSCODER_B )); -MMIO_D (TRANSCONF (TRANSCODER_C )); -MMIO_D (TRANSCONF (TRANSCODER_EDP )); +MMIO_D (TRANSCONF (dev_priv,TRANSCODER_A )); +MMIO_D (TRANSCONF (dev_priv,TRANSCODER_B )); +MMIO_D (TRANSCONF (dev_priv,TRANSCODER_C )); +MMIO_D (TRANSCONF (dev_priv,TRANSCODER_EDP ));MMIO_D (PIPESTAT (PIPE_A ));MMIO_D (PIPESTAT (PIPE_B ));MMIO_D (PIPESTAT (PIPE_C ));Signature · 1 line
2.39.2
PATCH 19/65 drm/i915: pass dev_priv explicitly to PIPEDSL
In reply to Jani NikulaAvoid the implicit dev_priv local variable use, and pass dev_priv explicitly to the PIPEDSL register macro.
--- drivers/gpu/drm/i915/display/intel_crt.c | 6 +++--- drivers/gpu/drm/i915/display/intel_hdmi.c | 3 ++- drivers/gpu/drm/i915/display/intel_vblank.c | 7 ++++--- drivers/gpu/drm/i915/i915_reg.h | 2 +- drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 8 ++++---- 5 files changed, 14 insertions(+), 12 deletions(-)
drivers/gpu/drm/i915/display/intel_crt.c +3 -3
@@ -771,9 +771,9 @@ intel_crt_load_detect(struct intel_crt *crt, enum pipe pipe)/* * Wait for the border to be displayed */ -while (intel_de_read (dev_priv,PIPEDSL (pipe)) >= vactive) +while (intel_de_read (dev_priv,PIPEDSL (dev_priv, pipe)) >= vactive) ; -while ((dsl =intel_de_read (dev_priv,PIPEDSL (pipe))) <= vsample) +while ((dsl =intel_de_read (dev_priv,PIPEDSL (dev_priv, pipe))) <= vsample) ;/* * Watch ST00 for an entire scanline
@@ -786,7 +786,7 @@ intel_crt_load_detect(struct intel_crt *crt, enum pipe pipe) st00 =intel_de_read8 (dev_priv, _VGA_MSR_WRITE);if (st00 & (1 <<4 )) detect++; - }while ((intel_de_read (dev_priv,PIPEDSL (pipe)) == dsl)); + }while ((intel_de_read (dev_priv,PIPEDSL (dev_priv, pipe)) == dsl));/* restore vblank if necessary */ if (restore_vblank)
drivers/gpu/drm/i915/display/intel_hdmi.c +2 -1
@@ -1476,7 +1476,8 @@ static int kbl_repositioning_enc_en_signal(struct intel_connector *connector,int ret;for (;;) { - scanline =intel_de_read (dev_priv,PIPEDSL (crtc->pipe)); + scanline =intel_de_read (dev_priv, +PIPEDSL (dev_priv, crtc->pipe));if (scanline >100 && scanline <200 )break ;usleep_range (25 ,50 );
drivers/gpu/drm/i915/display/intel_vblank.c +4 -3
@@ -247,7 +247,7 @@ static int __intel_get_crtc_scanline(struct intel_crtc *crtc) vtotal =intel_mode_vtotal (mode); - position =intel_de_read_fw (dev_priv,PIPEDSL (pipe)) &PIPEDSL_LINE_MASK ; + position =intel_de_read_fw (dev_priv,PIPEDSL (dev_priv, pipe)) &PIPEDSL_LINE_MASK ;/* * On HSW, the DSL reg (0x70000) appears to return 0 if we
@@ -266,7 +266,8 @@ static int __intel_get_crtc_scanline(struct intel_crtc *crtc)for (i =0 ; i <100 ; i++) {udelay (1 ); - temp =intel_de_read_fw (dev_priv,PIPEDSL (pipe)) &PIPEDSL_LINE_MASK ; + temp =intel_de_read_fw (dev_priv, +PIPEDSL (dev_priv, pipe)) &PIPEDSL_LINE_MASK ;if (temp != position) { position = temp;break ;
@@ -473,7 +474,7 @@ int intel_get_crtc_scanline(struct intel_crtc *crtc)static bool pipe_scanline_is_moving (struct drm_i915_private *dev_priv,enum pipe pipe) { -i915_reg_t reg =PIPEDSL (pipe); +i915_reg_t reg =PIPEDSL (dev_priv, pipe);u32 line1, line2; line1 =intel_de_read (dev_priv, reg) &PIPEDSL_LINE_MASK ;
drivers/gpu/drm/i915/i915_reg.h +1 -1
@@ -1877,7 +1877,7 @@#define PIPESTAT_INT_STATUS_MASK 0x0000ffff#define TRANSCONF (dev_priv, trans) _MMIO_PIPE2(dev_priv, (trans), _TRANSACONF) -#define PIPEDSL (pipe) _MMIO_PIPE2(dev_priv, pipe, _PIPEADSL) +#define PIPEDSL (dev_priv, pipe) _MMIO_PIPE2(dev_priv, pipe, _PIPEADSL)#define PIPEFRAME (pipe) _MMIO_PIPE2(dev_priv, pipe, _PIPEAFRAMEHIGH)#define PIPEFRAMEPIXEL (pipe) _MMIO_PIPE2(dev_priv, pipe, _PIPEAFRAMEPIXEL)#define PIPESTAT (pipe) _MMIO_PIPE2(dev_priv, pipe, _PIPEASTAT)
drivers/gpu/drm/i915/intel_gvt_mmio_table.c +4 -4
@@ -126,10 +126,10 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (_MMIO (0x650b4 ));MMIO_D (_MMIO (0xc4040 ));MMIO_D (DERRMR ); -MMIO_D (PIPEDSL (PIPE_A )); -MMIO_D (PIPEDSL (PIPE_B )); -MMIO_D (PIPEDSL (PIPE_C )); -MMIO_D (PIPEDSL (_PIPE_EDP)); +MMIO_D (PIPEDSL (dev_priv,PIPE_A )); +MMIO_D (PIPEDSL (dev_priv,PIPE_B )); +MMIO_D (PIPEDSL (dev_priv,PIPE_C )); +MMIO_D (PIPEDSL (dev_priv, _PIPE_EDP));MMIO_D (TRANSCONF (dev_priv,TRANSCODER_A ));MMIO_D (TRANSCONF (dev_priv,TRANSCODER_B ));MMIO_D (TRANSCONF (dev_priv,TRANSCODER_C ));
Signature · 1 line
2.39.2
Re: [PATCH 19/65] drm/i915: pass dev_priv explicitly to PIPEDSL
Quoted 2 lines · Jani Nikula
Avoid the implicit
dev_privlocal variable use, and passdev_privexplicitly to the PIPEDSL register macro.
Quoted 116 lines
Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/display/intel_crt.c | 6 +++--- drivers/gpu/drm/i915/display/intel_hdmi.c | 3 ++- drivers/gpu/drm/i915/display/intel_vblank.c | 7 ++++--- drivers/gpu/drm/i915/i915_reg.h | 2 +- drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 8 ++++---- 5 files changed, 14 insertions(+), 12 deletions(-)drivers/gpu/drm/i915/display/intel_crt.c +3
-3@@ -771,9 +771,9 @@ intel_crt_load_detect(struct intel_crt *crt, enum pipe pipe)/* * Wait for the border to be displayed */ -while (intel_de_read (dev_priv,PIPEDSL (pipe)) >= vactive) +while (intel_de_read (dev_priv,PIPEDSL (dev_priv, pipe)) >= vactive) ; -while ((dsl =intel_de_read (dev_priv,PIPEDSL (pipe))) <= vsample) +while ((dsl =intel_de_read (dev_priv,PIPEDSL (dev_priv, pipe))) <= vsample) ;/* * Watch ST00 for an entire scanline @@ -786,7 +786,7 @@ intel_crt_load_detect(struct intel_crt *crt, enum pipe pipe) st00 =intel_de_read8 (dev_priv, _VGA_MSR_WRITE);if (st00 & (1 <<4 )) detect++; - }while ((intel_de_read (dev_priv,PIPEDSL (pipe)) == dsl)); + }while ((intel_de_read (dev_priv,PIPEDSL (dev_priv, pipe)) == dsl));/* restore vblank if necessary */ if (restore_vblank)drivers/gpu/drm/i915/display/intel_hdmi.c +2
-1@@ -1476,7 +1476,8 @@ static int kbl_repositioning_enc_en_signal(struct intel_connector *connector,int ret;for (;;) { - scanline =intel_de_read (dev_priv,PIPEDSL (crtc->pipe)); + scanline =intel_de_read (dev_priv, +PIPEDSL (dev_priv, crtc->pipe));if (scanline >100 && scanline <200 )break ;usleep_range (25 ,50 );drivers/gpu/drm/i915/display/intel_vblank.c +4
-3@@ -247,7 +247,7 @@ static int __intel_get_crtc_scanline(struct intel_crtc *crtc) vtotal =intel_mode_vtotal (mode); - position =intel_de_read_fw (dev_priv,PIPEDSL (pipe)) &PIPEDSL_LINE_MASK ; + position =intel_de_read_fw (dev_priv,PIPEDSL (dev_priv, pipe)) &PIPEDSL_LINE_MASK ;/* * On HSW, the DSL reg (0x70000) appears to return 0 if we @@ -266,7 +266,8 @@ static int __intel_get_crtc_scanline(struct intel_crtc *crtc)for (i =0 ; i <100 ; i++) {udelay (1 ); - temp =intel_de_read_fw (dev_priv,PIPEDSL (pipe)) &PIPEDSL_LINE_MASK ; + temp =intel_de_read_fw (dev_priv, +PIPEDSL (dev_priv, pipe)) &PIPEDSL_LINE_MASK ;if (temp != position) { position = temp;break ;@@ -473,7 +474,7 @@ int intel_get_crtc_scanline(struct intel_crtc *crtc)static bool pipe_scanline_is_moving (struct drm_i915_private *dev_priv,enum pipe pipe) { -i915_reg_t reg =PIPEDSL (pipe); +i915_reg_t reg =PIPEDSL (dev_priv, pipe);u32 line1, line2; line1 =intel_de_read (dev_priv, reg) &PIPEDSL_LINE_MASK ;drivers/gpu/drm/i915/i915_reg.h +1
-1@@ -1877,7 +1877,7 @@#define PIPESTAT_INT_STATUS_MASK 0x0000ffff#define TRANSCONF (dev_priv, trans) _MMIO_PIPE2(dev_priv, (trans), _TRANSACONF) -#define PIPEDSL (pipe) _MMIO_PIPE2(dev_priv, pipe, _PIPEADSL) +#define PIPEDSL (dev_priv, pipe) _MMIO_PIPE2(dev_priv, pipe, _PIPEADSL)#define PIPEFRAME (pipe) _MMIO_PIPE2(dev_priv, pipe, _PIPEAFRAMEHIGH)#define PIPEFRAMEPIXEL (pipe) _MMIO_PIPE2(dev_priv, pipe, _PIPEAFRAMEPIXEL)#define PIPESTAT (pipe) _MMIO_PIPE2(dev_priv, pipe, _PIPEASTAT)drivers/gpu/drm/i915/intel_gvt_mmio_table.c +4
-4@@ -126,10 +126,10 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (_MMIO (0x650b4 ));MMIO_D (_MMIO (0xc4040 ));MMIO_D (DERRMR ); -MMIO_D (PIPEDSL (PIPE_A )); -MMIO_D (PIPEDSL (PIPE_B )); -MMIO_D (PIPEDSL (PIPE_C )); -MMIO_D (PIPEDSL (_PIPE_EDP)); +MMIO_D (PIPEDSL (dev_priv,PIPE_A )); +MMIO_D (PIPEDSL (dev_priv,PIPE_B )); +MMIO_D (PIPEDSL (dev_priv,PIPE_C )); +MMIO_D (PIPEDSL (dev_priv, _PIPE_EDP));MMIO_D (TRANSCONF (dev_priv,TRANSCODER_A ));MMIO_D (TRANSCONF (dev_priv,TRANSCODER_B ));MMIO_D (TRANSCONF (dev_priv,TRANSCODER_C ));Signature · 1 line
2.39.2
PATCH 20/65 drm/i915: pass dev_priv explicitly to PIPEFRAME
In reply to Jani NikulaAvoid the implicit dev_priv local variable use, and pass dev_priv explicitly to the PIPEFRAME register macro.
--- drivers/gpu/drm/i915/display/intel_vblank.c | 3 ++- drivers/gpu/drm/i915/i915_reg.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/display/intel_vblank.c +2 -1
@@ -102,7 +102,8 @@ u32 i915_get_vblank_counter(struct drm_crtc *crtc)* we get a low value that's stable across two reads of the high * register. */ - frame =intel_de_read64_2x32 (dev_priv,PIPEFRAMEPIXEL (pipe),PIPEFRAME (pipe)); + frame =intel_de_read64_2x32 (dev_priv,PIPEFRAMEPIXEL (pipe), +PIPEFRAME (dev_priv, pipe)); pixel = frame &PIPE_PIXEL_MASK ; frame = (frame >>PIPE_FRAME_LOW_SHIFT ) &0xffffff ;
drivers/gpu/drm/i915/i915_reg.h +1 -1
@@ -1878,7 +1878,7 @@#define TRANSCONF (dev_priv, trans) _MMIO_PIPE2(dev_priv, (trans), _TRANSACONF)#define PIPEDSL (dev_priv, pipe) _MMIO_PIPE2(dev_priv, pipe, _PIPEADSL) -#define PIPEFRAME (pipe) _MMIO_PIPE2(dev_priv, pipe, _PIPEAFRAMEHIGH) +#define PIPEFRAME (dev_priv, pipe) _MMIO_PIPE2(dev_priv, pipe, _PIPEAFRAMEHIGH)#define PIPEFRAMEPIXEL (pipe) _MMIO_PIPE2(dev_priv, pipe, _PIPEAFRAMEPIXEL)#define PIPESTAT (pipe) _MMIO_PIPE2(dev_priv, pipe, _PIPEASTAT)
Signature · 1 line
2.39.2
Re: [PATCH 20/65] drm/i915: pass dev_priv explicitly to PIPEFRAME
Quoted 2 lines · Jani Nikula
Avoid the implicit
dev_privlocal variable use, and passdev_privexplicitly to the PIPEFRAME register macro.
Quoted 37 lines
Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/display/intel_vblank.c | 3 ++- drivers/gpu/drm/i915/i915_reg.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/display/intel_vblank.c +2
-1@@ -102,7 +102,8 @@ u32 i915_get_vblank_counter(struct drm_crtc *crtc)* we get a low value that's stable across two reads of the high * register. */ - frame =intel_de_read64_2x32 (dev_priv,PIPEFRAMEPIXEL (pipe),PIPEFRAME (pipe)); + frame =intel_de_read64_2x32 (dev_priv,PIPEFRAMEPIXEL (pipe), +PIPEFRAME (dev_priv, pipe)); pixel = frame &PIPE_PIXEL_MASK ; frame = (frame >>PIPE_FRAME_LOW_SHIFT ) &0xffffff ;drivers/gpu/drm/i915/i915_reg.h +1
-1@@ -1878,7 +1878,7 @@#define TRANSCONF (dev_priv, trans) _MMIO_PIPE2(dev_priv, (trans), _TRANSACONF)#define PIPEDSL (dev_priv, pipe) _MMIO_PIPE2(dev_priv, pipe, _PIPEADSL) -#define PIPEFRAME (pipe) _MMIO_PIPE2(dev_priv, pipe, _PIPEAFRAMEHIGH) +#define PIPEFRAME (dev_priv, pipe) _MMIO_PIPE2(dev_priv, pipe, _PIPEAFRAMEHIGH)#define PIPEFRAMEPIXEL (pipe) _MMIO_PIPE2(dev_priv, pipe, _PIPEAFRAMEPIXEL)#define PIPESTAT (pipe) _MMIO_PIPE2(dev_priv, pipe, _PIPEASTAT)Signature · 1 line
2.39.2
PATCH 21/65 drm/i915: pass dev_priv explicitly to PIPEFRAMEPIXEL
In reply to Jani NikulaAvoid the implicit dev_priv local variable use, and pass dev_priv explicitly to the PIPEFRAMEPIXEL register macro.
--- drivers/gpu/drm/i915/display/intel_vblank.c | 4 ++-- drivers/gpu/drm/i915/i915_reg.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/display/intel_vblank.c +2 -2
@@ -102,7 +102,7 @@ u32 i915_get_vblank_counter(struct drm_crtc *crtc)* we get a low value that's stable across two reads of the high * register. */ - frame =intel_de_read64_2x32 (dev_priv,PIPEFRAMEPIXEL (pipe), + frame =intel_de_read64_2x32 (dev_priv,PIPEFRAMEPIXEL (dev_priv, pipe),PIPEFRAME (dev_priv, pipe)); pixel = frame &PIPE_PIXEL_MASK ;
@@ -386,7 +386,7 @@ static bool i915_get_crtc_scanoutpos(struct drm_crtc *_crtc,* We can split this into vertical and horizontal * scanout position. */ - position = (intel_de_read_fw (dev_priv,PIPEFRAMEPIXEL (pipe)) &PIPE_PIXEL_MASK ) >>PIPE_PIXEL_SHIFT ; + position = (intel_de_read_fw (dev_priv,PIPEFRAMEPIXEL (dev_priv, pipe)) &PIPE_PIXEL_MASK ) >>PIPE_PIXEL_SHIFT ;/* convert to pixel counts */ vbl_start *= htotal;
drivers/gpu/drm/i915/i915_reg.h +1 -1
@@ -1879,7 +1879,7 @@#define TRANSCONF (dev_priv, trans) _MMIO_PIPE2(dev_priv, (trans), _TRANSACONF)#define PIPEDSL (dev_priv, pipe) _MMIO_PIPE2(dev_priv, pipe, _PIPEADSL)#define PIPEFRAME (dev_priv, pipe) _MMIO_PIPE2(dev_priv, pipe, _PIPEAFRAMEHIGH) -#define PIPEFRAMEPIXEL (pipe) _MMIO_PIPE2(dev_priv, pipe, _PIPEAFRAMEPIXEL) +#define PIPEFRAMEPIXEL (dev_priv, pipe) _MMIO_PIPE2(dev_priv, pipe, _PIPEAFRAMEPIXEL)#define PIPESTAT (pipe) _MMIO_PIPE2(dev_priv, pipe, _PIPEASTAT)#define _PIPE_ARB_CTL_A 0x70028/* icl+ */
Signature · 1 line
2.39.2
Re: [PATCH 21/65] drm/i915: pass dev_priv explicitly to PIPEFRAMEPIXEL
Quoted 2 lines · Jani Nikula
Avoid the implicit
dev_privlocal variable use, and passdev_privexplicitly to the PIPEFRAMEPIXEL register macro.
Quoted 45 lines
Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/display/intel_vblank.c | 4 ++-- drivers/gpu/drm/i915/i915_reg.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)drivers/gpu/drm/i915/display/intel_vblank.c +2
-2@@ -102,7 +102,7 @@ u32 i915_get_vblank_counter(struct drm_crtc *crtc)* we get a low value that's stable across two reads of the high * register. */ - frame =intel_de_read64_2x32 (dev_priv,PIPEFRAMEPIXEL (pipe), + frame =intel_de_read64_2x32 (dev_priv,PIPEFRAMEPIXEL (dev_priv, pipe),PIPEFRAME (dev_priv, pipe)); pixel = frame &PIPE_PIXEL_MASK ;@@ -386,7 +386,7 @@ static bool i915_get_crtc_scanoutpos(struct drm_crtc *_crtc,* We can split this into vertical and horizontal * scanout position. */ - position = (intel_de_read_fw (dev_priv,PIPEFRAMEPIXEL (pipe)) &PIPE_PIXEL_MASK ) >>PIPE_PIXEL_SHIFT ; + position = (intel_de_read_fw (dev_priv,PIPEFRAMEPIXEL (dev_priv, pipe)) &PIPE_PIXEL_MASK ) >>PIPE_PIXEL_SHIFT ;/* convert to pixel counts */ vbl_start *= htotal;drivers/gpu/drm/i915/i915_reg.h +1
-1@@ -1879,7 +1879,7 @@#define TRANSCONF (dev_priv, trans) _MMIO_PIPE2(dev_priv, (trans), _TRANSACONF)#define PIPEDSL (dev_priv, pipe) _MMIO_PIPE2(dev_priv, pipe, _PIPEADSL)#define PIPEFRAME (dev_priv, pipe) _MMIO_PIPE2(dev_priv, pipe, _PIPEAFRAMEHIGH) -#define PIPEFRAMEPIXEL (pipe) _MMIO_PIPE2(dev_priv, pipe, _PIPEAFRAMEPIXEL) +#define PIPEFRAMEPIXEL (dev_priv, pipe) _MMIO_PIPE2(dev_priv, pipe, _PIPEAFRAMEPIXEL)#define PIPESTAT (pipe) _MMIO_PIPE2(dev_priv, pipe, _PIPEASTAT)#define _PIPE_ARB_CTL_A 0x70028/* icl+ */ Signature · 1 line
2.39.2
PATCH 22/65 drm/i915: pass dev_priv explicitly to PIPESTAT
In reply to Jani NikulaAvoid the implicit dev_priv local variable use, and pass dev_priv explicitly to the PIPESTAT register macro.
--- drivers/gpu/drm/i915/display/intel_display_irq.c | 9 +++++---- drivers/gpu/drm/i915/display/intel_fifo_underrun.c | 4 ++-- drivers/gpu/drm/i915/i915_reg.h | 2 +- drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 8 ++++---- 4 files changed, 12 insertions(+), 11 deletions(-)
drivers/gpu/drm/i915/display/intel_display_irq.c +5 -4
@@ -224,7 +224,7 @@ u32 i915_pipestat_enable_mask(struct drm_i915_private *dev_priv,void i915_enable_pipestat (struct drm_i915_private *dev_priv,enum pipe pipe,u32 status_mask) { -i915_reg_t reg =PIPESTAT (pipe); +i915_reg_t reg =PIPESTAT (dev_priv, pipe);u32 enable_mask; drm_WARN_ONCE(&dev_priv->drm, status_mask & ~PIPESTAT_INT_STATUS_MASK,
@@ -247,7 +247,7 @@ void i915_enable_pipestat(struct drm_i915_private *dev_priv,void i915_disable_pipestat (struct drm_i915_private *dev_priv,enum pipe pipe,u32 status_mask) { -i915_reg_t reg =PIPESTAT (pipe); +i915_reg_t reg =PIPESTAT (dev_priv, pipe);u32 enable_mask; drm_WARN_ONCE(&dev_priv->drm, status_mask & ~PIPESTAT_INT_STATUS_MASK,
@@ -400,7 +400,8 @@ void i9xx_pipestat_irq_reset(struct drm_i915_private *dev_priv)enum pipe pipe;for_each_pipe (dev_priv, pipe) { -intel_uncore_write (&dev_priv->uncore,PIPESTAT (pipe), +intel_uncore_write (&dev_priv->uncore, +PIPESTAT (dev_priv, pipe),PIPESTAT_INT_STATUS_MASK |PIPE_FIFO_UNDERRUN_STATUS );
@@ -453,7 +454,7 @@ void i9xx_pipestat_irq_ack(struct drm_i915_private *dev_priv,if (!status_mask)continue ; - reg =PIPESTAT (pipe); + reg =PIPESTAT (dev_priv, pipe); pipe_stats[pipe] =intel_uncore_read (&dev_priv->uncore, reg) & status_mask; enable_mask =i915_pipestat_enable_mask (dev_priv, pipe);
drivers/gpu/drm/i915/display/intel_fifo_underrun.c +2 -2
@@ -94,7 +94,7 @@ static bool cpt_can_enable_serr_int(struct drm_device *dev)static void i9xx_check_fifo_underruns (struct intel_crtc *crtc) {struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); -i915_reg_t reg =PIPESTAT (crtc->pipe); +i915_reg_t reg =PIPESTAT (dev_priv, crtc->pipe);u32 enable_mask;lockdep_assert_held (&dev_priv->irq_lock);
@@ -115,7 +115,7 @@ static void i9xx_set_fifo_underrun_reporting(struct drm_device *dev, bool enable, bool old) {struct drm_i915_private *dev_priv =to_i915 (dev); -i915_reg_t reg =PIPESTAT (pipe); +i915_reg_t reg =PIPESTAT (dev_priv, pipe);lockdep_assert_held (&dev_priv->irq_lock);
drivers/gpu/drm/i915/i915_reg.h +1 -1
@@ -1880,7 +1880,7 @@#define PIPEDSL (dev_priv, pipe) _MMIO_PIPE2(dev_priv, pipe, _PIPEADSL)#define PIPEFRAME (dev_priv, pipe) _MMIO_PIPE2(dev_priv, pipe, _PIPEAFRAMEHIGH)#define PIPEFRAMEPIXEL (dev_priv, pipe) _MMIO_PIPE2(dev_priv, pipe, _PIPEAFRAMEPIXEL) -#define PIPESTAT (pipe) _MMIO_PIPE2(dev_priv, pipe, _PIPEASTAT) +#define PIPESTAT (dev_priv, pipe) _MMIO_PIPE2(dev_priv, pipe, _PIPEASTAT)#define _PIPE_ARB_CTL_A 0x70028/* icl+ */ #define PIPE_ARB_CTL (pipe) _MMIO_PIPE2(dev_priv, pipe, _PIPE_ARB_CTL_A)
drivers/gpu/drm/i915/intel_gvt_mmio_table.c +4 -4
@@ -134,10 +134,10 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (TRANSCONF (dev_priv,TRANSCODER_B ));MMIO_D (TRANSCONF (dev_priv,TRANSCODER_C ));MMIO_D (TRANSCONF (dev_priv,TRANSCODER_EDP )); -MMIO_D (PIPESTAT (PIPE_A )); -MMIO_D (PIPESTAT (PIPE_B )); -MMIO_D (PIPESTAT (PIPE_C )); -MMIO_D (PIPESTAT (_PIPE_EDP)); +MMIO_D (PIPESTAT (dev_priv,PIPE_A )); +MMIO_D (PIPESTAT (dev_priv,PIPE_B )); +MMIO_D (PIPESTAT (dev_priv,PIPE_C )); +MMIO_D (PIPESTAT (dev_priv, _PIPE_EDP));MMIO_D (PIPE_FLIPCOUNT_G4X (PIPE_A ));MMIO_D (PIPE_FLIPCOUNT_G4X (PIPE_B ));MMIO_D (PIPE_FLIPCOUNT_G4X (PIPE_C ));
Signature · 1 line
2.39.2
Re: [PATCH 22/65] drm/i915: pass dev_priv explicitly to PIPESTAT
Quoted 2 lines · Jani Nikula
Avoid the implicit
dev_privlocal variable use, and passdev_privexplicitly to the PIPESTAT register macro.
Quoted 107 lines
Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/display/intel_display_irq.c | 9 +++++---- drivers/gpu/drm/i915/display/intel_fifo_underrun.c | 4 ++-- drivers/gpu/drm/i915/i915_reg.h | 2 +- drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 8 ++++---- 4 files changed, 12 insertions(+), 11 deletions(-)drivers/gpu/drm/i915/display/intel_display_irq.c +5
-4@@ -224,7 +224,7 @@ u32 i915_pipestat_enable_mask(struct drm_i915_private *dev_priv,void i915_enable_pipestat (struct drm_i915_private *dev_priv,enum pipe pipe,u32 status_mask) { -i915_reg_t reg =PIPESTAT (pipe); +i915_reg_t reg =PIPESTAT (dev_priv, pipe);u32 enable_mask; drm_WARN_ONCE(&dev_priv->drm, status_mask & ~PIPESTAT_INT_STATUS_MASK,@@ -247,7 +247,7 @@ void i915_enable_pipestat(struct drm_i915_private *dev_priv,void i915_disable_pipestat (struct drm_i915_private *dev_priv,enum pipe pipe,u32 status_mask) { -i915_reg_t reg =PIPESTAT (pipe); +i915_reg_t reg =PIPESTAT (dev_priv, pipe);u32 enable_mask; drm_WARN_ONCE(&dev_priv->drm, status_mask & ~PIPESTAT_INT_STATUS_MASK,@@ -400,7 +400,8 @@ void i9xx_pipestat_irq_reset(struct drm_i915_private *dev_priv)enum pipe pipe;for_each_pipe (dev_priv, pipe) { -intel_uncore_write (&dev_priv->uncore,PIPESTAT (pipe), +intel_uncore_write (&dev_priv->uncore, +PIPESTAT (dev_priv, pipe),PIPESTAT_INT_STATUS_MASK |PIPE_FIFO_UNDERRUN_STATUS );@@ -453,7 +454,7 @@ void i9xx_pipestat_irq_ack(struct drm_i915_private *dev_priv,if (!status_mask)continue ; - reg =PIPESTAT (pipe); + reg =PIPESTAT (dev_priv, pipe); pipe_stats[pipe] =intel_uncore_read (&dev_priv->uncore, reg) & status_mask; enable_mask =i915_pipestat_enable_mask (dev_priv, pipe);drivers/gpu/drm/i915/display/intel_fifo_underrun.c +2
-2@@ -94,7 +94,7 @@ static bool cpt_can_enable_serr_int(struct drm_device *dev)static void i9xx_check_fifo_underruns (struct intel_crtc *crtc) {struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); -i915_reg_t reg =PIPESTAT (crtc->pipe); +i915_reg_t reg =PIPESTAT (dev_priv, crtc->pipe);u32 enable_mask;lockdep_assert_held (&dev_priv->irq_lock);@@ -115,7 +115,7 @@ static void i9xx_set_fifo_underrun_reporting(struct drm_device *dev, bool enable, bool old) {struct drm_i915_private *dev_priv =to_i915 (dev); -i915_reg_t reg =PIPESTAT (pipe); +i915_reg_t reg =PIPESTAT (dev_priv, pipe);lockdep_assert_held (&dev_priv->irq_lock);drivers/gpu/drm/i915/i915_reg.h +1
-1@@ -1880,7 +1880,7 @@#define PIPEDSL (dev_priv, pipe) _MMIO_PIPE2(dev_priv, pipe, _PIPEADSL)#define PIPEFRAME (dev_priv, pipe) _MMIO_PIPE2(dev_priv, pipe, _PIPEAFRAMEHIGH)#define PIPEFRAMEPIXEL (dev_priv, pipe) _MMIO_PIPE2(dev_priv, pipe, _PIPEAFRAMEPIXEL) -#define PIPESTAT (pipe) _MMIO_PIPE2(dev_priv, pipe, _PIPEASTAT) +#define PIPESTAT (dev_priv, pipe) _MMIO_PIPE2(dev_priv, pipe, _PIPEASTAT)#define _PIPE_ARB_CTL_A 0x70028/* icl+ */ #define PIPE_ARB_CTL (pipe) _MMIO_PIPE2(dev_priv, pipe, _PIPE_ARB_CTL_A)drivers/gpu/drm/i915/intel_gvt_mmio_table.c +4
-4@@ -134,10 +134,10 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (TRANSCONF (dev_priv,TRANSCODER_B ));MMIO_D (TRANSCONF (dev_priv,TRANSCODER_C ));MMIO_D (TRANSCONF (dev_priv,TRANSCODER_EDP )); -MMIO_D (PIPESTAT (PIPE_A )); -MMIO_D (PIPESTAT (PIPE_B )); -MMIO_D (PIPESTAT (PIPE_C )); -MMIO_D (PIPESTAT (_PIPE_EDP)); +MMIO_D (PIPESTAT (dev_priv,PIPE_A )); +MMIO_D (PIPESTAT (dev_priv,PIPE_B )); +MMIO_D (PIPESTAT (dev_priv,PIPE_C )); +MMIO_D (PIPESTAT (dev_priv, _PIPE_EDP));MMIO_D (PIPE_FLIPCOUNT_G4X (PIPE_A ));MMIO_D (PIPE_FLIPCOUNT_G4X (PIPE_B ));MMIO_D (PIPE_FLIPCOUNT_G4X (PIPE_C ));Signature · 1 line
2.39.2
PATCH 23/65 drm/i915: pass dev_priv explicitly to PIPE_ARB_CTL
In reply to Jani NikulaAvoid the implicit dev_priv local variable use, and pass dev_priv explicitly to the PIPE_ARB_CTL register macro.
--- drivers/gpu/drm/i915/display/intel_display.c | 2 +- drivers/gpu/drm/i915/i915_reg.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +1 -1
@@ -439,7 +439,7 @@ void intel_enable_transcoder(const struct intel_crtc_state *new_crtc_state)/* Wa_22012358565:adl-p */ if (DISPLAY_VER (dev_priv) ==13 ) -intel_de_rmw (dev_priv,PIPE_ARB_CTL (pipe), +intel_de_rmw (dev_priv,PIPE_ARB_CTL (dev_priv, pipe),0 ,PIPE_ARB_USE_PROG_SLOTS );if (DISPLAY_VER (dev_priv) >=14 ) {
drivers/gpu/drm/i915/i915_reg.h +1 -1
@@ -1883,7 +1883,7 @@#define PIPESTAT (dev_priv, pipe) _MMIO_PIPE2(dev_priv, pipe, _PIPEASTAT)#define _PIPE_ARB_CTL_A 0x70028/* icl+ */ -#define PIPE_ARB_CTL (pipe) _MMIO_PIPE2(dev_priv, pipe, _PIPE_ARB_CTL_A) +#define PIPE_ARB_CTL (dev_priv, pipe) _MMIO_PIPE2(dev_priv, pipe, _PIPE_ARB_CTL_A)#define PIPE_ARB_USE_PROG_SLOTS REG_BIT(13)#define _PIPE_MISC_A 0x70030
Signature · 1 line
2.39.2
Re: [PATCH 23/65] drm/i915: pass dev_priv explicitly to PIPE_ARB_CTL
Quoted 2 lines · Jani Nikula
Avoid the implicit
dev_privlocal variable use, and passdev_privexplicitly to thePIPE_ARB_CTLregister macro.
Quoted 36 lines
Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/display/intel_display.c | 2 +- drivers/gpu/drm/i915/i915_reg.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/display/intel_display.c +1
-1@@ -439,7 +439,7 @@ void intel_enable_transcoder(const struct intel_crtc_state *new_crtc_state)/* Wa_22012358565:adl-p */ if (DISPLAY_VER (dev_priv) ==13 ) -intel_de_rmw (dev_priv,PIPE_ARB_CTL (pipe), +intel_de_rmw (dev_priv,PIPE_ARB_CTL (dev_priv, pipe),0 ,PIPE_ARB_USE_PROG_SLOTS );if (DISPLAY_VER (dev_priv) >=14 ) {drivers/gpu/drm/i915/i915_reg.h +1
-1@@ -1883,7 +1883,7 @@#define PIPESTAT (dev_priv, pipe) _MMIO_PIPE2(dev_priv, pipe, _PIPEASTAT)#define _PIPE_ARB_CTL_A 0x70028/* icl+ */ -#define PIPE_ARB_CTL (pipe) _MMIO_PIPE2(dev_priv, pipe, _PIPE_ARB_CTL_A) +#define PIPE_ARB_CTL (dev_priv, pipe) _MMIO_PIPE2(dev_priv, pipe, _PIPE_ARB_CTL_A)#define PIPE_ARB_USE_PROG_SLOTS REG_BIT(13)#define _PIPE_MISC_A 0x70030Signature · 1 line
2.39.2
PATCH 24/65 drm/i915: pass dev_priv explicitly to ICL_PIPESTATUS
In reply to Jani NikulaAvoid the implicit dev_priv local variable use, and pass dev_priv explicitly to the ICL_PIPESTATUS register macro.
--- drivers/gpu/drm/i915/display/intel_fifo_underrun.c | 9 ++++++--- drivers/gpu/drm/i915/i915_reg.h | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/display/intel_fifo_underrun.c +6 -3
@@ -209,7 +209,8 @@ static void bdw_set_fifo_underrun_reporting(struct drm_device *dev,if (enable) {if (DISPLAY_VER (dev_priv) >=11 ) -intel_de_write (dev_priv,ICL_PIPESTATUS (pipe), +intel_de_write (dev_priv, +ICL_PIPESTATUS (dev_priv, pipe),icl_pipe_status_underrun_mask (dev_priv));bdw_enable_pipe_irq (dev_priv, pipe, mask);
@@ -418,9 +419,11 @@ void intel_cpu_fifo_underrun_irq_handler(struct drm_i915_private *dev_priv,* the underrun was caused by the downstream port. */ if (DISPLAY_VER (dev_priv) >=11 ) { - underruns =intel_de_read (dev_priv,ICL_PIPESTATUS (pipe)) & + underruns =intel_de_read (dev_priv, +ICL_PIPESTATUS (dev_priv, pipe)) &icl_pipe_status_underrun_mask (dev_priv); -intel_de_write (dev_priv,ICL_PIPESTATUS (pipe), underruns); +intel_de_write (dev_priv,ICL_PIPESTATUS (dev_priv, pipe), + underruns); }if (intel_set_cpu_fifo_underrun_reporting (dev_priv, pipe, false)) {
drivers/gpu/drm/i915/i915_reg.h +1 -1
@@ -1927,7 +1927,7 @@#define PIPE_MISC2 (pipe) _MMIO_PIPE(pipe, _PIPE_MISC2_A, _PIPE_MISC2_B)#define _ICL_PIPE_A_STATUS 0x70058 -#define ICL_PIPESTATUS (pipe) _MMIO_PIPE2(dev_priv, pipe, _ICL_PIPE_A_STATUS) +#define ICL_PIPESTATUS (dev_priv, pipe) _MMIO_PIPE2(dev_priv, pipe, _ICL_PIPE_A_STATUS)#define PIPE_STATUS_UNDERRUN REG_BIT(31)#define PIPE_STATUS_SOFT_UNDERRUN_XELPD REG_BIT(28)#define PIPE_STATUS_HARD_UNDERRUN_XELPD REG_BIT(27)
Signature · 1 line
2.39.2
Re: [PATCH 24/65] drm/i915: pass dev_priv explicitly to ICL_PIPESTATUS
Quoted 2 lines · Jani Nikula
Avoid the implicit
dev_privlocal variable use, and passdev_privexplicitly to theICL_PIPESTATUSregister macro.
Quoted 51 lines
Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/display/intel_fifo_underrun.c | 9 ++++++--- drivers/gpu/drm/i915/i915_reg.h | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-)drivers/gpu/drm/i915/display/intel_fifo_underrun.c +6
-3@@ -209,7 +209,8 @@ static void bdw_set_fifo_underrun_reporting(struct drm_device *dev,if (enable) {if (DISPLAY_VER (dev_priv) >=11 ) -intel_de_write (dev_priv,ICL_PIPESTATUS (pipe), +intel_de_write (dev_priv, +ICL_PIPESTATUS (dev_priv, pipe),icl_pipe_status_underrun_mask (dev_priv));bdw_enable_pipe_irq (dev_priv, pipe, mask);@@ -418,9 +419,11 @@ void intel_cpu_fifo_underrun_irq_handler(struct drm_i915_private *dev_priv,* the underrun was caused by the downstream port. */ if (DISPLAY_VER (dev_priv) >=11 ) { - underruns =intel_de_read (dev_priv,ICL_PIPESTATUS (pipe)) & + underruns =intel_de_read (dev_priv, +ICL_PIPESTATUS (dev_priv, pipe)) &icl_pipe_status_underrun_mask (dev_priv); -intel_de_write (dev_priv,ICL_PIPESTATUS (pipe), underruns); +intel_de_write (dev_priv,ICL_PIPESTATUS (dev_priv, pipe), + underruns); }if (intel_set_cpu_fifo_underrun_reporting (dev_priv, pipe, false)) {drivers/gpu/drm/i915/i915_reg.h +1
-1@@ -1927,7 +1927,7 @@#define PIPE_MISC2 (pipe) _MMIO_PIPE(pipe, _PIPE_MISC2_A, _PIPE_MISC2_B)#define _ICL_PIPE_A_STATUS 0x70058 -#define ICL_PIPESTATUS (pipe) _MMIO_PIPE2(dev_priv, pipe, _ICL_PIPE_A_STATUS) +#define ICL_PIPESTATUS (dev_priv, pipe) _MMIO_PIPE2(dev_priv, pipe, _ICL_PIPE_A_STATUS)#define PIPE_STATUS_UNDERRUN REG_BIT(31)#define PIPE_STATUS_SOFT_UNDERRUN_XELPD REG_BIT(28)#define PIPE_STATUS_HARD_UNDERRUN_XELPD REG_BIT(27)Signature · 1 line
2.39.2
PATCH 25/65 drm/i915: pass dev_priv explicitly to DSPARB
In reply to Jani NikulaAvoid the implicit dev_priv local variable use, and pass dev_priv explicitly to the DSPARB register macro.
--- drivers/gpu/drm/i915/display/i9xx_wm.c | 22 ++++++++++++---------- drivers/gpu/drm/i915/i915_reg.h | 2 +- drivers/gpu/drm/i915/i915_suspend.c | 6 ++++-- 3 files changed, 17 insertions(+), 13 deletions(-)
drivers/gpu/drm/i915/display/i9xx_wm.c +12 -10
@@ -269,13 +269,15 @@ static void vlv_get_fifo_size(struct intel_crtc_state *crtc_state)switch (pipe) {case PIPE_A : - dsparb =intel_uncore_read (&dev_priv->uncore,DSPARB ); + dsparb =intel_uncore_read (&dev_priv->uncore, +DSPARB (dev_priv)); dsparb2 =intel_uncore_read (&dev_priv->uncore,DSPARB2 ); sprite0_start =VLV_FIFO_START (dsparb, dsparb2,0 ,0 ); sprite1_start =VLV_FIFO_START (dsparb, dsparb2,8 ,4 );break ;case PIPE_B : - dsparb =intel_uncore_read (&dev_priv->uncore,DSPARB ); + dsparb =intel_uncore_read (&dev_priv->uncore, +DSPARB (dev_priv)); dsparb2 =intel_uncore_read (&dev_priv->uncore,DSPARB2 ); sprite0_start =VLV_FIFO_START (dsparb, dsparb2,16 ,8 ); sprite1_start =VLV_FIFO_START (dsparb, dsparb2,24 ,12 );
@@ -300,7 +302,7 @@ static void vlv_get_fifo_size(struct intel_crtc_state *crtc_state)static int i9xx_get_fifo_size (struct drm_i915_private *dev_priv,enum i9xx_plane_id i9xx_plane) { -u32 dsparb =intel_uncore_read (&dev_priv->uncore,DSPARB ); +u32 dsparb =intel_uncore_read (&dev_priv->uncore,DSPARB (dev_priv));int size; size = dsparb &0x7f ;
@@ -316,7 +318,7 @@ static int i9xx_get_fifo_size(struct drm_i915_private *dev_priv,static int i830_get_fifo_size (struct drm_i915_private *dev_priv,enum i9xx_plane_id i9xx_plane) { -u32 dsparb =intel_uncore_read (&dev_priv->uncore,DSPARB ); +u32 dsparb =intel_uncore_read (&dev_priv->uncore,DSPARB (dev_priv));int size; size = dsparb &0x1ff ;
@@ -333,7 +335,7 @@ static int i830_get_fifo_size(struct drm_i915_private *dev_priv,static int i845_get_fifo_size (struct drm_i915_private *dev_priv,enum i9xx_plane_id i9xx_plane) { -u32 dsparb =intel_uncore_read (&dev_priv->uncore,DSPARB ); +u32 dsparb =intel_uncore_read (&dev_priv->uncore,DSPARB (dev_priv));int size; size = dsparb &0x7f ;
@@ -1787,7 +1789,7 @@ static void vlv_atomic_update_fifo(struct intel_atomic_state *state,switch (crtc->pipe) {case PIPE_A : - dsparb =intel_uncore_read_fw (uncore,DSPARB ); + dsparb =intel_uncore_read_fw (uncore,DSPARB (dev_priv)); dsparb2 =intel_uncore_read_fw (uncore,DSPARB2 ); dsparb &= ~(VLV_FIFO(SPRITEA, 0xff) |
@@ -1800,11 +1802,11 @@ static void vlv_atomic_update_fifo(struct intel_atomic_state *state, dsparb2 |= (VLV_FIFO (SPRITEA_HI , sprite0_start >>8 ) |VLV_FIFO (SPRITEB_HI , sprite1_start >>8 )); -intel_uncore_write_fw (uncore,DSPARB , dsparb); +intel_uncore_write_fw (uncore,DSPARB (dev_priv), dsparb);intel_uncore_write_fw (uncore,DSPARB2 , dsparb2);break ;case PIPE_B : - dsparb =intel_uncore_read_fw (uncore,DSPARB ); + dsparb =intel_uncore_read_fw (uncore,DSPARB (dev_priv)); dsparb2 =intel_uncore_read_fw (uncore,DSPARB2 ); dsparb &= ~(VLV_FIFO(SPRITEC, 0xff) |
@@ -1817,7 +1819,7 @@ static void vlv_atomic_update_fifo(struct intel_atomic_state *state, dsparb2 |= (VLV_FIFO (SPRITEC_HI , sprite0_start >>8 ) |VLV_FIFO (SPRITED_HI , sprite1_start >>8 )); -intel_uncore_write_fw (uncore,DSPARB , dsparb); +intel_uncore_write_fw (uncore,DSPARB (dev_priv), dsparb);intel_uncore_write_fw (uncore,DSPARB2 , dsparb2);break ;case PIPE_C :
@@ -1841,7 +1843,7 @@ static void vlv_atomic_update_fifo(struct intel_atomic_state *state,break ; } -intel_uncore_posting_read_fw (uncore,DSPARB ); +intel_uncore_posting_read_fw (uncore,DSPARB (dev_priv));spin_unlock (&uncore->lock); }
drivers/gpu/drm/i915/i915_reg.h +1 -1
@@ -1984,7 +1984,7 @@#define SPRITEA_INVALID_GTT_STATUS REG_BIT(1)#define PLANEA_INVALID_GTT_STATUS REG_BIT(0) -#define DSPARB _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x70030) +#define DSPARB (dev_priv) _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x70030)#define DSPARB_CSTART_MASK (0x7f << 7)#define DSPARB_CSTART_SHIFT 7#define DSPARB_BSTART_MASK (0x7f)
drivers/gpu/drm/i915/i915_suspend.c +4 -2
@@ -92,7 +92,8 @@ void i915_save_display(struct drm_i915_private *dev_priv)/* Display arbitration control */ if (GRAPHICS_VER (dev_priv) <=4 ) - dev_priv->regfile.saveDSPARB =intel_de_read (dev_priv,DSPARB ); + dev_priv->regfile.saveDSPARB =intel_de_read (dev_priv, +DSPARB (dev_priv));if (GRAPHICS_VER (dev_priv) ==4 ) pci_read_config_word(pdev, GCDGMBUS,
@@ -116,7 +117,8 @@ void i915_restore_display(struct drm_i915_private *dev_priv)/* Display arbitration */ if (GRAPHICS_VER (dev_priv) <=4 ) -intel_de_write (dev_priv,DSPARB , dev_priv->regfile.saveDSPARB); +intel_de_write (dev_priv,DSPARB (dev_priv), + dev_priv->regfile.saveDSPARB);intel_vga_redisable (dev_priv);
Signature · 1 line
2.39.2
Re: [PATCH 25/65] drm/i915: pass dev_priv explicitly to DSPARB
Quoted 2 lines · Jani Nikula
Avoid the implicit
dev_privlocal variable use, and passdev_privexplicitly to the DSPARB register macro.
Quoted 138 lines
Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/display/i9xx_wm.c | 22 ++++++++++++---------- drivers/gpu/drm/i915/i915_reg.h | 2 +- drivers/gpu/drm/i915/i915_suspend.c | 6 ++++-- 3 files changed, 17 insertions(+), 13 deletions(-)drivers/gpu/drm/i915/display/i9xx_wm.c +12
-10@@ -269,13 +269,15 @@ static void vlv_get_fifo_size(struct intel_crtc_state *crtc_state)switch (pipe) {case PIPE_A : - dsparb =intel_uncore_read (&dev_priv->uncore,DSPARB ); + dsparb =intel_uncore_read (&dev_priv->uncore, +DSPARB (dev_priv)); dsparb2 =intel_uncore_read (&dev_priv->uncore,DSPARB2 ); sprite0_start =VLV_FIFO_START (dsparb, dsparb2,0 ,0 ); sprite1_start =VLV_FIFO_START (dsparb, dsparb2,8 ,4 );break ;case PIPE_B : - dsparb =intel_uncore_read (&dev_priv->uncore,DSPARB ); + dsparb =intel_uncore_read (&dev_priv->uncore, +DSPARB (dev_priv)); dsparb2 =intel_uncore_read (&dev_priv->uncore,DSPARB2 ); sprite0_start =VLV_FIFO_START (dsparb, dsparb2,16 ,8 ); sprite1_start =VLV_FIFO_START (dsparb, dsparb2,24 ,12 );@@ -300,7 +302,7 @@ static void vlv_get_fifo_size(struct intel_crtc_state *crtc_state)static int i9xx_get_fifo_size (struct drm_i915_private *dev_priv,enum i9xx_plane_id i9xx_plane) { -u32 dsparb =intel_uncore_read (&dev_priv->uncore,DSPARB ); +u32 dsparb =intel_uncore_read (&dev_priv->uncore,DSPARB (dev_priv));int size; size = dsparb &0x7f ;@@ -316,7 +318,7 @@ static int i9xx_get_fifo_size(struct drm_i915_private *dev_priv,static int i830_get_fifo_size (struct drm_i915_private *dev_priv,enum i9xx_plane_id i9xx_plane) { -u32 dsparb =intel_uncore_read (&dev_priv->uncore,DSPARB ); +u32 dsparb =intel_uncore_read (&dev_priv->uncore,DSPARB (dev_priv));int size; size = dsparb &0x1ff ;@@ -333,7 +335,7 @@ static int i830_get_fifo_size(struct drm_i915_private *dev_priv,static int i845_get_fifo_size (struct drm_i915_private *dev_priv,enum i9xx_plane_id i9xx_plane) { -u32 dsparb =intel_uncore_read (&dev_priv->uncore,DSPARB ); +u32 dsparb =intel_uncore_read (&dev_priv->uncore,DSPARB (dev_priv));int size; size = dsparb &0x7f ;@@ -1787,7 +1789,7 @@ static void vlv_atomic_update_fifo(struct intel_atomic_state *state,switch (crtc->pipe) {case PIPE_A : - dsparb =intel_uncore_read_fw (uncore,DSPARB ); + dsparb =intel_uncore_read_fw (uncore,DSPARB (dev_priv)); dsparb2 =intel_uncore_read_fw (uncore,DSPARB2 ); dsparb &= ~(VLV_FIFO(SPRITEA, 0xff) |@@ -1800,11 +1802,11 @@ static void vlv_atomic_update_fifo(struct intel_atomic_state *state, dsparb2 |= (VLV_FIFO (SPRITEA_HI , sprite0_start >>8 ) |VLV_FIFO (SPRITEB_HI , sprite1_start >>8 )); -intel_uncore_write_fw (uncore,DSPARB , dsparb); +intel_uncore_write_fw (uncore,DSPARB (dev_priv), dsparb);intel_uncore_write_fw (uncore,DSPARB2 , dsparb2);break ;case PIPE_B : - dsparb =intel_uncore_read_fw (uncore,DSPARB ); + dsparb =intel_uncore_read_fw (uncore,DSPARB (dev_priv)); dsparb2 =intel_uncore_read_fw (uncore,DSPARB2 ); dsparb &= ~(VLV_FIFO(SPRITEC, 0xff) |@@ -1817,7 +1819,7 @@ static void vlv_atomic_update_fifo(struct intel_atomic_state *state, dsparb2 |= (VLV_FIFO (SPRITEC_HI , sprite0_start >>8 ) |VLV_FIFO (SPRITED_HI , sprite1_start >>8 )); -intel_uncore_write_fw (uncore,DSPARB , dsparb); +intel_uncore_write_fw (uncore,DSPARB (dev_priv), dsparb);intel_uncore_write_fw (uncore,DSPARB2 , dsparb2);break ;case PIPE_C :@@ -1841,7 +1843,7 @@ static void vlv_atomic_update_fifo(struct intel_atomic_state *state,break ; } -intel_uncore_posting_read_fw (uncore,DSPARB ); +intel_uncore_posting_read_fw (uncore,DSPARB (dev_priv));spin_unlock (&uncore->lock); }drivers/gpu/drm/i915/i915_reg.h +1
-1@@ -1984,7 +1984,7 @@#define SPRITEA_INVALID_GTT_STATUS REG_BIT(1)#define PLANEA_INVALID_GTT_STATUS REG_BIT(0) -#define DSPARB _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x70030) +#define DSPARB (dev_priv) _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x70030)#define DSPARB_CSTART_MASK (0x7f << 7)#define DSPARB_CSTART_SHIFT 7#define DSPARB_BSTART_MASK (0x7f)drivers/gpu/drm/i915/i915_suspend.c +4
-2@@ -92,7 +92,8 @@ void i915_save_display(struct drm_i915_private *dev_priv)/* Display arbitration control */ if (GRAPHICS_VER (dev_priv) <=4 ) - dev_priv->regfile.saveDSPARB =intel_de_read (dev_priv,DSPARB ); + dev_priv->regfile.saveDSPARB =intel_de_read (dev_priv, +DSPARB (dev_priv));if (GRAPHICS_VER (dev_priv) ==4 ) pci_read_config_word(pdev, GCDGMBUS,@@ -116,7 +117,8 @@ void i915_restore_display(struct drm_i915_private *dev_priv)/* Display arbitration */ if (GRAPHICS_VER (dev_priv) <=4 ) -intel_de_write (dev_priv,DSPARB , dev_priv->regfile.saveDSPARB); +intel_de_write (dev_priv,DSPARB (dev_priv), + dev_priv->regfile.saveDSPARB);intel_vga_redisable (dev_priv);Signature · 1 line
2.39.2
PATCH 26/65 drm/i915: pass dev_priv explicitly to DSPFW1
In reply to Jani NikulaAvoid the implicit dev_priv local variable use, and pass dev_priv explicitly to the DSPFW1 register macro.
--- drivers/gpu/drm/i915/display/i9xx_wm.c | 25 +++++++++++++------------ drivers/gpu/drm/i915/i915_reg.h | 2 +- 2 files changed, 14 insertions(+), 13 deletions(-)
drivers/gpu/drm/i915/display/i9xx_wm.c +13 -12
@@ -657,10 +657,10 @@ static void pnv_update_wm(struct drm_i915_private *dev_priv) &pnv_display_wm, pnv_display_wm.fifo_size, cpp, latency->display_sr); - reg =intel_uncore_read (&dev_priv->uncore,DSPFW1 ); + reg =intel_uncore_read (&dev_priv->uncore,DSPFW1 (dev_priv)); reg &= ~DSPFW_SR_MASK ; reg |=FW_WM (wm,SR ); -intel_uncore_write (&dev_priv->uncore,DSPFW1 , reg); +intel_uncore_write (&dev_priv->uncore,DSPFW1 (dev_priv), reg);drm_dbg_kms (&dev_priv->drm,"DSPFW1 register is %x\n" , reg);/* cursor SR */
@@ -720,7 +720,7 @@ static void g4x_write_wm_values(struct drm_i915_private *dev_priv,for_each_pipe (dev_priv, pipe)trace_g4x_wm (intel_crtc_for_pipe (dev_priv, pipe), wm); - intel_uncore_write(&dev_priv->uncore, DSPFW1, + intel_uncore_write(&dev_priv->uncore, DSPFW1(dev_priv), FW_WM(wm->sr.plane, SR) | FW_WM(wm->pipe[PIPE_B].plane[PLANE_CURSOR], CURSORB) | FW_WM(wm->pipe[PIPE_B].plane[PLANE_PRIMARY], PLANEB) |
@@ -738,7 +738,7 @@ static void g4x_write_wm_values(struct drm_i915_private *dev_priv,FW_WM (wm->hpll.cursor,HPLL_CURSOR ) | FW_WM(wm->hpll.plane, HPLL_SR)); -intel_uncore_posting_read (&dev_priv->uncore,DSPFW1 ); +intel_uncore_posting_read (&dev_priv->uncore,DSPFW1 (dev_priv)); }#define FW_WM_VLV (value, plane) \
@@ -770,7 +770,7 @@ static void vlv_write_wm_values(struct drm_i915_private *dev_priv,intel_uncore_write (&dev_priv->uncore,DSPFW5 ,0 );intel_uncore_write (&dev_priv->uncore,DSPFW6 ,0 ); - intel_uncore_write(&dev_priv->uncore, DSPFW1, + intel_uncore_write(&dev_priv->uncore, DSPFW1(dev_priv), FW_WM(wm->sr.plane, SR) | FW_WM(wm->pipe[PIPE_B].plane[PLANE_CURSOR], CURSORB) | FW_WM_VLV(wm->pipe[PIPE_B].plane[PLANE_PRIMARY], PLANEB) |
@@ -817,7 +817,7 @@ static void vlv_write_wm_values(struct drm_i915_private *dev_priv, FW_WM(wm->pipe[PIPE_A].plane[PLANE_PRIMARY] >> 8, PLANEA_HI)); } -intel_uncore_posting_read (&dev_priv->uncore,DSPFW1 ); +intel_uncore_posting_read (&dev_priv->uncore,DSPFW1 (dev_priv)); }#undef FW_WM_VLV
@@ -2067,10 +2067,11 @@ static void i965_update_wm(struct drm_i915_private *dev_priv) srwm);/* 965 has limitations... */ -intel_uncore_write (&dev_priv->uncore,DSPFW1 ,FW_WM (srwm,SR ) | -FW_WM (8 ,CURSORB ) | -FW_WM (8 ,PLANEB ) | -FW_WM (8 ,PLANEA )); +intel_uncore_write (&dev_priv->uncore,DSPFW1 (dev_priv), +FW_WM (srwm,SR ) | +FW_WM (8 ,CURSORB ) | +FW_WM (8 ,PLANEB ) | +FW_WM (8 ,PLANEA ));intel_uncore_write (&dev_priv->uncore,DSPFW2 ,FW_WM (8 ,CURSORA ) |FW_WM (8 ,PLANEC_OLD ));/* update cursor SR watermark */
@@ -3521,7 +3522,7 @@ static void g4x_read_wm_values(struct drm_i915_private *dev_priv, {u32 tmp; - tmp =intel_uncore_read (&dev_priv->uncore,DSPFW1 ); + tmp =intel_uncore_read (&dev_priv->uncore,DSPFW1 (dev_priv)); wm->sr.plane =_FW_WM (tmp,SR ); wm->pipe[PIPE_B ].plane[PLANE_CURSOR ] =_FW_WM (tmp,CURSORB ); wm->pipe[PIPE_B ].plane[PLANE_PRIMARY ] =_FW_WM (tmp,PLANEB );
@@ -3561,7 +3562,7 @@ static void vlv_read_wm_values(struct drm_i915_private *dev_priv, (tmp >>DDL_SPRITE_SHIFT (1 )) & (DDL_PRECISION_HIGH |DRAIN_LATENCY_MASK ); } - tmp =intel_uncore_read (&dev_priv->uncore,DSPFW1 ); + tmp =intel_uncore_read (&dev_priv->uncore,DSPFW1 (dev_priv)); wm->sr.plane =_FW_WM (tmp,SR ); wm->pipe[PIPE_B ].plane[PLANE_CURSOR ] =_FW_WM (tmp,CURSORB ); wm->pipe[PIPE_B ].plane[PLANE_PRIMARY ] =_FW_WM_VLV (tmp,PLANEB );
drivers/gpu/drm/i915/i915_reg.h +1 -1
@@ -2019,7 +2019,7 @@#define DSPARB_SPRITEF_MASK_VLV (0xff << 8)/* pnv/gen4/g4x/vlv/chv */ -#define DSPFW1 _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x70034) +#define DSPFW1 (dev_priv) _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x70034)#define DSPFW_SR_SHIFT 23#define DSPFW_SR_MASK (0x1ff << 23)#define DSPFW_CURSORB_SHIFT 16
Signature · 1 line
2.39.2
Re: [PATCH 26/65] drm/i915: pass dev_priv explicitly to DSPFW1
Quoted 2 lines · Jani Nikula
Avoid the implicit
dev_privlocal variable use, and passdev_privexplicitly to the DSPFW1 register macro.
Quoted 110 lines
Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/display/i9xx_wm.c | 25 +++++++++++++------------ drivers/gpu/drm/i915/i915_reg.h | 2 +- 2 files changed, 14 insertions(+), 13 deletions(-)drivers/gpu/drm/i915/display/i9xx_wm.c +13
-12@@ -657,10 +657,10 @@ static void pnv_update_wm(struct drm_i915_private *dev_priv) &pnv_display_wm, pnv_display_wm.fifo_size, cpp, latency->display_sr); - reg =intel_uncore_read (&dev_priv->uncore,DSPFW1 ); + reg =intel_uncore_read (&dev_priv->uncore,DSPFW1 (dev_priv)); reg &= ~DSPFW_SR_MASK ; reg |=FW_WM (wm,SR ); -intel_uncore_write (&dev_priv->uncore,DSPFW1 , reg); +intel_uncore_write (&dev_priv->uncore,DSPFW1 (dev_priv), reg);drm_dbg_kms (&dev_priv->drm,"DSPFW1 register is %x\n" , reg);/* cursor SR */ @@ -720,7 +720,7 @@ static void g4x_write_wm_values(struct drm_i915_private *dev_priv,for_each_pipe (dev_priv, pipe)trace_g4x_wm (intel_crtc_for_pipe (dev_priv, pipe), wm); - intel_uncore_write(&dev_priv->uncore, DSPFW1, + intel_uncore_write(&dev_priv->uncore, DSPFW1(dev_priv), FW_WM(wm->sr.plane, SR) | FW_WM(wm->pipe[PIPE_B].plane[PLANE_CURSOR], CURSORB) | FW_WM(wm->pipe[PIPE_B].plane[PLANE_PRIMARY], PLANEB) |@@ -738,7 +738,7 @@ static void g4x_write_wm_values(struct drm_i915_private *dev_priv,FW_WM (wm->hpll.cursor,HPLL_CURSOR ) | FW_WM(wm->hpll.plane, HPLL_SR)); -intel_uncore_posting_read (&dev_priv->uncore,DSPFW1 ); +intel_uncore_posting_read (&dev_priv->uncore,DSPFW1 (dev_priv)); }#define FW_WM_VLV (value, plane) \@@ -770,7 +770,7 @@ static void vlv_write_wm_values(struct drm_i915_private *dev_priv,intel_uncore_write (&dev_priv->uncore,DSPFW5 ,0 );intel_uncore_write (&dev_priv->uncore,DSPFW6 ,0 ); - intel_uncore_write(&dev_priv->uncore, DSPFW1, + intel_uncore_write(&dev_priv->uncore, DSPFW1(dev_priv), FW_WM(wm->sr.plane, SR) | FW_WM(wm->pipe[PIPE_B].plane[PLANE_CURSOR], CURSORB) | FW_WM_VLV(wm->pipe[PIPE_B].plane[PLANE_PRIMARY], PLANEB) |@@ -817,7 +817,7 @@ static void vlv_write_wm_values(struct drm_i915_private *dev_priv, FW_WM(wm->pipe[PIPE_A].plane[PLANE_PRIMARY] >> 8, PLANEA_HI)); } -intel_uncore_posting_read (&dev_priv->uncore,DSPFW1 ); +intel_uncore_posting_read (&dev_priv->uncore,DSPFW1 (dev_priv)); }#undef FW_WM_VLV@@ -2067,10 +2067,11 @@ static void i965_update_wm(struct drm_i915_private *dev_priv) srwm);/* 965 has limitations... */ -intel_uncore_write (&dev_priv->uncore,DSPFW1 ,FW_WM (srwm,SR ) | -FW_WM (8 ,CURSORB ) | -FW_WM (8 ,PLANEB ) | -FW_WM (8 ,PLANEA )); +intel_uncore_write (&dev_priv->uncore,DSPFW1 (dev_priv), +FW_WM (srwm,SR ) | +FW_WM (8 ,CURSORB ) | +FW_WM (8 ,PLANEB ) | +FW_WM (8 ,PLANEA ));intel_uncore_write (&dev_priv->uncore,DSPFW2 ,FW_WM (8 ,CURSORA ) |FW_WM (8 ,PLANEC_OLD ));/* update cursor SR watermark */ @@ -3521,7 +3522,7 @@ static void g4x_read_wm_values(struct drm_i915_private *dev_priv, {u32 tmp; - tmp =intel_uncore_read (&dev_priv->uncore,DSPFW1 ); + tmp =intel_uncore_read (&dev_priv->uncore,DSPFW1 (dev_priv)); wm->sr.plane =_FW_WM (tmp,SR ); wm->pipe[PIPE_B ].plane[PLANE_CURSOR ] =_FW_WM (tmp,CURSORB ); wm->pipe[PIPE_B ].plane[PLANE_PRIMARY ] =_FW_WM (tmp,PLANEB );@@ -3561,7 +3562,7 @@ static void vlv_read_wm_values(struct drm_i915_private *dev_priv, (tmp >>DDL_SPRITE_SHIFT (1 )) & (DDL_PRECISION_HIGH |DRAIN_LATENCY_MASK ); } - tmp =intel_uncore_read (&dev_priv->uncore,DSPFW1 ); + tmp =intel_uncore_read (&dev_priv->uncore,DSPFW1 (dev_priv)); wm->sr.plane =_FW_WM (tmp,SR ); wm->pipe[PIPE_B ].plane[PLANE_CURSOR ] =_FW_WM (tmp,CURSORB ); wm->pipe[PIPE_B ].plane[PLANE_PRIMARY ] =_FW_WM_VLV (tmp,PLANEB );drivers/gpu/drm/i915/i915_reg.h +1
-1@@ -2019,7 +2019,7 @@#define DSPARB_SPRITEF_MASK_VLV (0xff << 8)/* pnv/gen4/g4x/vlv/chv */ -#define DSPFW1 _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x70034) +#define DSPFW1 (dev_priv) _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x70034)#define DSPFW_SR_SHIFT 23#define DSPFW_SR_MASK (0x1ff << 23)#define DSPFW_CURSORB_SHIFT 16Signature · 1 line
2.39.2
PATCH 27/65 drm/i915: pass dev_priv explicitly to DSPFW2
In reply to Jani NikulaAvoid the implicit dev_priv local variable use, and pass dev_priv explicitly to the DSPFW2 register macro.
--- drivers/gpu/drm/i915/display/i9xx_wm.c | 13 +++++++------ drivers/gpu/drm/i915/i915_reg.h | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/display/i9xx_wm.c +7 -6
@@ -725,7 +725,7 @@ static void g4x_write_wm_values(struct drm_i915_private *dev_priv,FW_WM (wm->pipe[PIPE_B ].plane[PLANE_CURSOR ],CURSORB ) |FW_WM (wm->pipe[PIPE_B ].plane[PLANE_PRIMARY ],PLANEB ) | FW_WM(wm->pipe[PIPE_A].plane[PLANE_PRIMARY], PLANEA)); - intel_uncore_write(&dev_priv->uncore, DSPFW2, + intel_uncore_write(&dev_priv->uncore, DSPFW2(dev_priv), (wm->fbc_en ? DSPFW_FBC_SR_EN : 0) | FW_WM(wm->sr.fbc, FBC_SR) | FW_WM(wm->hpll.fbc, FBC_HPLL_SR) |
@@ -775,7 +775,7 @@ static void vlv_write_wm_values(struct drm_i915_private *dev_priv,FW_WM (wm->pipe[PIPE_B ].plane[PLANE_CURSOR ],CURSORB ) |FW_WM_VLV (wm->pipe[PIPE_B ].plane[PLANE_PRIMARY ],PLANEB ) | FW_WM_VLV(wm->pipe[PIPE_A].plane[PLANE_PRIMARY], PLANEA)); -intel_uncore_write (&dev_priv->uncore,DSPFW2 , +intel_uncore_write (&dev_priv->uncore,DSPFW2 (dev_priv),FW_WM_VLV (wm->pipe[PIPE_A ].plane[PLANE_SPRITE1 ],SPRITEB ) |FW_WM (wm->pipe[PIPE_A ].plane[PLANE_CURSOR ],CURSORA ) |FW_WM_VLV (wm->pipe[PIPE_A ].plane[PLANE_SPRITE0 ],SPRITEA ));
@@ -2072,8 +2072,9 @@ static void i965_update_wm(struct drm_i915_private *dev_priv)FW_WM (8 ,CURSORB ) |FW_WM (8 ,PLANEB ) | FW_WM(8, PLANEA)); -intel_uncore_write (&dev_priv->uncore,DSPFW2 ,FW_WM (8 ,CURSORA ) | -FW_WM (8 ,PLANEC_OLD )); +intel_uncore_write (&dev_priv->uncore,DSPFW2 (dev_priv), +FW_WM (8 ,CURSORA ) | +FW_WM (8 ,PLANEC_OLD ));/* update cursor SR watermark */ intel_uncore_write (&dev_priv->uncore,DSPFW3 ,FW_WM (cursor_sr,CURSOR_SR ));
@@ -3528,7 +3529,7 @@ static void g4x_read_wm_values(struct drm_i915_private *dev_priv, wm->pipe[PIPE_B ].plane[PLANE_PRIMARY ] =_FW_WM (tmp,PLANEB ); wm->pipe[PIPE_A ].plane[PLANE_PRIMARY ] =_FW_WM (tmp,PLANEA ); - tmp =intel_uncore_read (&dev_priv->uncore,DSPFW2 ); + tmp =intel_uncore_read (&dev_priv->uncore,DSPFW2 (dev_priv)); wm->fbc_en = tmp &DSPFW_FBC_SR_EN ; wm->sr.fbc =_FW_WM (tmp,FBC_SR ); wm->hpll.fbc =_FW_WM (tmp,FBC_HPLL_SR );
@@ -3568,7 +3569,7 @@ static void vlv_read_wm_values(struct drm_i915_private *dev_priv, wm->pipe[PIPE_B ].plane[PLANE_PRIMARY ] =_FW_WM_VLV (tmp,PLANEB ); wm->pipe[PIPE_A ].plane[PLANE_PRIMARY ] =_FW_WM_VLV (tmp,PLANEA ); - tmp =intel_uncore_read (&dev_priv->uncore,DSPFW2 ); + tmp =intel_uncore_read (&dev_priv->uncore,DSPFW2 (dev_priv)); wm->pipe[PIPE_A ].plane[PLANE_SPRITE1 ] =_FW_WM_VLV (tmp,SPRITEB ); wm->pipe[PIPE_A ].plane[PLANE_CURSOR ] =_FW_WM (tmp,CURSORA ); wm->pipe[PIPE_A ].plane[PLANE_SPRITE0 ] =_FW_WM_VLV (tmp,SPRITEA );
drivers/gpu/drm/i915/i915_reg.h +1 -1
@@ -2030,7 +2030,7 @@#define DSPFW_PLANEA_SHIFT 0#define DSPFW_PLANEA_MASK (0x7f << 0)#define DSPFW_PLANEA_MASK_VLV (0xff << 0)/* vlv/chv */ -#define DSPFW2 _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x70038) +#define DSPFW2 (dev_priv) _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x70038)#define DSPFW_FBC_SR_EN (1 << 31)/* g4x */ #define DSPFW_FBC_SR_SHIFT 28#define DSPFW_FBC_SR_MASK (0x7 << 28)/* g4x */
Signature · 1 line
2.39.2
Re: [PATCH 27/65] drm/i915: pass dev_priv explicitly to DSPFW2
Quoted 2 lines · Jani Nikula
Avoid the implicit
dev_privlocal variable use, and passdev_privexplicitly to the DSPFW2 register macro.
Quoted 75 lines
Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/display/i9xx_wm.c | 13 +++++++------ drivers/gpu/drm/i915/i915_reg.h | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-)drivers/gpu/drm/i915/display/i9xx_wm.c +7
-6@@ -725,7 +725,7 @@ static void g4x_write_wm_values(struct drm_i915_private *dev_priv,FW_WM (wm->pipe[PIPE_B ].plane[PLANE_CURSOR ],CURSORB ) |FW_WM (wm->pipe[PIPE_B ].plane[PLANE_PRIMARY ],PLANEB ) | FW_WM(wm->pipe[PIPE_A].plane[PLANE_PRIMARY], PLANEA)); - intel_uncore_write(&dev_priv->uncore, DSPFW2, + intel_uncore_write(&dev_priv->uncore, DSPFW2(dev_priv), (wm->fbc_en ? DSPFW_FBC_SR_EN : 0) | FW_WM(wm->sr.fbc, FBC_SR) | FW_WM(wm->hpll.fbc, FBC_HPLL_SR) |@@ -775,7 +775,7 @@ static void vlv_write_wm_values(struct drm_i915_private *dev_priv,FW_WM (wm->pipe[PIPE_B ].plane[PLANE_CURSOR ],CURSORB ) |FW_WM_VLV (wm->pipe[PIPE_B ].plane[PLANE_PRIMARY ],PLANEB ) | FW_WM_VLV(wm->pipe[PIPE_A].plane[PLANE_PRIMARY], PLANEA)); -intel_uncore_write (&dev_priv->uncore,DSPFW2 , +intel_uncore_write (&dev_priv->uncore,DSPFW2 (dev_priv),FW_WM_VLV (wm->pipe[PIPE_A ].plane[PLANE_SPRITE1 ],SPRITEB ) |FW_WM (wm->pipe[PIPE_A ].plane[PLANE_CURSOR ],CURSORA ) |FW_WM_VLV (wm->pipe[PIPE_A ].plane[PLANE_SPRITE0 ],SPRITEA ));@@ -2072,8 +2072,9 @@ static void i965_update_wm(struct drm_i915_private *dev_priv)FW_WM (8 ,CURSORB ) |FW_WM (8 ,PLANEB ) | FW_WM(8, PLANEA)); -intel_uncore_write (&dev_priv->uncore,DSPFW2 ,FW_WM (8 ,CURSORA ) | -FW_WM (8 ,PLANEC_OLD )); +intel_uncore_write (&dev_priv->uncore,DSPFW2 (dev_priv), +FW_WM (8 ,CURSORA ) | +FW_WM (8 ,PLANEC_OLD ));/* update cursor SR watermark */ intel_uncore_write (&dev_priv->uncore,DSPFW3 ,FW_WM (cursor_sr,CURSOR_SR ));@@ -3528,7 +3529,7 @@ static void g4x_read_wm_values(struct drm_i915_private *dev_priv, wm->pipe[PIPE_B ].plane[PLANE_PRIMARY ] =_FW_WM (tmp,PLANEB ); wm->pipe[PIPE_A ].plane[PLANE_PRIMARY ] =_FW_WM (tmp,PLANEA ); - tmp =intel_uncore_read (&dev_priv->uncore,DSPFW2 ); + tmp =intel_uncore_read (&dev_priv->uncore,DSPFW2 (dev_priv)); wm->fbc_en = tmp &DSPFW_FBC_SR_EN ; wm->sr.fbc =_FW_WM (tmp,FBC_SR ); wm->hpll.fbc =_FW_WM (tmp,FBC_HPLL_SR );@@ -3568,7 +3569,7 @@ static void vlv_read_wm_values(struct drm_i915_private *dev_priv, wm->pipe[PIPE_B ].plane[PLANE_PRIMARY ] =_FW_WM_VLV (tmp,PLANEB ); wm->pipe[PIPE_A ].plane[PLANE_PRIMARY ] =_FW_WM_VLV (tmp,PLANEA ); - tmp =intel_uncore_read (&dev_priv->uncore,DSPFW2 ); + tmp =intel_uncore_read (&dev_priv->uncore,DSPFW2 (dev_priv)); wm->pipe[PIPE_A ].plane[PLANE_SPRITE1 ] =_FW_WM_VLV (tmp,SPRITEB ); wm->pipe[PIPE_A ].plane[PLANE_CURSOR ] =_FW_WM (tmp,CURSORA ); wm->pipe[PIPE_A ].plane[PLANE_SPRITE0 ] =_FW_WM_VLV (tmp,SPRITEA );drivers/gpu/drm/i915/i915_reg.h +1
-1@@ -2030,7 +2030,7 @@#define DSPFW_PLANEA_SHIFT 0#define DSPFW_PLANEA_MASK (0x7f << 0)#define DSPFW_PLANEA_MASK_VLV (0xff << 0)/* vlv/chv */ -#define DSPFW2 _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x70038) +#define DSPFW2 (dev_priv) _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x70038)#define DSPFW_FBC_SR_EN (1 << 31)/* g4x */ #define DSPFW_FBC_SR_SHIFT 28#define DSPFW_FBC_SR_MASK (0x7 << 28)/* g4x */ Signature · 1 line
2.39.2
PATCH 28/65 drm/i915: pass dev_priv explicitly to DSPFW3
In reply to Jani NikulaAvoid the implicit dev_priv local variable use, and pass dev_priv explicitly to the DSPFW3 register macro.
--- drivers/gpu/drm/i915/display/i9xx_wm.c | 27 ++++++++++--------- .../drm/i915/display/intel_display_debugfs.c | 2 +- drivers/gpu/drm/i915/i915_reg.h | 2 +- 3 files changed, 17 insertions(+), 14 deletions(-)
drivers/gpu/drm/i915/display/i9xx_wm.c +15 -12
@@ -149,14 +149,14 @@ static bool _intel_set_memory_cxsr(struct drm_i915_private *dev_priv, bool enablintel_uncore_write (&dev_priv->uncore,FW_BLC_SELF , enable ?FW_BLC_SELF_EN :0 );intel_uncore_posting_read (&dev_priv->uncore,FW_BLC_SELF ); }else if (IS_PINEVIEW (dev_priv)) { - val =intel_uncore_read (&dev_priv->uncore,DSPFW3 ); + val =intel_uncore_read (&dev_priv->uncore,DSPFW3 (dev_priv)); was_enabled = val &PINEVIEW_SELF_REFRESH_EN ;if (enable) val |=PINEVIEW_SELF_REFRESH_EN ;else val &= ~PINEVIEW_SELF_REFRESH_EN ; -intel_uncore_write (&dev_priv->uncore,DSPFW3 , val); -intel_uncore_posting_read (&dev_priv->uncore,DSPFW3 ); +intel_uncore_write (&dev_priv->uncore,DSPFW3 (dev_priv), val); +intel_uncore_posting_read (&dev_priv->uncore,DSPFW3 (dev_priv)); }else if (IS_I945G (dev_priv) ||IS_I945GM (dev_priv)) { was_enabled =intel_uncore_read (&dev_priv->uncore,FW_BLC_SELF ) &FW_BLC_SELF_EN ; val = enable ? _MASKED_BIT_ENABLE(FW_BLC_SELF_EN) :
@@ -668,7 +668,8 @@ static void pnv_update_wm(struct drm_i915_private *dev_priv) &pnv_cursor_wm, pnv_display_wm.fifo_size, 4, latency->cursor_sr); -intel_uncore_rmw (&dev_priv->uncore,DSPFW3 ,DSPFW_CURSOR_SR_MASK , +intel_uncore_rmw (&dev_priv->uncore,DSPFW3 (dev_priv), +DSPFW_CURSOR_SR_MASK ,FW_WM (wm,CURSOR_SR ));/* Display HPLL off SR */
@@ -676,17 +677,18 @@ static void pnv_update_wm(struct drm_i915_private *dev_priv) &pnv_display_hplloff_wm, pnv_display_hplloff_wm.fifo_size, cpp, latency->display_hpll_disable); -intel_uncore_rmw (&dev_priv->uncore,DSPFW3 ,DSPFW_HPLL_SR_MASK ,FW_WM (wm,HPLL_SR )); +intel_uncore_rmw (&dev_priv->uncore,DSPFW3 (dev_priv), +DSPFW_HPLL_SR_MASK ,FW_WM (wm,HPLL_SR ));/* cursor HPLL off SR */ wm =intel_calculate_wm (dev_priv, pixel_rate, &pnv_cursor_hplloff_wm, pnv_display_hplloff_wm.fifo_size,4 , latency->cursor_hpll_disable); - reg =intel_uncore_read (&dev_priv->uncore,DSPFW3 ); + reg =intel_uncore_read (&dev_priv->uncore,DSPFW3 (dev_priv)); reg &= ~DSPFW_HPLL_CURSOR_MASK ; reg |=FW_WM (wm,HPLL_CURSOR ); -intel_uncore_write (&dev_priv->uncore,DSPFW3 , reg); +intel_uncore_write (&dev_priv->uncore,DSPFW3 (dev_priv), reg);drm_dbg_kms (&dev_priv->drm,"DSPFW3 register is %x\n" , reg);intel_set_memory_cxsr (dev_priv, true);
@@ -732,7 +734,7 @@ static void g4x_write_wm_values(struct drm_i915_private *dev_priv,FW_WM (wm->pipe[PIPE_B ].plane[PLANE_SPRITE0 ],SPRITEB ) |FW_WM (wm->pipe[PIPE_A ].plane[PLANE_CURSOR ],CURSORA ) | FW_WM(wm->pipe[PIPE_A].plane[PLANE_SPRITE0], SPRITEA)); - intel_uncore_write(&dev_priv->uncore, DSPFW3, + intel_uncore_write(&dev_priv->uncore, DSPFW3(dev_priv), (wm->hpll_en ? DSPFW_HPLL_SR_EN : 0) | FW_WM(wm->sr.cursor, CURSOR_SR) | FW_WM(wm->hpll.cursor, HPLL_CURSOR) |
@@ -779,7 +781,7 @@ static void vlv_write_wm_values(struct drm_i915_private *dev_priv,FW_WM_VLV (wm->pipe[PIPE_A ].plane[PLANE_SPRITE1 ],SPRITEB ) |FW_WM (wm->pipe[PIPE_A ].plane[PLANE_CURSOR ],CURSORA ) | FW_WM_VLV(wm->pipe[PIPE_A].plane[PLANE_SPRITE0], SPRITEA)); -intel_uncore_write (&dev_priv->uncore,DSPFW3 , +intel_uncore_write (&dev_priv->uncore,DSPFW3 (dev_priv),FW_WM (wm->sr.cursor,CURSOR_SR ));if (IS_CHERRYVIEW (dev_priv)) {
@@ -2076,7 +2078,8 @@ static void i965_update_wm(struct drm_i915_private *dev_priv)FW_WM (8 ,CURSORA ) | FW_WM(8, PLANEC_OLD));/* update cursor SR watermark */ -intel_uncore_write (&dev_priv->uncore,DSPFW3 ,FW_WM (cursor_sr,CURSOR_SR )); +intel_uncore_write (&dev_priv->uncore,DSPFW3 (dev_priv), +FW_WM (cursor_sr,CURSOR_SR ));if (cxsr_enabled)intel_set_memory_cxsr (dev_priv, true);
@@ -3537,7 +3540,7 @@ static void g4x_read_wm_values(struct drm_i915_private *dev_priv, wm->pipe[PIPE_A ].plane[PLANE_CURSOR ] =_FW_WM (tmp,CURSORA ); wm->pipe[PIPE_A ].plane[PLANE_SPRITE0 ] =_FW_WM (tmp,SPRITEA ); - tmp =intel_uncore_read (&dev_priv->uncore,DSPFW3 ); + tmp =intel_uncore_read (&dev_priv->uncore,DSPFW3 (dev_priv)); wm->hpll_en = tmp &DSPFW_HPLL_SR_EN ; wm->sr.cursor =_FW_WM (tmp,CURSOR_SR ); wm->hpll.cursor =_FW_WM (tmp,HPLL_CURSOR );
@@ -3574,7 +3577,7 @@ static void vlv_read_wm_values(struct drm_i915_private *dev_priv, wm->pipe[PIPE_A ].plane[PLANE_CURSOR ] =_FW_WM (tmp,CURSORA ); wm->pipe[PIPE_A ].plane[PLANE_SPRITE0 ] =_FW_WM_VLV (tmp,SPRITEA ); - tmp =intel_uncore_read (&dev_priv->uncore,DSPFW3 ); + tmp =intel_uncore_read (&dev_priv->uncore,DSPFW3 (dev_priv)); wm->sr.cursor =_FW_WM (tmp,CURSOR_SR );if (IS_CHERRYVIEW (dev_priv)) {
drivers/gpu/drm/i915/display/intel_display_debugfs.c +1 -1
@@ -77,7 +77,7 @@ static int i915_sr_status(struct seq_file *m, void *unused)else if (IS_I915GM (dev_priv)) sr_enabled =intel_de_read (dev_priv,INSTPM ) &INSTPM_SELF_EN ;else if (IS_PINEVIEW (dev_priv)) - sr_enabled =intel_de_read (dev_priv,DSPFW3 ) &PINEVIEW_SELF_REFRESH_EN ; + sr_enabled =intel_de_read (dev_priv,DSPFW3 (dev_priv)) &PINEVIEW_SELF_REFRESH_EN ;else if (IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv)) sr_enabled =intel_de_read (dev_priv,FW_BLC_SELF_VLV ) &FW_CSPWRDWNEN ;
drivers/gpu/drm/i915/i915_reg.h +1 -1
@@ -2046,7 +2046,7 @@#define DSPFW_SPRITEA_SHIFT 0#define DSPFW_SPRITEA_MASK (0x7f << 0)/* g4x */ #define DSPFW_SPRITEA_MASK_VLV (0xff << 0)/* vlv/chv */ -#define DSPFW3 _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x7003c) +#define DSPFW3 (dev_priv) _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x7003c)#define DSPFW_HPLL_SR_EN (1 << 31)#define PINEVIEW_SELF_REFRESH_EN (1 << 30)#define DSPFW_CURSOR_SR_SHIFT 24
Signature · 1 line
2.39.2
Re: [PATCH 28/65] drm/i915: pass dev_priv explicitly to DSPFW3
Quoted 2 lines · Jani Nikula
Avoid the implicit
dev_privlocal variable use, and passdev_privexplicitly to the DSPFW3 register macro.
Quoted 137 lines
Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/display/i9xx_wm.c | 27 ++++++++++--------- .../drm/i915/display/intel_display_debugfs.c | 2 +- drivers/gpu/drm/i915/i915_reg.h | 2 +- 3 files changed, 17 insertions(+), 14 deletions(-)drivers/gpu/drm/i915/display/i9xx_wm.c +15
-12@@ -149,14 +149,14 @@ static bool _intel_set_memory_cxsr(struct drm_i915_private *dev_priv, bool enablintel_uncore_write (&dev_priv->uncore,FW_BLC_SELF , enable ?FW_BLC_SELF_EN :0 );intel_uncore_posting_read (&dev_priv->uncore,FW_BLC_SELF ); }else if (IS_PINEVIEW (dev_priv)) { - val =intel_uncore_read (&dev_priv->uncore,DSPFW3 ); + val =intel_uncore_read (&dev_priv->uncore,DSPFW3 (dev_priv)); was_enabled = val &PINEVIEW_SELF_REFRESH_EN ;if (enable) val |=PINEVIEW_SELF_REFRESH_EN ;else val &= ~PINEVIEW_SELF_REFRESH_EN ; -intel_uncore_write (&dev_priv->uncore,DSPFW3 , val); -intel_uncore_posting_read (&dev_priv->uncore,DSPFW3 ); +intel_uncore_write (&dev_priv->uncore,DSPFW3 (dev_priv), val); +intel_uncore_posting_read (&dev_priv->uncore,DSPFW3 (dev_priv)); }else if (IS_I945G (dev_priv) ||IS_I945GM (dev_priv)) { was_enabled =intel_uncore_read (&dev_priv->uncore,FW_BLC_SELF ) &FW_BLC_SELF_EN ; val = enable ? _MASKED_BIT_ENABLE(FW_BLC_SELF_EN) :@@ -668,7 +668,8 @@ static void pnv_update_wm(struct drm_i915_private *dev_priv) &pnv_cursor_wm, pnv_display_wm.fifo_size, 4, latency->cursor_sr); -intel_uncore_rmw (&dev_priv->uncore,DSPFW3 ,DSPFW_CURSOR_SR_MASK , +intel_uncore_rmw (&dev_priv->uncore,DSPFW3 (dev_priv), +DSPFW_CURSOR_SR_MASK ,FW_WM (wm,CURSOR_SR ));/* Display HPLL off SR */ @@ -676,17 +677,18 @@ static void pnv_update_wm(struct drm_i915_private *dev_priv) &pnv_display_hplloff_wm, pnv_display_hplloff_wm.fifo_size, cpp, latency->display_hpll_disable); -intel_uncore_rmw (&dev_priv->uncore,DSPFW3 ,DSPFW_HPLL_SR_MASK ,FW_WM (wm,HPLL_SR )); +intel_uncore_rmw (&dev_priv->uncore,DSPFW3 (dev_priv), +DSPFW_HPLL_SR_MASK ,FW_WM (wm,HPLL_SR ));/* cursor HPLL off SR */ wm =intel_calculate_wm (dev_priv, pixel_rate, &pnv_cursor_hplloff_wm, pnv_display_hplloff_wm.fifo_size,4 , latency->cursor_hpll_disable); - reg =intel_uncore_read (&dev_priv->uncore,DSPFW3 ); + reg =intel_uncore_read (&dev_priv->uncore,DSPFW3 (dev_priv)); reg &= ~DSPFW_HPLL_CURSOR_MASK ; reg |=FW_WM (wm,HPLL_CURSOR ); -intel_uncore_write (&dev_priv->uncore,DSPFW3 , reg); +intel_uncore_write (&dev_priv->uncore,DSPFW3 (dev_priv), reg);drm_dbg_kms (&dev_priv->drm,"DSPFW3 register is %x\n" , reg);intel_set_memory_cxsr (dev_priv, true);@@ -732,7 +734,7 @@ static void g4x_write_wm_values(struct drm_i915_private *dev_priv,FW_WM (wm->pipe[PIPE_B ].plane[PLANE_SPRITE0 ],SPRITEB ) |FW_WM (wm->pipe[PIPE_A ].plane[PLANE_CURSOR ],CURSORA ) | FW_WM(wm->pipe[PIPE_A].plane[PLANE_SPRITE0], SPRITEA)); - intel_uncore_write(&dev_priv->uncore, DSPFW3, + intel_uncore_write(&dev_priv->uncore, DSPFW3(dev_priv), (wm->hpll_en ? DSPFW_HPLL_SR_EN : 0) | FW_WM(wm->sr.cursor, CURSOR_SR) | FW_WM(wm->hpll.cursor, HPLL_CURSOR) |@@ -779,7 +781,7 @@ static void vlv_write_wm_values(struct drm_i915_private *dev_priv,FW_WM_VLV (wm->pipe[PIPE_A ].plane[PLANE_SPRITE1 ],SPRITEB ) |FW_WM (wm->pipe[PIPE_A ].plane[PLANE_CURSOR ],CURSORA ) | FW_WM_VLV(wm->pipe[PIPE_A].plane[PLANE_SPRITE0], SPRITEA)); -intel_uncore_write (&dev_priv->uncore,DSPFW3 , +intel_uncore_write (&dev_priv->uncore,DSPFW3 (dev_priv),FW_WM (wm->sr.cursor,CURSOR_SR ));if (IS_CHERRYVIEW (dev_priv)) {@@ -2076,7 +2078,8 @@ static void i965_update_wm(struct drm_i915_private *dev_priv)FW_WM (8 ,CURSORA ) | FW_WM(8, PLANEC_OLD));/* update cursor SR watermark */ -intel_uncore_write (&dev_priv->uncore,DSPFW3 ,FW_WM (cursor_sr,CURSOR_SR )); +intel_uncore_write (&dev_priv->uncore,DSPFW3 (dev_priv), +FW_WM (cursor_sr,CURSOR_SR ));if (cxsr_enabled)intel_set_memory_cxsr (dev_priv, true);@@ -3537,7 +3540,7 @@ static void g4x_read_wm_values(struct drm_i915_private *dev_priv, wm->pipe[PIPE_A ].plane[PLANE_CURSOR ] =_FW_WM (tmp,CURSORA ); wm->pipe[PIPE_A ].plane[PLANE_SPRITE0 ] =_FW_WM (tmp,SPRITEA ); - tmp =intel_uncore_read (&dev_priv->uncore,DSPFW3 ); + tmp =intel_uncore_read (&dev_priv->uncore,DSPFW3 (dev_priv)); wm->hpll_en = tmp &DSPFW_HPLL_SR_EN ; wm->sr.cursor =_FW_WM (tmp,CURSOR_SR ); wm->hpll.cursor =_FW_WM (tmp,HPLL_CURSOR );@@ -3574,7 +3577,7 @@ static void vlv_read_wm_values(struct drm_i915_private *dev_priv, wm->pipe[PIPE_A ].plane[PLANE_CURSOR ] =_FW_WM (tmp,CURSORA ); wm->pipe[PIPE_A ].plane[PLANE_SPRITE0 ] =_FW_WM_VLV (tmp,SPRITEA ); - tmp =intel_uncore_read (&dev_priv->uncore,DSPFW3 ); + tmp =intel_uncore_read (&dev_priv->uncore,DSPFW3 (dev_priv)); wm->sr.cursor =_FW_WM (tmp,CURSOR_SR );if (IS_CHERRYVIEW (dev_priv)) {drivers/gpu/drm/i915/display/intel_display_debugfs.c +1
-1@@ -77,7 +77,7 @@ static int i915_sr_status(struct seq_file *m, void *unused)else if (IS_I915GM (dev_priv)) sr_enabled =intel_de_read (dev_priv,INSTPM ) &INSTPM_SELF_EN ;else if (IS_PINEVIEW (dev_priv)) - sr_enabled =intel_de_read (dev_priv,DSPFW3 ) &PINEVIEW_SELF_REFRESH_EN ; + sr_enabled =intel_de_read (dev_priv,DSPFW3 (dev_priv)) &PINEVIEW_SELF_REFRESH_EN ;else if (IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv)) sr_enabled =intel_de_read (dev_priv,FW_BLC_SELF_VLV ) &FW_CSPWRDWNEN ;drivers/gpu/drm/i915/i915_reg.h +1
-1@@ -2046,7 +2046,7 @@#define DSPFW_SPRITEA_SHIFT 0#define DSPFW_SPRITEA_MASK (0x7f << 0)/* g4x */ #define DSPFW_SPRITEA_MASK_VLV (0xff << 0)/* vlv/chv */ -#define DSPFW3 _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x7003c) +#define DSPFW3 (dev_priv) _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x7003c)#define DSPFW_HPLL_SR_EN (1 << 31)#define PINEVIEW_SELF_REFRESH_EN (1 << 30)#define DSPFW_CURSOR_SR_SHIFT 24Signature · 1 line
2.39.2
PATCH 29/65 drm/i915: pass dev_priv explicitly to PIPE_FRMCOUNT_G4X
In reply to Jani NikulaAvoid the implicit dev_priv local variable use, and pass dev_priv explicitly to the PIPE_FRMCOUNT_G4X register macro.
--- drivers/gpu/drm/i915/display/intel_vblank.c | 2 +- drivers/gpu/drm/i915/gvt/display.c | 2 +- drivers/gpu/drm/i915/i915_reg.h | 2 +- drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/display/intel_vblank.c +1 -1
@@ -125,7 +125,7 @@ u32 g4x_get_vblank_counter(struct drm_crtc *crtc)if (!vblank->max_vblank_count)return 0 ; -return intel_de_read (dev_priv,PIPE_FRMCOUNT_G4X (pipe)); +return intel_de_read (dev_priv,PIPE_FRMCOUNT_G4X (dev_priv, pipe)); }static u32 intel_crtc_scanlines_since_frame_timestamp (struct intel_crtc *crtc)
drivers/gpu/drm/i915/gvt/display.c +1 -1
@@ -647,7 +647,7 @@ static void emulate_vblank_on_pipe(struct intel_vgpu *vgpu, int pipe) }if (pipe_is_enabled (vgpu, pipe)) { -vgpu_vreg_t (vgpu,PIPE_FRMCOUNT_G4X (pipe))++; +vgpu_vreg_t (vgpu,PIPE_FRMCOUNT_G4X (dev_priv, pipe))++;intel_vgpu_trigger_virtual_event (vgpu, vblank_event[pipe]); } }
drivers/gpu/drm/i915/i915_reg.h +1 -1
@@ -2257,7 +2257,7 @@/* GM45+ just has to be different */ #define _PIPEA_FRMCOUNT_G4X 0x70040#define _PIPEA_FLIPCOUNT_G4X 0x70044 -#define PIPE_FRMCOUNT_G4X (pipe) _MMIO_PIPE2(dev_priv, pipe, _PIPEA_FRMCOUNT_G4X) +#define PIPE_FRMCOUNT_G4X (dev_priv, pipe) _MMIO_PIPE2(dev_priv, pipe, _PIPEA_FRMCOUNT_G4X)#define PIPE_FLIPCOUNT_G4X (pipe) _MMIO_PIPE2(dev_priv, pipe, _PIPEA_FLIPCOUNT_G4X)/* CHV pipe B blender */
drivers/gpu/drm/i915/intel_gvt_mmio_table.c +4 -4
@@ -142,10 +142,10 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (PIPE_FLIPCOUNT_G4X (PIPE_B ));MMIO_D (PIPE_FLIPCOUNT_G4X (PIPE_C ));MMIO_D (PIPE_FLIPCOUNT_G4X (_PIPE_EDP)); -MMIO_D (PIPE_FRMCOUNT_G4X (PIPE_A )); -MMIO_D (PIPE_FRMCOUNT_G4X (PIPE_B )); -MMIO_D (PIPE_FRMCOUNT_G4X (PIPE_C )); -MMIO_D (PIPE_FRMCOUNT_G4X (_PIPE_EDP)); +MMIO_D (PIPE_FRMCOUNT_G4X (dev_priv,PIPE_A )); +MMIO_D (PIPE_FRMCOUNT_G4X (dev_priv,PIPE_B )); +MMIO_D (PIPE_FRMCOUNT_G4X (dev_priv,PIPE_C )); +MMIO_D (PIPE_FRMCOUNT_G4X (dev_priv, _PIPE_EDP));MMIO_D (CURCNTR (dev_priv,PIPE_A ));MMIO_D (CURCNTR (dev_priv,PIPE_B ));MMIO_D (CURCNTR (dev_priv,PIPE_C ));
Signature · 1 line
2.39.2
Re: [PATCH 29/65] drm/i915: pass dev_priv explicitly to PIPE_FRMCOUNT_G4X
Quoted 2 lines · Jani Nikula
Avoid the implicit
dev_privlocal variable use, and passdev_privexplicitly to thePIPE_FRMCOUNT_G4Xregister macro.
Quoted 70 lines
Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/display/intel_vblank.c | 2 +- drivers/gpu/drm/i915/gvt/display.c | 2 +- drivers/gpu/drm/i915/i915_reg.h | 2 +- drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-)drivers/gpu/drm/i915/display/intel_vblank.c +1
-1@@ -125,7 +125,7 @@ u32 g4x_get_vblank_counter(struct drm_crtc *crtc)if (!vblank->max_vblank_count)return 0 ; -return intel_de_read (dev_priv,PIPE_FRMCOUNT_G4X (pipe)); +return intel_de_read (dev_priv,PIPE_FRMCOUNT_G4X (dev_priv, pipe)); }static u32 intel_crtc_scanlines_since_frame_timestamp (struct intel_crtc *crtc)drivers/gpu/drm/i915/gvt/display.c +1
-1@@ -647,7 +647,7 @@ static void emulate_vblank_on_pipe(struct intel_vgpu *vgpu, int pipe) }if (pipe_is_enabled (vgpu, pipe)) { -vgpu_vreg_t (vgpu,PIPE_FRMCOUNT_G4X (pipe))++; +vgpu_vreg_t (vgpu,PIPE_FRMCOUNT_G4X (dev_priv, pipe))++;intel_vgpu_trigger_virtual_event (vgpu, vblank_event[pipe]); } }drivers/gpu/drm/i915/i915_reg.h +1
-1@@ -2257,7 +2257,7 @@/* GM45+ just has to be different */ #define _PIPEA_FRMCOUNT_G4X 0x70040#define _PIPEA_FLIPCOUNT_G4X 0x70044 -#define PIPE_FRMCOUNT_G4X (pipe) _MMIO_PIPE2(dev_priv, pipe, _PIPEA_FRMCOUNT_G4X) +#define PIPE_FRMCOUNT_G4X (dev_priv, pipe) _MMIO_PIPE2(dev_priv, pipe, _PIPEA_FRMCOUNT_G4X)#define PIPE_FLIPCOUNT_G4X (pipe) _MMIO_PIPE2(dev_priv, pipe, _PIPEA_FLIPCOUNT_G4X)/* CHV pipe B blender */ drivers/gpu/drm/i915/intel_gvt_mmio_table.c +4
-4@@ -142,10 +142,10 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (PIPE_FLIPCOUNT_G4X (PIPE_B ));MMIO_D (PIPE_FLIPCOUNT_G4X (PIPE_C ));MMIO_D (PIPE_FLIPCOUNT_G4X (_PIPE_EDP)); -MMIO_D (PIPE_FRMCOUNT_G4X (PIPE_A )); -MMIO_D (PIPE_FRMCOUNT_G4X (PIPE_B )); -MMIO_D (PIPE_FRMCOUNT_G4X (PIPE_C )); -MMIO_D (PIPE_FRMCOUNT_G4X (_PIPE_EDP)); +MMIO_D (PIPE_FRMCOUNT_G4X (dev_priv,PIPE_A )); +MMIO_D (PIPE_FRMCOUNT_G4X (dev_priv,PIPE_B )); +MMIO_D (PIPE_FRMCOUNT_G4X (dev_priv,PIPE_C )); +MMIO_D (PIPE_FRMCOUNT_G4X (dev_priv, _PIPE_EDP));MMIO_D (CURCNTR (dev_priv,PIPE_A ));MMIO_D (CURCNTR (dev_priv,PIPE_B ));MMIO_D (CURCNTR (dev_priv,PIPE_C ));Signature · 1 line
2.39.2
PATCH 30/65 drm/i915: pass dev_priv explicitly to PIPE_FLIPCOUNT_G4X
In reply to Jani NikulaAvoid the implicit dev_priv local variable use, and pass dev_priv explicitly to the PIPE_FLIPCOUNT_G4X register macro.
--- drivers/gpu/drm/i915/gvt/cmd_parser.c | 2 +- drivers/gpu/drm/i915/gvt/handlers.c | 4 ++-- drivers/gpu/drm/i915/i915_reg.h | 2 +- drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/gvt/cmd_parser.c +1 -1
@@ -1437,7 +1437,7 @@ static int gen8_update_plane_mmio_from_mi_display_flip( }if (info->plane ==PLANE_PRIMARY ) -vgpu_vreg_t (vgpu,PIPE_FLIPCOUNT_G4X (info->pipe))++; +vgpu_vreg_t (vgpu,PIPE_FLIPCOUNT_G4X (dev_priv, info->pipe))++;if (info->async_flip)intel_vgpu_trigger_virtual_event (vgpu, info->event);
drivers/gpu/drm/i915/gvt/handlers.c +2 -2
@@ -1021,7 +1021,7 @@ static int pri_surf_mmio_write(struct intel_vgpu *vgpu, unsigned int offset,write_vreg (vgpu, offset, p_data, bytes);vgpu_vreg_t (vgpu,DSPSURFLIVE (dev_priv, pipe)) =vgpu_vreg (vgpu, offset); -vgpu_vreg_t (vgpu,PIPE_FLIPCOUNT_G4X (pipe))++; +vgpu_vreg_t (vgpu,PIPE_FLIPCOUNT_G4X (dev_priv, pipe))++;if (vgpu_vreg_t (vgpu,DSPCNTR (dev_priv, pipe)) &PLANE_CTL_ASYNC_FLIP )intel_vgpu_trigger_virtual_event (vgpu, event);
@@ -1063,7 +1063,7 @@ static int reg50080_mmio_write(struct intel_vgpu *vgpu,write_vreg (vgpu, offset, p_data, bytes);if (plane ==PLANE_PRIMARY ) {vgpu_vreg_t (vgpu,DSPSURFLIVE (dev_priv, pipe)) =vgpu_vreg (vgpu, offset); -vgpu_vreg_t (vgpu,PIPE_FLIPCOUNT_G4X (pipe))++; +vgpu_vreg_t (vgpu,PIPE_FLIPCOUNT_G4X (dev_priv, pipe))++; }else {vgpu_vreg_t (vgpu,SPRSURFLIVE (pipe)) =vgpu_vreg (vgpu, offset); }
drivers/gpu/drm/i915/i915_reg.h +1 -1
@@ -2258,7 +2258,7 @@#define _PIPEA_FRMCOUNT_G4X 0x70040#define _PIPEA_FLIPCOUNT_G4X 0x70044#define PIPE_FRMCOUNT_G4X (dev_priv, pipe) _MMIO_PIPE2(dev_priv, pipe, _PIPEA_FRMCOUNT_G4X) -#define PIPE_FLIPCOUNT_G4X (pipe) _MMIO_PIPE2(dev_priv, pipe, _PIPEA_FLIPCOUNT_G4X) +#define PIPE_FLIPCOUNT_G4X (dev_priv, pipe) _MMIO_PIPE2(dev_priv, pipe, _PIPEA_FLIPCOUNT_G4X)/* CHV pipe B blender */ #define _CHV_BLEND_A 0x60a00
drivers/gpu/drm/i915/intel_gvt_mmio_table.c +4 -4
@@ -138,10 +138,10 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (PIPESTAT (dev_priv,PIPE_B ));MMIO_D (PIPESTAT (dev_priv,PIPE_C ));MMIO_D (PIPESTAT (dev_priv, _PIPE_EDP)); -MMIO_D (PIPE_FLIPCOUNT_G4X (PIPE_A )); -MMIO_D (PIPE_FLIPCOUNT_G4X (PIPE_B )); -MMIO_D (PIPE_FLIPCOUNT_G4X (PIPE_C )); -MMIO_D (PIPE_FLIPCOUNT_G4X (_PIPE_EDP)); +MMIO_D (PIPE_FLIPCOUNT_G4X (dev_priv,PIPE_A )); +MMIO_D (PIPE_FLIPCOUNT_G4X (dev_priv,PIPE_B )); +MMIO_D (PIPE_FLIPCOUNT_G4X (dev_priv,PIPE_C )); +MMIO_D (PIPE_FLIPCOUNT_G4X (dev_priv, _PIPE_EDP));MMIO_D (PIPE_FRMCOUNT_G4X (dev_priv,PIPE_A ));MMIO_D (PIPE_FRMCOUNT_G4X (dev_priv,PIPE_B ));MMIO_D (PIPE_FRMCOUNT_G4X (dev_priv,PIPE_C ));
Signature · 1 line
2.39.2
Re: [PATCH 30/65] drm/i915: pass dev_priv explicitly to PIPE_FLIPCOUNT_G4X
Quoted 2 lines · Jani Nikula
Avoid the implicit
dev_privlocal variable use, and passdev_privexplicitly to thePIPE_FLIPCOUNT_G4Xregister macro.
Quoted 79 lines
Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/gvt/cmd_parser.c | 2 +- drivers/gpu/drm/i915/gvt/handlers.c | 4 ++-- drivers/gpu/drm/i915/i915_reg.h | 2 +- drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-)drivers/gpu/drm/i915/gvt/cmd_parser.c +1
-1@@ -1437,7 +1437,7 @@ static int gen8_update_plane_mmio_from_mi_display_flip( }if (info->plane ==PLANE_PRIMARY ) -vgpu_vreg_t (vgpu,PIPE_FLIPCOUNT_G4X (info->pipe))++; +vgpu_vreg_t (vgpu,PIPE_FLIPCOUNT_G4X (dev_priv, info->pipe))++;if (info->async_flip)intel_vgpu_trigger_virtual_event (vgpu, info->event);drivers/gpu/drm/i915/gvt/handlers.c +2
-2@@ -1021,7 +1021,7 @@ static int pri_surf_mmio_write(struct intel_vgpu *vgpu, unsigned int offset,write_vreg (vgpu, offset, p_data, bytes);vgpu_vreg_t (vgpu,DSPSURFLIVE (dev_priv, pipe)) =vgpu_vreg (vgpu, offset); -vgpu_vreg_t (vgpu,PIPE_FLIPCOUNT_G4X (pipe))++; +vgpu_vreg_t (vgpu,PIPE_FLIPCOUNT_G4X (dev_priv, pipe))++;if (vgpu_vreg_t (vgpu,DSPCNTR (dev_priv, pipe)) &PLANE_CTL_ASYNC_FLIP )intel_vgpu_trigger_virtual_event (vgpu, event);@@ -1063,7 +1063,7 @@ static int reg50080_mmio_write(struct intel_vgpu *vgpu,write_vreg (vgpu, offset, p_data, bytes);if (plane ==PLANE_PRIMARY ) {vgpu_vreg_t (vgpu,DSPSURFLIVE (dev_priv, pipe)) =vgpu_vreg (vgpu, offset); -vgpu_vreg_t (vgpu,PIPE_FLIPCOUNT_G4X (pipe))++; +vgpu_vreg_t (vgpu,PIPE_FLIPCOUNT_G4X (dev_priv, pipe))++; }else {vgpu_vreg_t (vgpu,SPRSURFLIVE (pipe)) =vgpu_vreg (vgpu, offset); }drivers/gpu/drm/i915/i915_reg.h +1
-1@@ -2258,7 +2258,7 @@#define _PIPEA_FRMCOUNT_G4X 0x70040#define _PIPEA_FLIPCOUNT_G4X 0x70044#define PIPE_FRMCOUNT_G4X (dev_priv, pipe) _MMIO_PIPE2(dev_priv, pipe, _PIPEA_FRMCOUNT_G4X) -#define PIPE_FLIPCOUNT_G4X (pipe) _MMIO_PIPE2(dev_priv, pipe, _PIPEA_FLIPCOUNT_G4X) +#define PIPE_FLIPCOUNT_G4X (dev_priv, pipe) _MMIO_PIPE2(dev_priv, pipe, _PIPEA_FLIPCOUNT_G4X)/* CHV pipe B blender */ #define _CHV_BLEND_A 0x60a00drivers/gpu/drm/i915/intel_gvt_mmio_table.c +4
-4@@ -138,10 +138,10 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)MMIO_D (PIPESTAT (dev_priv,PIPE_B ));MMIO_D (PIPESTAT (dev_priv,PIPE_C ));MMIO_D (PIPESTAT (dev_priv, _PIPE_EDP)); -MMIO_D (PIPE_FLIPCOUNT_G4X (PIPE_A )); -MMIO_D (PIPE_FLIPCOUNT_G4X (PIPE_B )); -MMIO_D (PIPE_FLIPCOUNT_G4X (PIPE_C )); -MMIO_D (PIPE_FLIPCOUNT_G4X (_PIPE_EDP)); +MMIO_D (PIPE_FLIPCOUNT_G4X (dev_priv,PIPE_A )); +MMIO_D (PIPE_FLIPCOUNT_G4X (dev_priv,PIPE_B )); +MMIO_D (PIPE_FLIPCOUNT_G4X (dev_priv,PIPE_C )); +MMIO_D (PIPE_FLIPCOUNT_G4X (dev_priv, _PIPE_EDP));MMIO_D (PIPE_FRMCOUNT_G4X (dev_priv,PIPE_A ));MMIO_D (PIPE_FRMCOUNT_G4X (dev_priv,PIPE_B ));MMIO_D (PIPE_FRMCOUNT_G4X (dev_priv,PIPE_C ));Signature · 1 line
2.39.2
PATCH 31/65 drm/i915: pass dev_priv explicitly to CHV_BLEND
In reply to Jani NikulaAvoid the implicit dev_priv local variable use, and pass dev_priv explicitly to the CHV_BLEND register macro.
--- drivers/gpu/drm/i915/display/intel_display.c | 3 ++- drivers/gpu/drm/i915/i915_reg.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +2 -1
@@ -2108,7 +2108,8 @@ static void valleyview_crtc_enable(struct intel_atomic_state *state,intel_de_write (dev_priv,VLV_PIPE_MSA_MISC (pipe),0 );if (IS_CHERRYVIEW (dev_priv) && pipe ==PIPE_B ) { -intel_de_write (dev_priv,CHV_BLEND (pipe),CHV_BLEND_LEGACY ); +intel_de_write (dev_priv,CHV_BLEND (dev_priv, pipe), +CHV_BLEND_LEGACY );intel_de_write (dev_priv,CHV_CANVAS (pipe),0 ); }
drivers/gpu/drm/i915/i915_reg.h +1 -1
@@ -2271,7 +2271,7 @@#define CHV_CANVAS_GREEN_MASK REG_GENMASK(19, 10)#define CHV_CANVAS_BLUE_MASK REG_GENMASK(9, 0) -#define CHV_BLEND (pipe) _MMIO_TRANS2(dev_priv, pipe, _CHV_BLEND_A) +#define CHV_BLEND (dev_priv, pipe) _MMIO_TRANS2(dev_priv, pipe, _CHV_BLEND_A)#define CHV_CANVAS (pipe) _MMIO_TRANS2(dev_priv, pipe, _CHV_CANVAS_A)/* Display/Sprite base address macros */
Signature · 1 line
2.39.2
Re: [PATCH 31/65] drm/i915: pass dev_priv explicitly to CHV_BLEND
Quoted 2 lines · Jani Nikula
Avoid the implicit
dev_privlocal variable use, and passdev_privexplicitly to theCHV_BLENDregister macro.
Quoted 37 lines
Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/display/intel_display.c | 3 ++- drivers/gpu/drm/i915/i915_reg.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/display/intel_display.c +2
-1@@ -2108,7 +2108,8 @@ static void valleyview_crtc_enable(struct intel_atomic_state *state,intel_de_write (dev_priv,VLV_PIPE_MSA_MISC (pipe),0 );if (IS_CHERRYVIEW (dev_priv) && pipe ==PIPE_B ) { -intel_de_write (dev_priv,CHV_BLEND (pipe),CHV_BLEND_LEGACY ); +intel_de_write (dev_priv,CHV_BLEND (dev_priv, pipe), +CHV_BLEND_LEGACY );intel_de_write (dev_priv,CHV_CANVAS (pipe),0 ); }drivers/gpu/drm/i915/i915_reg.h +1
-1@@ -2271,7 +2271,7 @@#define CHV_CANVAS_GREEN_MASK REG_GENMASK(19, 10)#define CHV_CANVAS_BLUE_MASK REG_GENMASK(9, 0) -#define CHV_BLEND (pipe) _MMIO_TRANS2(dev_priv, pipe, _CHV_BLEND_A) +#define CHV_BLEND (dev_priv, pipe) _MMIO_TRANS2(dev_priv, pipe, _CHV_BLEND_A)#define CHV_CANVAS (pipe) _MMIO_TRANS2(dev_priv, pipe, _CHV_CANVAS_A)/* Display/Sprite base address macros */ Signature · 1 line
2.39.2
PATCH 32/65 drm/i915: pass dev_priv explicitly to CHV_CANVAS
In reply to Jani NikulaAvoid the implicit dev_priv local variable use, and pass dev_priv explicitly to the CHV_CANVAS register macro.
--- drivers/gpu/drm/i915/display/intel_display.c | 2 +- drivers/gpu/drm/i915/i915_reg.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +1 -1
@@ -2110,7 +2110,7 @@ static void valleyview_crtc_enable(struct intel_atomic_state *state,if (IS_CHERRYVIEW (dev_priv) && pipe ==PIPE_B ) {intel_de_write (dev_priv,CHV_BLEND (dev_priv, pipe),CHV_BLEND_LEGACY ); -intel_de_write (dev_priv,CHV_CANVAS (pipe),0 ); +intel_de_write (dev_priv,CHV_CANVAS (dev_priv, pipe),0 ); } crtc->active = true;
drivers/gpu/drm/i915/i915_reg.h +1 -1
@@ -2272,7 +2272,7 @@#define CHV_CANVAS_BLUE_MASK REG_GENMASK(9, 0)#define CHV_BLEND (dev_priv, pipe) _MMIO_TRANS2(dev_priv, pipe, _CHV_BLEND_A) -#define CHV_CANVAS (pipe) _MMIO_TRANS2(dev_priv, pipe, _CHV_CANVAS_A) +#define CHV_CANVAS (dev_priv, pipe) _MMIO_TRANS2(dev_priv, pipe, _CHV_CANVAS_A)/* Display/Sprite base address macros */ #define DISP_BASEADDR_MASK (0xfffff000)
Signature · 1 line
2.39.2
Re: [PATCH 32/65] drm/i915: pass dev_priv explicitly to CHV_CANVAS
Quoted 2 lines · Jani Nikula
Avoid the implicit
dev_privlocal variable use, and passdev_privexplicitly to theCHV_CANVASregister macro.
Quoted 36 lines
Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/display/intel_display.c | 2 +- drivers/gpu/drm/i915/i915_reg.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/display/intel_display.c +1
-1@@ -2110,7 +2110,7 @@ static void valleyview_crtc_enable(struct intel_atomic_state *state,if (IS_CHERRYVIEW (dev_priv) && pipe ==PIPE_B ) {intel_de_write (dev_priv,CHV_BLEND (dev_priv, pipe),CHV_BLEND_LEGACY ); -intel_de_write (dev_priv,CHV_CANVAS (pipe),0 ); +intel_de_write (dev_priv,CHV_CANVAS (dev_priv, pipe),0 ); } crtc->active = true;drivers/gpu/drm/i915/i915_reg.h +1
-1@@ -2272,7 +2272,7 @@#define CHV_CANVAS_BLUE_MASK REG_GENMASK(9, 0)#define CHV_BLEND (dev_priv, pipe) _MMIO_TRANS2(dev_priv, pipe, _CHV_BLEND_A) -#define CHV_CANVAS (pipe) _MMIO_TRANS2(dev_priv, pipe, _CHV_CANVAS_A) +#define CHV_CANVAS (dev_priv, pipe) _MMIO_TRANS2(dev_priv, pipe, _CHV_CANVAS_A)/* Display/Sprite base address macros */ #define DISP_BASEADDR_MASK (0xfffff000)Signature · 1 line
2.39.2
PATCH 33/65 drm/i915: pass dev_priv explicitly to SWF0
In reply to Jani NikulaAvoid the implicit dev_priv local variable use, and pass dev_priv explicitly to the SWF0 register macro.
--- drivers/gpu/drm/i915/i915_reg.h | 2 +- drivers/gpu/drm/i915/i915_suspend.c | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +1 -1
@@ -2290,7 +2290,7 @@* [10:1f] all * [30:32] all */ -#define SWF0 (i) _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x70410 + (i) * 4) +#define SWF0 (dev_priv, i) _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x70410 + (i) * 4)#define SWF1 (i) _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x71410 + (i) * 4)#define SWF3 (i) _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x72414 + (i) * 4)#define SWF_ILK (i) _MMIO(0x4F000 + (i) * 4)
drivers/gpu/drm/i915/i915_suspend.c +8 -4
@@ -40,7 +40,8 @@ static void intel_save_swf(struct drm_i915_private *dev_priv)/* Scratch space */ if (GRAPHICS_VER (dev_priv) ==2 &&IS_MOBILE (dev_priv)) {for (i =0 ; i <7 ; i++) { - dev_priv->regfile.saveSWF0[i] =intel_de_read (dev_priv,SWF0 (i)); + dev_priv->regfile.saveSWF0[i] =intel_de_read (dev_priv, +SWF0 (dev_priv, i)); dev_priv->regfile.saveSWF1[i] =intel_de_read (dev_priv,SWF1 (i)); }for (i =0 ; i <3 ; i++)
@@ -50,7 +51,8 @@ static void intel_save_swf(struct drm_i915_private *dev_priv) dev_priv->regfile.saveSWF1[i] =intel_de_read (dev_priv,SWF1 (i)); }else if (HAS_GMCH (dev_priv)) {for (i =0 ; i <16 ; i++) { - dev_priv->regfile.saveSWF0[i] =intel_de_read (dev_priv,SWF0 (i)); + dev_priv->regfile.saveSWF0[i] =intel_de_read (dev_priv, +SWF0 (dev_priv, i)); dev_priv->regfile.saveSWF1[i] =intel_de_read (dev_priv,SWF1 (i)); }for (i =0 ; i <3 ; i++)
@@ -65,7 +67,8 @@ static void intel_restore_swf(struct drm_i915_private *dev_priv)/* Scratch space */ if (GRAPHICS_VER (dev_priv) ==2 &&IS_MOBILE (dev_priv)) {for (i =0 ; i <7 ; i++) { -intel_de_write (dev_priv,SWF0 (i), dev_priv->regfile.saveSWF0[i]); +intel_de_write (dev_priv,SWF0 (dev_priv, i), + dev_priv->regfile.saveSWF0[i]);intel_de_write (dev_priv,SWF1 (i), dev_priv->regfile.saveSWF1[i]); }for (i =0 ; i <3 ; i++)
@@ -75,7 +78,8 @@ static void intel_restore_swf(struct drm_i915_private *dev_priv)intel_de_write (dev_priv,SWF1 (i), dev_priv->regfile.saveSWF1[i]); }else if (HAS_GMCH (dev_priv)) {for (i =0 ; i <16 ; i++) { -intel_de_write (dev_priv,SWF0 (i), dev_priv->regfile.saveSWF0[i]); +intel_de_write (dev_priv,SWF0 (dev_priv, i), + dev_priv->regfile.saveSWF0[i]);intel_de_write (dev_priv,SWF1 (i), dev_priv->regfile.saveSWF1[i]); }for (i =0 ; i <3 ; i++)
Signature · 1 line
2.39.2
Re: [PATCH 33/65] drm/i915: pass dev_priv explicitly to SWF0
Quoted 2 lines · Jani Nikula
Avoid the implicit
dev_privlocal variable use, and passdev_privexplicitly to the SWF0 register macro.
Quoted 67 lines
Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 2 +- drivers/gpu/drm/i915/i915_suspend.c | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-)drivers/gpu/drm/i915/i915_reg.h +1
-1@@ -2290,7 +2290,7 @@* [10:1f] all * [30:32] all */ -#define SWF0 (i) _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x70410 + (i) * 4) +#define SWF0 (dev_priv, i) _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x70410 + (i) * 4)#define SWF1 (i) _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x71410 + (i) * 4)#define SWF3 (i) _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x72414 + (i) * 4)#define SWF_ILK (i) _MMIO(0x4F000 + (i) * 4)drivers/gpu/drm/i915/i915_suspend.c +8
-4@@ -40,7 +40,8 @@ static void intel_save_swf(struct drm_i915_private *dev_priv)/* Scratch space */ if (GRAPHICS_VER (dev_priv) ==2 &&IS_MOBILE (dev_priv)) {for (i =0 ; i <7 ; i++) { - dev_priv->regfile.saveSWF0[i] =intel_de_read (dev_priv,SWF0 (i)); + dev_priv->regfile.saveSWF0[i] =intel_de_read (dev_priv, +SWF0 (dev_priv, i)); dev_priv->regfile.saveSWF1[i] =intel_de_read (dev_priv,SWF1 (i)); }for (i =0 ; i <3 ; i++)@@ -50,7 +51,8 @@ static void intel_save_swf(struct drm_i915_private *dev_priv) dev_priv->regfile.saveSWF1[i] =intel_de_read (dev_priv,SWF1 (i)); }else if (HAS_GMCH (dev_priv)) {for (i =0 ; i <16 ; i++) { - dev_priv->regfile.saveSWF0[i] =intel_de_read (dev_priv,SWF0 (i)); + dev_priv->regfile.saveSWF0[i] =intel_de_read (dev_priv, +SWF0 (dev_priv, i)); dev_priv->regfile.saveSWF1[i] =intel_de_read (dev_priv,SWF1 (i)); }for (i =0 ; i <3 ; i++)@@ -65,7 +67,8 @@ static void intel_restore_swf(struct drm_i915_private *dev_priv)/* Scratch space */ if (GRAPHICS_VER (dev_priv) ==2 &&IS_MOBILE (dev_priv)) {for (i =0 ; i <7 ; i++) { -intel_de_write (dev_priv,SWF0 (i), dev_priv->regfile.saveSWF0[i]); +intel_de_write (dev_priv,SWF0 (dev_priv, i), + dev_priv->regfile.saveSWF0[i]);intel_de_write (dev_priv,SWF1 (i), dev_priv->regfile.saveSWF1[i]); }for (i =0 ; i <3 ; i++)@@ -75,7 +78,8 @@ static void intel_restore_swf(struct drm_i915_private *dev_priv)intel_de_write (dev_priv,SWF1 (i), dev_priv->regfile.saveSWF1[i]); }else if (HAS_GMCH (dev_priv)) {for (i =0 ; i <16 ; i++) { -intel_de_write (dev_priv,SWF0 (i), dev_priv->regfile.saveSWF0[i]); +intel_de_write (dev_priv,SWF0 (dev_priv, i), + dev_priv->regfile.saveSWF0[i]);intel_de_write (dev_priv,SWF1 (i), dev_priv->regfile.saveSWF1[i]); }for (i =0 ; i <3 ; i++)Signature · 1 line
2.39.2
PATCH 34/65 drm/i915: pass dev_priv explicitly to SWF1
In reply to Jani NikulaAvoid the implicit dev_priv local variable use, and pass dev_priv explicitly to the SWF1 register macro.
--- drivers/gpu/drm/i915/i915_reg.h | 2 +- drivers/gpu/drm/i915/i915_suspend.c | 18 ++++++++++++------ 2 files changed, 13 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +1 -1
@@ -2291,7 +2291,7 @@* [30:32] all */ #define SWF0 (dev_priv, i) _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x70410 + (i) * 4) -#define SWF1 (i) _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x71410 + (i) * 4) +#define SWF1 (dev_priv, i) _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x71410 + (i) * 4)#define SWF3 (i) _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x72414 + (i) * 4)#define SWF_ILK (i) _MMIO(0x4F000 + (i) * 4)
drivers/gpu/drm/i915/i915_suspend.c +12 -6
@@ -42,18 +42,21 @@ static void intel_save_swf(struct drm_i915_private *dev_priv)for (i =0 ; i <7 ; i++) { dev_priv->regfile.saveSWF0[i] =intel_de_read (dev_priv,SWF0 (dev_priv, i)); - dev_priv->regfile.saveSWF1[i] =intel_de_read (dev_priv,SWF1 (i)); + dev_priv->regfile.saveSWF1[i] =intel_de_read (dev_priv, +SWF1 (dev_priv, i)); }for (i =0 ; i <3 ; i++) dev_priv->regfile.saveSWF3[i] =intel_de_read (dev_priv,SWF3 (i)); }else if (GRAPHICS_VER (dev_priv) ==2 ) {for (i =0 ; i <7 ; i++) - dev_priv->regfile.saveSWF1[i] =intel_de_read (dev_priv,SWF1 (i)); + dev_priv->regfile.saveSWF1[i] =intel_de_read (dev_priv, +SWF1 (dev_priv, i)); }else if (HAS_GMCH (dev_priv)) {for (i =0 ; i <16 ; i++) { dev_priv->regfile.saveSWF0[i] =intel_de_read (dev_priv,SWF0 (dev_priv, i)); - dev_priv->regfile.saveSWF1[i] =intel_de_read (dev_priv,SWF1 (i)); + dev_priv->regfile.saveSWF1[i] =intel_de_read (dev_priv, +SWF1 (dev_priv, i)); }for (i =0 ; i <3 ; i++) dev_priv->regfile.saveSWF3[i] =intel_de_read (dev_priv,SWF3 (i));
@@ -69,18 +72,21 @@ static void intel_restore_swf(struct drm_i915_private *dev_priv)for (i =0 ; i <7 ; i++) {intel_de_write (dev_priv,SWF0 (dev_priv, i), dev_priv->regfile.saveSWF0[i]); -intel_de_write (dev_priv,SWF1 (i), dev_priv->regfile.saveSWF1[i]); +intel_de_write (dev_priv,SWF1 (dev_priv, i), + dev_priv->regfile.saveSWF1[i]); }for (i =0 ; i <3 ; i++)intel_de_write (dev_priv,SWF3 (i), dev_priv->regfile.saveSWF3[i]); }else if (GRAPHICS_VER (dev_priv) ==2 ) {for (i =0 ; i <7 ; i++) -intel_de_write (dev_priv,SWF1 (i), dev_priv->regfile.saveSWF1[i]); +intel_de_write (dev_priv,SWF1 (dev_priv, i), + dev_priv->regfile.saveSWF1[i]); }else if (HAS_GMCH (dev_priv)) {for (i =0 ; i <16 ; i++) {intel_de_write (dev_priv,SWF0 (dev_priv, i), dev_priv->regfile.saveSWF0[i]); -intel_de_write (dev_priv,SWF1 (i), dev_priv->regfile.saveSWF1[i]); +intel_de_write (dev_priv,SWF1 (dev_priv, i), + dev_priv->regfile.saveSWF1[i]); }for (i =0 ; i <3 ; i++)intel_de_write (dev_priv,SWF3 (i), dev_priv->regfile.saveSWF3[i]);
Signature · 1 line
2.39.2
Re: [PATCH 34/65] drm/i915: pass dev_priv explicitly to SWF1
Quoted 2 lines · Jani Nikula
Avoid the implicit
dev_privlocal variable use, and passdev_privexplicitly to the SWF1 register macro.
Quoted 77 lines
Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 2 +- drivers/gpu/drm/i915/i915_suspend.c | 18 ++++++++++++------ 2 files changed, 13 insertions(+), 7 deletions(-)drivers/gpu/drm/i915/i915_reg.h +1
-1@@ -2291,7 +2291,7 @@* [30:32] all */ #define SWF0 (dev_priv, i) _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x70410 + (i) * 4) -#define SWF1 (i) _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x71410 + (i) * 4) +#define SWF1 (dev_priv, i) _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x71410 + (i) * 4)#define SWF3 (i) _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x72414 + (i) * 4)#define SWF_ILK (i) _MMIO(0x4F000 + (i) * 4)drivers/gpu/drm/i915/i915_suspend.c +12
-6@@ -42,18 +42,21 @@ static void intel_save_swf(struct drm_i915_private *dev_priv)for (i =0 ; i <7 ; i++) { dev_priv->regfile.saveSWF0[i] =intel_de_read (dev_priv,SWF0 (dev_priv, i)); - dev_priv->regfile.saveSWF1[i] =intel_de_read (dev_priv,SWF1 (i)); + dev_priv->regfile.saveSWF1[i] =intel_de_read (dev_priv, +SWF1 (dev_priv, i)); }for (i =0 ; i <3 ; i++) dev_priv->regfile.saveSWF3[i] =intel_de_read (dev_priv,SWF3 (i)); }else if (GRAPHICS_VER (dev_priv) ==2 ) {for (i =0 ; i <7 ; i++) - dev_priv->regfile.saveSWF1[i] =intel_de_read (dev_priv,SWF1 (i)); + dev_priv->regfile.saveSWF1[i] =intel_de_read (dev_priv, +SWF1 (dev_priv, i)); }else if (HAS_GMCH (dev_priv)) {for (i =0 ; i <16 ; i++) { dev_priv->regfile.saveSWF0[i] =intel_de_read (dev_priv,SWF0 (dev_priv, i)); - dev_priv->regfile.saveSWF1[i] =intel_de_read (dev_priv,SWF1 (i)); + dev_priv->regfile.saveSWF1[i] =intel_de_read (dev_priv, +SWF1 (dev_priv, i)); }for (i =0 ; i <3 ; i++) dev_priv->regfile.saveSWF3[i] =intel_de_read (dev_priv,SWF3 (i));@@ -69,18 +72,21 @@ static void intel_restore_swf(struct drm_i915_private *dev_priv)for (i =0 ; i <7 ; i++) {intel_de_write (dev_priv,SWF0 (dev_priv, i), dev_priv->regfile.saveSWF0[i]); -intel_de_write (dev_priv,SWF1 (i), dev_priv->regfile.saveSWF1[i]); +intel_de_write (dev_priv,SWF1 (dev_priv, i), + dev_priv->regfile.saveSWF1[i]); }for (i =0 ; i <3 ; i++)intel_de_write (dev_priv,SWF3 (i), dev_priv->regfile.saveSWF3[i]); }else if (GRAPHICS_VER (dev_priv) ==2 ) {for (i =0 ; i <7 ; i++) -intel_de_write (dev_priv,SWF1 (i), dev_priv->regfile.saveSWF1[i]); +intel_de_write (dev_priv,SWF1 (dev_priv, i), + dev_priv->regfile.saveSWF1[i]); }else if (HAS_GMCH (dev_priv)) {for (i =0 ; i <16 ; i++) {intel_de_write (dev_priv,SWF0 (dev_priv, i), dev_priv->regfile.saveSWF0[i]); -intel_de_write (dev_priv,SWF1 (i), dev_priv->regfile.saveSWF1[i]); +intel_de_write (dev_priv,SWF1 (dev_priv, i), + dev_priv->regfile.saveSWF1[i]); }for (i =0 ; i <3 ; i++)intel_de_write (dev_priv,SWF3 (i), dev_priv->regfile.saveSWF3[i]);Signature · 1 line
2.39.2
PATCH 35/65 drm/i915: pass dev_priv explicitly to SWF3
In reply to Jani NikulaAvoid the implicit dev_priv local variable use, and pass dev_priv explicitly to the SWF3 register macro.
--- drivers/gpu/drm/i915/i915_reg.h | 2 +- drivers/gpu/drm/i915/i915_suspend.c | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +1 -1
@@ -2292,7 +2292,7 @@*/ #define SWF0 (dev_priv, i) _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x70410 + (i) * 4)#define SWF1 (dev_priv, i) _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x71410 + (i) * 4) -#define SWF3 (i) _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x72414 + (i) * 4) +#define SWF3 (dev_priv, i) _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x72414 + (i) * 4)#define SWF_ILK (i) _MMIO(0x4F000 + (i) * 4)/* Pipe B */
drivers/gpu/drm/i915/i915_suspend.c +8 -4
@@ -46,7 +46,8 @@ static void intel_save_swf(struct drm_i915_private *dev_priv) SWF1(dev_priv, i)); }for (i =0 ; i <3 ; i++) - dev_priv->regfile.saveSWF3[i] =intel_de_read (dev_priv,SWF3 (i)); + dev_priv->regfile.saveSWF3[i] =intel_de_read (dev_priv, +SWF3 (dev_priv, i)); }else if (GRAPHICS_VER (dev_priv) ==2 ) {for (i =0 ; i <7 ; i++) dev_priv->regfile.saveSWF1[i] = intel_de_read(dev_priv,
@@ -59,7 +60,8 @@ static void intel_save_swf(struct drm_i915_private *dev_priv) SWF1(dev_priv, i)); }for (i =0 ; i <3 ; i++) - dev_priv->regfile.saveSWF3[i] =intel_de_read (dev_priv,SWF3 (i)); + dev_priv->regfile.saveSWF3[i] =intel_de_read (dev_priv, +SWF3 (dev_priv, i)); } }
@@ -76,7 +78,8 @@ static void intel_restore_swf(struct drm_i915_private *dev_priv) dev_priv->regfile.saveSWF1[i]); }for (i =0 ; i <3 ; i++) -intel_de_write (dev_priv,SWF3 (i), dev_priv->regfile.saveSWF3[i]); +intel_de_write (dev_priv,SWF3 (dev_priv, i), + dev_priv->regfile.saveSWF3[i]); }else if (GRAPHICS_VER (dev_priv) ==2 ) {for (i =0 ; i <7 ; i++) intel_de_write(dev_priv, SWF1(dev_priv, i),
@@ -89,7 +92,8 @@ static void intel_restore_swf(struct drm_i915_private *dev_priv) dev_priv->regfile.saveSWF1[i]); }for (i =0 ; i <3 ; i++) -intel_de_write (dev_priv,SWF3 (i), dev_priv->regfile.saveSWF3[i]); +intel_de_write (dev_priv,SWF3 (dev_priv, i), + dev_priv->regfile.saveSWF3[i]); } }
Signature · 1 line
2.39.2
Re: [PATCH 35/65] drm/i915: pass dev_priv explicitly to SWF3
Quoted 2 lines · Jani Nikula
Avoid the implicit
dev_privlocal variable use, and passdev_privexplicitly to the SWF3 register macro.
Quoted 67 lines
Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 2 +- drivers/gpu/drm/i915/i915_suspend.c | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-)drivers/gpu/drm/i915/i915_reg.h +1
-1@@ -2292,7 +2292,7 @@*/ #define SWF0 (dev_priv, i) _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x70410 + (i) * 4)#define SWF1 (dev_priv, i) _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x71410 + (i) * 4) -#define SWF3 (i) _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x72414 + (i) * 4) +#define SWF3 (dev_priv, i) _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x72414 + (i) * 4)#define SWF_ILK (i) _MMIO(0x4F000 + (i) * 4)/* Pipe B */ drivers/gpu/drm/i915/i915_suspend.c +8
-4@@ -46,7 +46,8 @@ static void intel_save_swf(struct drm_i915_private *dev_priv) SWF1(dev_priv, i)); }for (i =0 ; i <3 ; i++) - dev_priv->regfile.saveSWF3[i] =intel_de_read (dev_priv,SWF3 (i)); + dev_priv->regfile.saveSWF3[i] =intel_de_read (dev_priv, +SWF3 (dev_priv, i)); }else if (GRAPHICS_VER (dev_priv) ==2 ) {for (i =0 ; i <7 ; i++) dev_priv->regfile.saveSWF1[i] = intel_de_read(dev_priv,@@ -59,7 +60,8 @@ static void intel_save_swf(struct drm_i915_private *dev_priv) SWF1(dev_priv, i)); }for (i =0 ; i <3 ; i++) - dev_priv->regfile.saveSWF3[i] =intel_de_read (dev_priv,SWF3 (i)); + dev_priv->regfile.saveSWF3[i] =intel_de_read (dev_priv, +SWF3 (dev_priv, i)); } }@@ -76,7 +78,8 @@ static void intel_restore_swf(struct drm_i915_private *dev_priv) dev_priv->regfile.saveSWF1[i]); }for (i =0 ; i <3 ; i++) -intel_de_write (dev_priv,SWF3 (i), dev_priv->regfile.saveSWF3[i]); +intel_de_write (dev_priv,SWF3 (dev_priv, i), + dev_priv->regfile.saveSWF3[i]); }else if (GRAPHICS_VER (dev_priv) ==2 ) {for (i =0 ; i <7 ; i++) intel_de_write(dev_priv, SWF1(dev_priv, i),@@ -89,7 +92,8 @@ static void intel_restore_swf(struct drm_i915_private *dev_priv) dev_priv->regfile.saveSWF1[i]); }for (i =0 ; i <3 ; i++) -intel_de_write (dev_priv,SWF3 (i), dev_priv->regfile.saveSWF3[i]); +intel_de_write (dev_priv,SWF3 (dev_priv, i), + dev_priv->regfile.saveSWF3[i]); } }Signature · 1 line
2.39.2
PATCH 36/65 drm/i915: pass dev_priv explicitly to _PIPEBDSL
In reply to Jani NikulaAvoid the implicit dev_priv local variable use, and pass dev_priv explicitly to the _PIPEBDSL register macro.
--- drivers/gpu/drm/i915/i915_reg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_reg.h +1 -1
@@ -2296,7 +2296,7 @@#define SWF_ILK (i) _MMIO(0x4F000 + (i) * 4)/* Pipe B */ -#define _PIPEBDSL (DISPLAY_MMIO_BASE(dev_priv) + 0x71000) +#define _PIPEBDSL (dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x71000)#define _TRANSBCONF (DISPLAY_MMIO_BASE(dev_priv) + 0x71008)#define _PIPEBSTAT (DISPLAY_MMIO_BASE(dev_priv) + 0x71024)#define _PIPEBFRAMEHIGH 0x71040
Signature · 1 line
2.39.2
Re: [PATCH 36/65] drm/i915: pass dev_priv explicitly to _PIPEBDSL
Quoted 13 lines · Jani Nikula
Avoid the implicit
dev_privlocal variable use, and passdev_privexplicitly to the_PIPEBDSLregister 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 2299
Quoted 5 lines
drivers/gpu/drm/i915/i915_reg.h +1
-1@@ -2296,7 +2296,7 @@#define SWF_ILK (i) _MMIO(0x4F000 + (i) * 4)/* Pipe B */ -#define _PIPEBDSL (DISPLAY_MMIO_BASE(dev_priv) + 0x71000) +#define _PIPEBDSL (dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x71000)
should we simply remove this reg for now, or one of those cases that are getting added as we speak?
anyone to Cc here then?
but up to you:
Quoted 6 lines
drivers/gpu/drm/i915/i915_reg.h +0
-0#define _TRANSBCONF (DISPLAY_MMIO_BASE(dev_priv) + 0x71008)#define _PIPEBSTAT (DISPLAY_MMIO_BASE(dev_priv) + 0x71024)#define _PIPEBFRAMEHIGH 0x71040Signature · 1 line
2.39.2
PATCH 37/65 drm/i915: pass dev_priv explicitly to _TRANSBCONF
In reply to Jani NikulaAvoid the implicit dev_priv local variable use, and pass dev_priv explicitly to the _TRANSBCONF register macro.
--- drivers/gpu/drm/i915/i915_reg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_reg.h +1 -1
@@ -2297,7 +2297,7 @@/* Pipe B */ #define _PIPEBDSL (dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x71000) -#define _TRANSBCONF (DISPLAY_MMIO_BASE(dev_priv) + 0x71008) +#define _TRANSBCONF (dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x71008)#define _PIPEBSTAT (DISPLAY_MMIO_BASE(dev_priv) + 0x71024)#define _PIPEBFRAMEHIGH 0x71040#define _PIPEBFRAMEPIXEL 0x71044
Signature · 1 line
2.39.2
Re: [PATCH 37/65] drm/i915: pass dev_priv explicitly to _TRANSBCONF
Quoted 13 lines · Jani Nikula
Avoid the implicit
dev_privlocal variable use, and passdev_privexplicitly to the_TRANSBCONFregister 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 2300
Quoted 5 lines
drivers/gpu/drm/i915/i915_reg.h +1
-1@@ -2297,7 +2297,7 @@/* Pipe B */ #define _PIPEBDSL (dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x71000) -#define _TRANSBCONF (DISPLAY_MMIO_BASE(dev_priv) + 0x71008) +#define _TRANSBCONF (dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x71008)
ditto
Quoted 6 lines
drivers/gpu/drm/i915/i915_reg.h +0
-0#define _PIPEBSTAT (DISPLAY_MMIO_BASE(dev_priv) + 0x71024)#define _PIPEBFRAMEHIGH 0x71040#define _PIPEBFRAMEPIXEL 0x71044Signature · 1 line
2.39.2
PATCH 38/65 drm/i915: pass dev_priv explicitly to _PIPEBSTAT
In reply to Jani NikulaAvoid the implicit dev_priv local variable use, and pass dev_priv explicitly to the _PIPEBSTAT register macro.
--- drivers/gpu/drm/i915/i915_reg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_reg.h +1 -1
@@ -2298,7 +2298,7 @@/* Pipe B */ #define _PIPEBDSL (dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x71000)#define _TRANSBCONF (dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x71008) -#define _PIPEBSTAT (DISPLAY_MMIO_BASE(dev_priv) + 0x71024) +#define _PIPEBSTAT (dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x71024)#define _PIPEBFRAMEHIGH 0x71040#define _PIPEBFRAMEPIXEL 0x71044#define _PIPEB_FRMCOUNT_G4X (DISPLAY_MMIO_BASE(dev_priv) + 0x71040)
Signature · 1 line
2.39.2
Re: [PATCH 38/65] drm/i915: pass dev_priv explicitly to _PIPEBSTAT
Quoted 13 lines · Jani Nikula
Avoid the implicit
dev_privlocal variable use, and passdev_privexplicitly to the_PIPEBSTATregister 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 2301
Quoted 5 lines
drivers/gpu/drm/i915/i915_reg.h +1
-1@@ -2298,7 +2298,7 @@/* Pipe B */ #define _PIPEBDSL (dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x71000)#define _TRANSBCONF (dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x71008) -#define _PIPEBSTAT (DISPLAY_MMIO_BASE(dev_priv) + 0x71024) +#define _PIPEBSTAT (dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x71024)
ditto
Quoted 6 lines
drivers/gpu/drm/i915/i915_reg.h +0
-0#define _PIPEBFRAMEHIGH 0x71040#define _PIPEBFRAMEPIXEL 0x71044#define _PIPEB_FRMCOUNT_G4X (DISPLAY_MMIO_BASE(dev_priv) + 0x71040)Signature · 1 line
2.39.2
PATCH 39/65 drm/i915: pass dev_priv explicitly to _PIPEB_FRMCOUNT_G4X
In reply to Jani NikulaAvoid the implicit dev_priv local variable use, and pass dev_priv explicitly to the _PIPEB_FRMCOUNT_G4X register macro.
--- drivers/gpu/drm/i915/i915_reg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_reg.h +1 -1
@@ -2301,7 +2301,7 @@#define _PIPEBSTAT (dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x71024)#define _PIPEBFRAMEHIGH 0x71040#define _PIPEBFRAMEPIXEL 0x71044 -#define _PIPEB_FRMCOUNT_G4X (DISPLAY_MMIO_BASE(dev_priv) + 0x71040) +#define _PIPEB_FRMCOUNT_G4X (dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x71040)#define _PIPEB_FLIPCOUNT_G4X (DISPLAY_MMIO_BASE(dev_priv) + 0x71044)
Signature · 1 line
2.39.2
Re: [PATCH 39/65] drm/i915: pass dev_priv explicitly to _PIPEB_FRMCOUNT_G4X
Quoted 13 lines · Jani Nikula
Avoid the implicit
dev_privlocal variable use, and passdev_privexplicitly to the_PIPEB_FRMCOUNT_G4Xregister 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 2304
Quoted 5 lines
drivers/gpu/drm/i915/i915_reg.h +1
-1@@ -2301,7 +2301,7 @@#define _PIPEBSTAT (dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x71024)#define _PIPEBFRAMEHIGH 0x71040#define _PIPEBFRAMEPIXEL 0x71044 -#define _PIPEB_FRMCOUNT_G4X (DISPLAY_MMIO_BASE(dev_priv) + 0x71040) +#define _PIPEB_FRMCOUNT_G4X (dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x71040)
ditto
Quoted 6 lines
drivers/gpu/drm/i915/i915_reg.h +0
-0#define _PIPEB_FLIPCOUNT_G4X (DISPLAY_MMIO_BASE(dev_priv) + 0x71044)Signature · 1 line
2.39.2
PATCH 40/65 drm/i915: pass dev_priv explicitly to _PIPEB_FLIPCOUNT_G4X
In reply to Jani NikulaAvoid the implicit dev_priv local variable use, and pass dev_priv explicitly to the _PIPEB_FLIPCOUNT_G4X register macro.
--- drivers/gpu/drm/i915/i915_reg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_reg.h +1 -1
@@ -2302,7 +2302,7 @@#define _PIPEBFRAMEHIGH 0x71040#define _PIPEBFRAMEPIXEL 0x71044#define _PIPEB_FRMCOUNT_G4X (dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x71040) -#define _PIPEB_FLIPCOUNT_G4X (DISPLAY_MMIO_BASE(dev_priv) + 0x71044) +#define _PIPEB_FLIPCOUNT_G4X (dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x71044)/* Display B control */
Signature · 1 line
2.39.2
Re: [PATCH 40/65] drm/i915: pass dev_priv explicitly to _PIPEB_FLIPCOUNT_G4X
Quoted 13 lines · Jani Nikula
Avoid the implicit
dev_privlocal variable use, and passdev_privexplicitly to the_PIPEB_FLIPCOUNT_G4Xregister 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 2305
Quoted 5 lines
drivers/gpu/drm/i915/i915_reg.h +1
-1@@ -2302,7 +2302,7 @@#define _PIPEBFRAMEHIGH 0x71040#define _PIPEBFRAMEPIXEL 0x71044#define _PIPEB_FRMCOUNT_G4X (dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x71040) -#define _PIPEB_FLIPCOUNT_G4X (DISPLAY_MMIO_BASE(dev_priv) + 0x71044) +#define _PIPEB_FLIPCOUNT_G4X (dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x71044)
G4X? and many cases... starting to have a feeling that those are really not going to be used so soon and should be removed.
but, again, up to you:
Quoted 6 lines
drivers/gpu/drm/i915/i915_reg.h +0
-0/* Display B control */ Signature · 1 line
2.39.2
PATCH 41/65 drm/i915: pass dev_priv explicitly to _DSPBCNTR
In reply to Jani NikulaAvoid the implicit dev_priv local variable use, and pass dev_priv explicitly to the _DSPBCNTR register macro.
--- drivers/gpu/drm/i915/i915_reg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_reg.h +1 -1
@@ -2306,7 +2306,7 @@/* Display B control */ -#define _DSPBCNTR (DISPLAY_MMIO_BASE(dev_priv) + 0x71180) +#define _DSPBCNTR (dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x71180)#define DISP_ALPHA_TRANS_ENABLE REG_BIT(15)#define DISP_SPRITE_ABOVE_OVERLAY REG_BIT(0)#define _DSPBADDR (DISPLAY_MMIO_BASE(dev_priv) + 0x71184)
Signature · 1 line
2.39.2
Re: [PATCH 41/65] drm/i915: pass dev_priv explicitly to _DSPBCNTR
Quoted 13 lines · Jani Nikula
Avoid the implicit
dev_privlocal variable use, and passdev_privexplicitly to the_DSPBCNTRregister 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 2309
Quoted 5 lines
drivers/gpu/drm/i915/i915_reg.h +1
-1@@ -2306,7 +2306,7 @@/* Display B control */ -#define _DSPBCNTR (DISPLAY_MMIO_BASE(dev_priv) + 0x71180) +#define _DSPBCNTR (dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x71180)
ditto
Quoted 6 lines
drivers/gpu/drm/i915/i915_reg.h +0
-0#define DISP_ALPHA_TRANS_ENABLE REG_BIT(15)#define DISP_SPRITE_ABOVE_OVERLAY REG_BIT(0)#define _DSPBADDR (DISPLAY_MMIO_BASE(dev_priv) + 0x71184)Signature · 1 line
2.39.2
PATCH 42/65 drm/i915: pass dev_priv explicitly to _DSPBADDR
In reply to Jani NikulaAvoid the implicit dev_priv local variable use, and pass dev_priv explicitly to the _DSPBADDR register macro.
--- drivers/gpu/drm/i915/i915_reg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_reg.h +1 -1
@@ -2309,7 +2309,7 @@#define _DSPBCNTR (dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x71180)#define DISP_ALPHA_TRANS_ENABLE REG_BIT(15)#define DISP_SPRITE_ABOVE_OVERLAY REG_BIT(0) -#define _DSPBADDR (DISPLAY_MMIO_BASE(dev_priv) + 0x71184) +#define _DSPBADDR (dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x71184)#define _DSPBSTRIDE (DISPLAY_MMIO_BASE(dev_priv) + 0x71188)#define _DSPBPOS (DISPLAY_MMIO_BASE(dev_priv) + 0x7118C)#define _DSPBSIZE (DISPLAY_MMIO_BASE(dev_priv) + 0x71190)
Signature · 1 line
2.39.2
Re: [PATCH 42/65] drm/i915: pass dev_priv explicitly to _DSPBADDR
Quoted 13 lines · Jani Nikula
Avoid the implicit
dev_privlocal variable use, and passdev_privexplicitly to the_DSPBADDRregister 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 2312
Quoted 5 lines
drivers/gpu/drm/i915/i915_reg.h +1
-1@@ -2309,7 +2309,7 @@#define _DSPBCNTR (dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x71180)#define DISP_ALPHA_TRANS_ENABLE REG_BIT(15)#define DISP_SPRITE_ABOVE_OVERLAY REG_BIT(0) -#define _DSPBADDR (DISPLAY_MMIO_BASE(dev_priv) + 0x71184) +#define _DSPBADDR (dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x71184)
ditto
Quoted 6 lines
drivers/gpu/drm/i915/i915_reg.h +0
-0#define _DSPBSTRIDE (DISPLAY_MMIO_BASE(dev_priv) + 0x71188)#define _DSPBPOS (DISPLAY_MMIO_BASE(dev_priv) + 0x7118C)#define _DSPBSIZE (DISPLAY_MMIO_BASE(dev_priv) + 0x71190)Signature · 1 line
2.39.2
PATCH 43/65 drm/i915: pass dev_priv explicitly to _DSPBSTRIDE
In reply to Jani NikulaAvoid the implicit dev_priv local variable use, and pass dev_priv explicitly to the _DSPBSTRIDE register macro.
--- drivers/gpu/drm/i915/i915_reg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_reg.h +1 -1
@@ -2310,7 +2310,7 @@#define DISP_ALPHA_TRANS_ENABLE REG_BIT(15)#define DISP_SPRITE_ABOVE_OVERLAY REG_BIT(0)#define _DSPBADDR (dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x71184) -#define _DSPBSTRIDE (DISPLAY_MMIO_BASE(dev_priv) + 0x71188) +#define _DSPBSTRIDE (dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x71188)#define _DSPBPOS (DISPLAY_MMIO_BASE(dev_priv) + 0x7118C)#define _DSPBSIZE (DISPLAY_MMIO_BASE(dev_priv) + 0x71190)#define _DSPBSURF (DISPLAY_MMIO_BASE(dev_priv) + 0x7119C)
Signature · 1 line
2.39.2
Re: [PATCH 43/65] drm/i915: pass dev_priv explicitly to _DSPBSTRIDE
Quoted 13 lines · Jani Nikula
Avoid the implicit
dev_privlocal variable use, and passdev_privexplicitly to the_DSPBSTRIDEregister 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 2313
Quoted 5 lines
drivers/gpu/drm/i915/i915_reg.h +1
-1@@ -2310,7 +2310,7 @@#define DISP_ALPHA_TRANS_ENABLE REG_BIT(15)#define DISP_SPRITE_ABOVE_OVERLAY REG_BIT(0)#define _DSPBADDR (dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x71184) -#define _DSPBSTRIDE (DISPLAY_MMIO_BASE(dev_priv) + 0x71188) +#define _DSPBSTRIDE (dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x71188)
ditto
Quoted 6 lines
drivers/gpu/drm/i915/i915_reg.h +0
-0#define _DSPBPOS (DISPLAY_MMIO_BASE(dev_priv) + 0x7118C)#define _DSPBSIZE (DISPLAY_MMIO_BASE(dev_priv) + 0x71190)#define _DSPBSURF (DISPLAY_MMIO_BASE(dev_priv) + 0x7119C)Signature · 1 line
2.39.2
PATCH 44/65 drm/i915: pass dev_priv explicitly to _DSPBPOS
In reply to Jani NikulaAvoid the implicit dev_priv local variable use, and pass dev_priv explicitly to the _DSPBPOS register macro.
--- drivers/gpu/drm/i915/i915_reg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_reg.h +1 -1
@@ -2311,7 +2311,7 @@#define DISP_SPRITE_ABOVE_OVERLAY REG_BIT(0)#define _DSPBADDR (dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x71184)#define _DSPBSTRIDE (dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x71188) -#define _DSPBPOS (DISPLAY_MMIO_BASE(dev_priv) + 0x7118C) +#define _DSPBPOS (dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x7118C)#define _DSPBSIZE (DISPLAY_MMIO_BASE(dev_priv) + 0x71190)#define _DSPBSURF (DISPLAY_MMIO_BASE(dev_priv) + 0x7119C)#define _DSPBTILEOFF (DISPLAY_MMIO_BASE(dev_priv) + 0x711A4)
Signature · 1 line
2.39.2
Re: [PATCH 44/65] drm/i915: pass dev_priv explicitly to _DSPBPOS
Quoted 13 lines · Jani Nikula
Avoid the implicit
dev_privlocal variable use, and passdev_privexplicitly to the_DSPBPOSregister 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 2314
Quoted 5 lines
drivers/gpu/drm/i915/i915_reg.h +1
-1@@ -2311,7 +2311,7 @@#define DISP_SPRITE_ABOVE_OVERLAY REG_BIT(0)#define _DSPBADDR (dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x71184)#define _DSPBSTRIDE (dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x71188) -#define _DSPBPOS (DISPLAY_MMIO_BASE(dev_priv) + 0x7118C) +#define _DSPBPOS (dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x7118C)
ditto
Quoted 6 lines
drivers/gpu/drm/i915/i915_reg.h +0
-0#define _DSPBSIZE (DISPLAY_MMIO_BASE(dev_priv) + 0x71190)#define _DSPBSURF (DISPLAY_MMIO_BASE(dev_priv) + 0x7119C)#define _DSPBTILEOFF (DISPLAY_MMIO_BASE(dev_priv) + 0x711A4)Signature · 1 line
2.39.2
PATCH 45/65 drm/i915: pass dev_priv explicitly to _DSPBSIZE
In reply to Jani NikulaAvoid the implicit dev_priv local variable use, and pass dev_priv explicitly to the _DSPBSIZE register macro.
--- drivers/gpu/drm/i915/i915_reg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
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)#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
Re: [PATCH 45/65] drm/i915: pass dev_priv explicitly to _DSPBSIZE
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
-0
drivers/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 the dev_priv...
but again, up to you
Quoted 6 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
Re: [PATCH 45/65] drm/i915: pass dev_priv explicitly to _DSPBSIZE
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 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
PATCH 46/65 drm/i915: pass dev_priv explicitly to _DSPBSURF
In reply to Jani NikulaAvoid the implicit dev_priv local variable use, and pass dev_priv explicitly to the _DSPBSURF register macro.
--- drivers/gpu/drm/i915/gvt/handlers.c | 2 +- drivers/gpu/drm/i915/i915_reg.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/gvt/handlers.c +1 -1
@@ -1009,7 +1009,7 @@ static int south_chicken2_mmio_write(struct intel_vgpu *vgpu, }#define DSPSURF_TO_PIPE (offset) \ - calc_index(offset, _DSPASURF, _DSPBSURF, 0, DSPSURF(dev_priv, PIPE_C)) + calc_index(offset, _DSPASURF, _DSPBSURF(dev_priv), 0, DSPSURF(dev_priv, PIPE_C))static int pri_surf_mmio_write (struct intel_vgpu *vgpu,unsigned int offset,void *p_data,unsigned int bytes)
drivers/gpu/drm/i915/i915_reg.h +1 -1
@@ -2313,7 +2313,7 @@#define _DSPBSTRIDE (dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x71188)#define _DSPBPOS (dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x7118C)#define _DSPBSIZE (dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x71190) -#define _DSPBSURF (DISPLAY_MMIO_BASE(dev_priv) + 0x7119C) +#define _DSPBSURF (dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x7119C)#define _DSPBTILEOFF (DISPLAY_MMIO_BASE(dev_priv) + 0x711A4)#define _DSPBOFFSET (DISPLAY_MMIO_BASE(dev_priv) + 0x711A4)#define _DSPBSURFLIVE (DISPLAY_MMIO_BASE(dev_priv) + 0x711AC)
Signature · 1 line
2.39.2
Re: [PATCH 46/65] drm/i915: pass dev_priv explicitly to _DSPBSURF
Quoted 2 lines · Jani Nikula
Avoid the implicit
dev_privlocal variable use, and passdev_privexplicitly to the_DSPBSURFregister macro.
Quoted 36 lines
Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/gvt/handlers.c | 2 +- drivers/gpu/drm/i915/i915_reg.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/gvt/handlers.c +1
-1@@ -1009,7 +1009,7 @@ static int south_chicken2_mmio_write(struct intel_vgpu *vgpu, }#define DSPSURF_TO_PIPE (offset) \ - calc_index(offset, _DSPASURF, _DSPBSURF, 0, DSPSURF(dev_priv, PIPE_C)) + calc_index(offset, _DSPASURF, _DSPBSURF(dev_priv), 0, DSPSURF(dev_priv, PIPE_C))static int pri_surf_mmio_write (struct intel_vgpu *vgpu,unsigned int offset,void *p_data,unsigned int bytes)drivers/gpu/drm/i915/i915_reg.h +1
-1@@ -2313,7 +2313,7 @@#define _DSPBSTRIDE (dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x71188)#define _DSPBPOS (dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x7118C)#define _DSPBSIZE (dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x71190) -#define _DSPBSURF (DISPLAY_MMIO_BASE(dev_priv) + 0x7119C) +#define _DSPBSURF (dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x7119C)#define _DSPBTILEOFF (DISPLAY_MMIO_BASE(dev_priv) + 0x711A4)#define _DSPBOFFSET (DISPLAY_MMIO_BASE(dev_priv) + 0x711A4)#define _DSPBSURFLIVE (DISPLAY_MMIO_BASE(dev_priv) + 0x711AC)Signature · 1 line
2.39.2
PATCH 47/65 drm/i915: pass dev_priv explicitly to _DSPBTILEOFF
In reply to Jani NikulaAvoid the implicit dev_priv local variable use, and pass dev_priv explicitly to the _DSPBTILEOFF register macro.
--- drivers/gpu/drm/i915/i915_reg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
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)#define _DSPBOFFSET (DISPLAY_MMIO_BASE(dev_priv) + 0x711A4)#define _DSPBSURFLIVE (DISPLAY_MMIO_BASE(dev_priv) + 0x711AC)
Signature · 1 line
2.39.2
Re: [PATCH 47/65] drm/i915: pass dev_priv explicitly to _DSPBTILEOFF
Quoted 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
PATCH 48/65 drm/i915: pass dev_priv explicitly to _DSPBOFFSET
In reply to Jani NikulaAvoid the implicit dev_priv local variable use, and pass dev_priv explicitly to the _DSPBOFFSET register macro.
--- drivers/gpu/drm/i915/i915_reg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_reg.h +1 -1
@@ -2315,7 +2315,7 @@#define _DSPBSIZE (dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x71190)#define _DSPBSURF (dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x7119C)#define _DSPBTILEOFF (dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x711A4) -#define _DSPBOFFSET (DISPLAY_MMIO_BASE(dev_priv) + 0x711A4) +#define _DSPBOFFSET (dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x711A4)#define _DSPBSURFLIVE (DISPLAY_MMIO_BASE(dev_priv) + 0x711AC)/* ICL DSI 0 and 1 */
Signature · 1 line
2.39.2
Re: [PATCH 48/65] drm/i915: pass dev_priv explicitly to _DSPBOFFSET
Quoted 13 lines · Jani Nikula
Avoid the implicit
dev_privlocal variable use, and passdev_privexplicitly to the_DSPBOFFSETregister 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 2318
Quoted 5 lines
drivers/gpu/drm/i915/i915_reg.h +1
-1@@ -2315,7 +2315,7 @@#define _DSPBSIZE (dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x71190)#define _DSPBSURF (dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x7119C)#define _DSPBTILEOFF (dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x711A4) -#define _DSPBOFFSET (DISPLAY_MMIO_BASE(dev_priv) + 0x711A4) +#define _DSPBOFFSET (dev_priv) (DISPLAY_MMIO_BASE(dev_priv) + 0x711A4)
ditto
Quoted 6 lines
drivers/gpu/drm/i915/i915_reg.h +0
-0#define _DSPBSURFLIVE (DISPLAY_MMIO_BASE(dev_priv) + 0x711AC)/* ICL DSI 0 and 1 */ Signature · 1 line
2.39.2
PATCH 49/65 drm/i915: pass dev_priv explicitly to _DSPBSURFLIVE
In reply to Jani NikulaAvoid the implicit dev_priv local variable use, and pass dev_priv explicitly to the _DSPBSURFLIVE register macro.
--- drivers/gpu/drm/i915/i915_reg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
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)/* ICL DSI 0 and 1 */ #define _PIPEDSI0CONF 0x7b008
Signature · 1 line
2.39.2
Re: [PATCH 49/65] drm/i915: pass dev_priv explicitly to _DSPBSURFLIVE
Quoted 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
PATCH 50/65 drm/i915: pass dev_priv explicitly to PIPE_DATA_M1
In reply to Jani NikulaAvoid the implicit dev_priv local variable use, and pass dev_priv explicitly to the PIPE_DATA_M1 register macro.
--- 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 50/65] drm/i915: pass dev_priv explicitly to PIPE_DATA_M1
Quoted 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
PATCH 51/65 drm/i915: pass dev_priv explicitly to PIPE_DATA_N1
In reply to Jani NikulaAvoid the implicit dev_priv local variable use, and pass dev_priv explicitly to the PIPE_DATA_N1 register macro.
--- 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 51/65] drm/i915: pass dev_priv explicitly to PIPE_DATA_N1
Quoted 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
PATCH 52/65 drm/i915: pass dev_priv explicitly to PIPE_DATA_M2
In reply to Jani NikulaAvoid the implicit dev_priv local variable use, and pass dev_priv explicitly to the PIPE_DATA_M2 register macro.
--- 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 52/65] drm/i915: pass dev_priv explicitly to PIPE_DATA_M2
Quoted 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
PATCH 53/65 drm/i915: pass dev_priv explicitly to PIPE_DATA_N2
In reply to Jani NikulaAvoid the implicit dev_priv local variable use, and pass dev_priv explicitly to the PIPE_DATA_N2 register macro.
--- 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 53/65] drm/i915: pass dev_priv explicitly to PIPE_DATA_N2
Quoted 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
PATCH 54/65 drm/i915: pass dev_priv explicitly to PIPE_LINK_M1
In reply to Jani NikulaAvoid the implicit dev_priv local variable use, and pass dev_priv explicitly to the PIPE_LINK_M1 register macro.
--- 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 54/65] drm/i915: pass dev_priv explicitly to PIPE_LINK_M1
Quoted 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
PATCH 55/65 drm/i915: pass dev_priv explicitly to PIPE_LINK_N1
In reply to Jani NikulaAvoid the implicit dev_priv local variable use, and pass dev_priv explicitly to the PIPE_LINK_N1 register macro.
--- 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 55/65] drm/i915: pass dev_priv explicitly to PIPE_LINK_N1
Quoted 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
PATCH 56/65 drm/i915: pass dev_priv explicitly to PIPE_LINK_M2
In reply to Jani NikulaAvoid the implicit dev_priv local variable use, and pass dev_priv explicitly to the PIPE_LINK_M2 register macro.
--- 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 56/65] drm/i915: pass dev_priv explicitly to PIPE_LINK_M2
Quoted 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
PATCH 57/65 drm/i915: pass dev_priv explicitly to PIPE_LINK_N2
In reply to Jani NikulaAvoid the implicit dev_priv local variable use, and pass dev_priv explicitly to the PIPE_LINK_N2 register macro.
--- 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 57/65] drm/i915: pass dev_priv explicitly to PIPE_LINK_N2
Quoted 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
PATCH 58/65 drm/i915: pass dev_priv explicitly to HSW_STEREO_3D_CTL
In reply to Jani NikulaAvoid the implicit dev_priv local variable use, and pass dev_priv explicitly to the HSW_STEREO_3D_CTL register macro.
--- drivers/gpu/drm/i915/i915_reg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
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)#define _PCH_TRANS_HTOTAL_B 0xe1000#define _PCH_TRANS_HBLANK_B 0xe1004
Signature · 1 line
2.39.2
Re: [PATCH 58/65] drm/i915: pass dev_priv explicitly to HSW_STEREO_3D_CTL
Quoted 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
PATCH 59/65 drm/i915: pass dev_priv explicitly to TRANS_DDI_FUNC_CTL
In reply to Jani NikulaAvoid the implicit dev_priv local variable use, and pass dev_priv explicitly to the TRANS_DDI_FUNC_CTL register macro.
--- 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