From: Rodrigo Vivi <rodrigo.vivi@intel.com>
To: Jani Nikula <jani.nikula@intel.com>
Cc: <intel-gfx@lists.freedesktop.org>
Subject: Re: [PATCH 18/65] drm/i915: pass dev_priv explicitly to TRANSCONF
Date: Thu, 6 Jun 2024 11:42:36 -0400 [thread overview]
Message-ID: <ZmHY7EcyEYspcO_1@intel.com> (raw)
In-Reply-To: <9afc96be1cbe4514cdca701ab434b4c7aa3a55ba.1717514638.git.jani.nikula@intel.com>
On Tue, Jun 04, 2024 at 06:25:36PM +0300, Jani Nikula wrote:
> Avoid the implicit dev_priv local variable use, and pass dev_priv
> explicitly to the TRANSCONF register macro.
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
> 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(-)
>
> diff --git a/drivers/gpu/drm/i915/display/icl_dsi.c b/drivers/gpu/drm/i915/display/icl_dsi.c
> index 0625c4d5ee0b..9beb94494b2b 100644
> --- a/drivers/gpu/drm/i915/display/icl_dsi.c
> +++ b/drivers/gpu/drm/i915/display/icl_dsi.c
> @@ -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:
> diff --git a/drivers/gpu/drm/i915/display/intel_crt.c b/drivers/gpu/drm/i915/display/intel_crt.c
> index 808fa8afb164..d4f16d894eda 100644
> --- a/drivers/gpu/drm/i915/display/intel_crt.c
> +++ b/drivers/gpu/drm/i915/display/intel_crt.c
> @@ -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;
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> index 1e2ddae5ba94..9434eba91839 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -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);
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display_power_well.c b/drivers/gpu/drm/i915/display/intel_display_power_well.c
> index 3b6cb237d80a..919f712fef13 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_power_well.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_power_well.c
> @@ -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,
> diff --git a/drivers/gpu/drm/i915/display/intel_drrs.c b/drivers/gpu/drm/i915/display/intel_drrs.c
> index 597f8bd6aa1a..5250622f1479 100644
> --- a/drivers/gpu/drm/i915/display/intel_drrs.c
> +++ b/drivers/gpu/drm/i915/display/intel_drrs.c
> @@ -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);
> }
>
> diff --git a/drivers/gpu/drm/i915/display/intel_fdi.c b/drivers/gpu/drm/i915/display/intel_fdi.c
> index 295a0f24ebbf..8b17b8ad71c3 100644
> --- a/drivers/gpu/drm/i915/display/intel_fdi.c
> +++ b/drivers/gpu/drm/i915/display/intel_fdi.c
> @@ -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);
> diff --git a/drivers/gpu/drm/i915/display/intel_pch_display.c b/drivers/gpu/drm/i915/display/intel_pch_display.c
> index 6a45bc1651c3..0d48b9bec29c 100644
> --- a/drivers/gpu/drm/i915/display/intel_pch_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_pch_display.c
> @@ -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;
> diff --git a/drivers/gpu/drm/i915/display/vlv_dsi.c b/drivers/gpu/drm/i915/display/vlv_dsi.c
> index ee9923c7b115..eae5b5e09aa8 100644
> --- a/drivers/gpu/drm/i915/display/vlv_dsi.c
> +++ b/drivers/gpu/drm/i915/display/vlv_dsi.c
> @@ -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) {
> diff --git a/drivers/gpu/drm/i915/gvt/display.c b/drivers/gpu/drm/i915/gvt/display.c
> index eaa92d392189..ad21b8f65d6b 100644
> --- a/drivers/gpu/drm/i915/gvt/display.c
> +++ b/drivers/gpu/drm/i915/gvt/display.c
> @@ -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)
> diff --git a/drivers/gpu/drm/i915/gvt/handlers.c b/drivers/gpu/drm/i915/gvt/handlers.c
> index 00cf35a9669e..039d2cb273df 100644
> --- a/drivers/gpu/drm/i915/gvt/handlers.c
> +++ b/drivers/gpu/drm/i915/gvt/handlers.c
> @@ -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);
> diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> index cd6eda1b6bef..72f5140cf109 100644
> --- a/drivers/gpu/drm/i915/i915_reg.h
> +++ b/drivers/gpu/drm/i915/i915_reg.h
> @@ -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)
> diff --git a/drivers/gpu/drm/i915/intel_gvt_mmio_table.c b/drivers/gpu/drm/i915/intel_gvt_mmio_table.c
> index 600e89148f77..436d4a2eccd7 100644
> --- a/drivers/gpu/drm/i915/intel_gvt_mmio_table.c
> +++ b/drivers/gpu/drm/i915/intel_gvt_mmio_table.c
> @@ -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));
> --
> 2.39.2
>
next prev parent reply other threads:[~2024-06-06 15:42 UTC|newest]
Thread overview: 136+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-04 15:25 [PATCH 00/65] drm/i915: finish the job of removing implicit dev_priv Jani Nikula
2024-06-04 15:25 ` [PATCH 01/65] drm/i915: pass dev_priv explicitly to DPLL Jani Nikula
2024-06-06 14:38 ` Rodrigo Vivi
2024-06-04 15:25 ` [PATCH 02/65] drm/i915: pass dev_priv explicitly to DPLL_MD Jani Nikula
2024-06-06 14:39 ` Rodrigo Vivi
2024-06-04 15:25 ` [PATCH 03/65] drm/i915: pass dev_priv explicitly to TRANS_HTOTAL Jani Nikula
2024-06-06 14:40 ` Rodrigo Vivi
2024-06-04 15:25 ` [PATCH 04/65] drm/i915: pass dev_priv explicitly to TRANS_HBLANK Jani Nikula
2024-06-06 14:40 ` Rodrigo Vivi
2024-06-04 15:25 ` [PATCH 05/65] drm/i915: pass dev_priv explicitly to TRANS_HSYNC Jani Nikula
2024-06-06 14:41 ` Rodrigo Vivi
2024-06-04 15:25 ` [PATCH 06/65] drm/i915: pass dev_priv explicitly to TRANS_VTOTAL Jani Nikula
2024-06-06 15:36 ` Rodrigo Vivi
2024-06-04 15:25 ` [PATCH 07/65] drm/i915: pass dev_priv explicitly to TRANS_VBLANK Jani Nikula
2024-06-06 15:36 ` Rodrigo Vivi
2024-06-04 15:25 ` [PATCH 08/65] drm/i915: pass dev_priv explicitly to TRANS_VSYNC Jani Nikula
2024-06-06 15:37 ` Rodrigo Vivi
2024-06-04 15:25 ` [PATCH 09/65] drm/i915: pass dev_priv explicitly to BCLRPAT Jani Nikula
2024-06-06 15:36 ` Rodrigo Vivi
2024-06-04 15:25 ` [PATCH 10/65] drm/i915: pass dev_priv explicitly to TRANS_VSYNCSHIFT Jani Nikula
2024-06-06 15:38 ` Rodrigo Vivi
2024-06-04 15:25 ` [PATCH 11/65] drm/i915: pass dev_priv explicitly to PIPESRC Jani Nikula
2024-06-06 15:37 ` Rodrigo Vivi
2024-06-04 15:25 ` [PATCH 12/65] drm/i915: pass dev_priv explicitly to TRANS_MULT Jani Nikula
2024-06-06 15:38 ` Rodrigo Vivi
2024-06-04 15:25 ` [PATCH 13/65] drm/i915: pass dev_priv explicitly to PORT_HOTPLUG_EN Jani Nikula
2024-06-06 15:39 ` Rodrigo Vivi
2024-06-04 15:25 ` [PATCH 14/65] drm/i915: pass dev_priv explicitly to PORT_HOTPLUG_STAT Jani Nikula
2024-06-06 15:40 ` Rodrigo Vivi
2024-06-04 15:25 ` [PATCH 15/65] drm/i915: pass dev_priv explicitly to PFIT_CONTROL Jani Nikula
2024-06-06 15:40 ` Rodrigo Vivi
2024-06-04 15:25 ` [PATCH 16/65] drm/i915: pass dev_priv explicitly to PFIT_PGM_RATIOS Jani Nikula
2024-06-06 15:41 ` Rodrigo Vivi
2024-06-04 15:25 ` [PATCH 17/65] drm/i915: pass dev_priv explicitly to PFIT_AUTO_RATIOS Jani Nikula
2024-06-06 15:40 ` Rodrigo Vivi
2024-06-04 15:25 ` [PATCH 18/65] drm/i915: pass dev_priv explicitly to TRANSCONF Jani Nikula
2024-06-06 15:42 ` Rodrigo Vivi [this message]
2024-06-04 15:25 ` [PATCH 19/65] drm/i915: pass dev_priv explicitly to PIPEDSL Jani Nikula
2024-06-06 15:42 ` Rodrigo Vivi
2024-06-04 15:25 ` [PATCH 20/65] drm/i915: pass dev_priv explicitly to PIPEFRAME Jani Nikula
2024-06-06 15:43 ` Rodrigo Vivi
2024-06-04 15:25 ` [PATCH 21/65] drm/i915: pass dev_priv explicitly to PIPEFRAMEPIXEL Jani Nikula
2024-06-06 15:43 ` Rodrigo Vivi
2024-06-04 15:25 ` [PATCH 22/65] drm/i915: pass dev_priv explicitly to PIPESTAT Jani Nikula
2024-06-06 15:44 ` Rodrigo Vivi
2024-06-04 15:25 ` [PATCH 23/65] drm/i915: pass dev_priv explicitly to PIPE_ARB_CTL Jani Nikula
2024-06-06 15:44 ` Rodrigo Vivi
2024-06-04 15:25 ` [PATCH 24/65] drm/i915: pass dev_priv explicitly to ICL_PIPESTATUS Jani Nikula
2024-06-06 15:44 ` Rodrigo Vivi
2024-06-04 15:25 ` [PATCH 25/65] drm/i915: pass dev_priv explicitly to DSPARB Jani Nikula
2024-06-06 15:47 ` Rodrigo Vivi
2024-06-04 15:25 ` [PATCH 26/65] drm/i915: pass dev_priv explicitly to DSPFW1 Jani Nikula
2024-06-06 15:48 ` Rodrigo Vivi
2024-06-04 15:25 ` [PATCH 27/65] drm/i915: pass dev_priv explicitly to DSPFW2 Jani Nikula
2024-06-06 15:48 ` Rodrigo Vivi
2024-06-04 15:25 ` [PATCH 28/65] drm/i915: pass dev_priv explicitly to DSPFW3 Jani Nikula
2024-06-06 15:49 ` Rodrigo Vivi
2024-06-04 15:25 ` [PATCH 29/65] drm/i915: pass dev_priv explicitly to PIPE_FRMCOUNT_G4X Jani Nikula
2024-06-06 16:01 ` Rodrigo Vivi
2024-06-04 15:25 ` [PATCH 30/65] drm/i915: pass dev_priv explicitly to PIPE_FLIPCOUNT_G4X Jani Nikula
2024-06-06 16:01 ` Rodrigo Vivi
2024-06-04 15:25 ` [PATCH 31/65] drm/i915: pass dev_priv explicitly to CHV_BLEND Jani Nikula
2024-06-06 16:01 ` Rodrigo Vivi
2024-06-04 15:25 ` [PATCH 32/65] drm/i915: pass dev_priv explicitly to CHV_CANVAS Jani Nikula
2024-06-06 16:02 ` Rodrigo Vivi
2024-06-04 15:25 ` [PATCH 33/65] drm/i915: pass dev_priv explicitly to SWF0 Jani Nikula
2024-06-06 16:03 ` Rodrigo Vivi
2024-06-04 15:25 ` [PATCH 34/65] drm/i915: pass dev_priv explicitly to SWF1 Jani Nikula
2024-06-06 16:03 ` Rodrigo Vivi
2024-06-04 15:25 ` [PATCH 35/65] drm/i915: pass dev_priv explicitly to SWF3 Jani Nikula
2024-06-06 16:03 ` Rodrigo Vivi
2024-06-04 15:25 ` [PATCH 36/65] drm/i915: pass dev_priv explicitly to _PIPEBDSL Jani Nikula
2024-06-06 16:04 ` Rodrigo Vivi
2024-06-04 15:25 ` [PATCH 37/65] drm/i915: pass dev_priv explicitly to _TRANSBCONF Jani Nikula
2024-06-06 16:05 ` Rodrigo Vivi
2024-06-04 15:25 ` [PATCH 38/65] drm/i915: pass dev_priv explicitly to _PIPEBSTAT Jani Nikula
2024-06-06 16:05 ` Rodrigo Vivi
2024-06-04 15:25 ` [PATCH 39/65] drm/i915: pass dev_priv explicitly to _PIPEB_FRMCOUNT_G4X Jani Nikula
2024-06-06 16:05 ` Rodrigo Vivi
2024-06-04 15:25 ` [PATCH 40/65] drm/i915: pass dev_priv explicitly to _PIPEB_FLIPCOUNT_G4X Jani Nikula
2024-06-06 16:07 ` Rodrigo Vivi
2024-06-04 15:25 ` [PATCH 41/65] drm/i915: pass dev_priv explicitly to _DSPBCNTR Jani Nikula
2024-06-06 16:07 ` Rodrigo Vivi
2024-06-04 15:26 ` [PATCH 42/65] drm/i915: pass dev_priv explicitly to _DSPBADDR Jani Nikula
2024-06-06 16:08 ` Rodrigo Vivi
2024-06-04 15:26 ` [PATCH 43/65] drm/i915: pass dev_priv explicitly to _DSPBSTRIDE Jani Nikula
2024-06-06 16:08 ` Rodrigo Vivi
2024-06-04 15:26 ` [PATCH 44/65] drm/i915: pass dev_priv explicitly to _DSPBPOS Jani Nikula
2024-06-06 16:08 ` Rodrigo Vivi
2024-06-04 15:26 ` [PATCH 45/65] drm/i915: pass dev_priv explicitly to _DSPBSIZE Jani Nikula
2024-06-06 16:09 ` Rodrigo Vivi
2024-06-07 10:46 ` Jani Nikula
2024-06-07 10:48 ` Jani Nikula
2024-06-04 15:26 ` [PATCH 46/65] drm/i915: pass dev_priv explicitly to _DSPBSURF Jani Nikula
2024-06-06 16:10 ` Rodrigo Vivi
2024-06-04 15:26 ` [PATCH 47/65] drm/i915: pass dev_priv explicitly to _DSPBTILEOFF Jani Nikula
2024-06-06 16:10 ` Rodrigo Vivi
2024-06-04 15:26 ` [PATCH 48/65] drm/i915: pass dev_priv explicitly to _DSPBOFFSET Jani Nikula
2024-06-06 16:10 ` Rodrigo Vivi
2024-06-04 15:26 ` [PATCH 49/65] drm/i915: pass dev_priv explicitly to _DSPBSURFLIVE Jani Nikula
2024-06-06 16:10 ` Rodrigo Vivi
2024-06-04 15:26 ` [PATCH 50/65] drm/i915: pass dev_priv explicitly to PIPE_DATA_M1 Jani Nikula
2024-06-06 16:11 ` Rodrigo Vivi
2024-06-04 15:26 ` [PATCH 51/65] drm/i915: pass dev_priv explicitly to PIPE_DATA_N1 Jani Nikula
2024-06-06 16:12 ` Rodrigo Vivi
2024-06-04 15:26 ` [PATCH 52/65] drm/i915: pass dev_priv explicitly to PIPE_DATA_M2 Jani Nikula
2024-06-06 16:12 ` Rodrigo Vivi
2024-06-04 15:26 ` [PATCH 53/65] drm/i915: pass dev_priv explicitly to PIPE_DATA_N2 Jani Nikula
2024-06-06 16:12 ` Rodrigo Vivi
2024-06-04 15:26 ` [PATCH 54/65] drm/i915: pass dev_priv explicitly to PIPE_LINK_M1 Jani Nikula
2024-06-06 16:13 ` Rodrigo Vivi
2024-06-04 15:26 ` [PATCH 55/65] drm/i915: pass dev_priv explicitly to PIPE_LINK_N1 Jani Nikula
2024-06-06 16:13 ` Rodrigo Vivi
2024-06-04 15:26 ` [PATCH 56/65] drm/i915: pass dev_priv explicitly to PIPE_LINK_M2 Jani Nikula
2024-06-06 16:15 ` Rodrigo Vivi
2024-06-04 15:26 ` [PATCH 57/65] drm/i915: pass dev_priv explicitly to PIPE_LINK_N2 Jani Nikula
2024-06-06 16:14 ` Rodrigo Vivi
2024-06-04 15:26 ` [PATCH 58/65] drm/i915: pass dev_priv explicitly to HSW_STEREO_3D_CTL Jani Nikula
2024-06-06 16:17 ` Rodrigo Vivi
2024-06-04 15:26 ` [PATCH 59/65] drm/i915: pass dev_priv explicitly to TRANS_DDI_FUNC_CTL Jani Nikula
2024-06-06 16:13 ` Rodrigo Vivi
2024-06-04 15:26 ` [PATCH 60/65] drm/i915: pass dev_priv explicitly to TRANS_DDI_FUNC_CTL2 Jani Nikula
2024-06-06 16:18 ` Rodrigo Vivi
2024-06-04 15:26 ` [PATCH 61/65] drm/i915: pass dev_priv explicitly to TGL_DP_TP_CTL Jani Nikula
2024-06-06 16:14 ` Rodrigo Vivi
2024-06-04 15:26 ` [PATCH 62/65] drm/i915: pass dev_priv explicitly to TGL_DP_TP_STATUS Jani Nikula
2024-06-06 16:15 ` Rodrigo Vivi
2024-06-04 15:26 ` [PATCH 63/65] drm/i915: pass dev_priv explicitly to TRANS_MSA_MISC Jani Nikula
2024-06-06 16:15 ` Rodrigo Vivi
2024-06-04 15:26 ` [PATCH 64/65] drm/i915: pass dev_priv explicitly to TRANS_SET_CONTEXT_LATENCY Jani Nikula
2024-06-06 16:18 ` Rodrigo Vivi
2024-06-04 15:26 ` [PATCH 65/65] drm/i915: pass dev_priv explicitly to MTL_CLKGATE_DIS_TRANS Jani Nikula
2024-06-06 16:19 ` Rodrigo Vivi
2024-06-04 18:13 ` ✗ Fi.CI.CHECKPATCH: warning for drm/i915: finish the job of removing implicit dev_priv Patchwork
2024-06-04 18:20 ` ✓ Fi.CI.BAT: success " Patchwork
2024-06-04 22:01 ` ✗ Fi.CI.IGT: failure " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ZmHY7EcyEYspcO_1@intel.com \
--to=rodrigo.vivi@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.