From: Rodrigo Vivi <rodrigo.vivi@intel.com>
To: Jani Nikula <jani.nikula@intel.com>
Cc: <intel-gfx@lists.freedesktop.org>
Subject: Re: [PATCH 59/65] drm/i915: pass dev_priv explicitly to TRANS_DDI_FUNC_CTL
Date: Thu, 6 Jun 2024 12:13:41 -0400 [thread overview]
Message-ID: <ZmHgNYj7tZWXIvul@intel.com> (raw)
In-Reply-To: <4ccf75561aa0fb209fd71c85e9089b0350570fd6.1717514638.git.jani.nikula@intel.com>
On Tue, Jun 04, 2024 at 06:26:17PM +0300, Jani Nikula wrote:
> Avoid the implicit dev_priv local variable use, and pass dev_priv
> explicitly to the TRANS_DDI_FUNC_CTL 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_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(-)
>
> diff --git a/drivers/gpu/drm/i915/display/icl_dsi.c b/drivers/gpu/drm/i915/display/icl_dsi.c
> index 9beb94494b2b..acc80d439352 100644
> --- a/drivers/gpu/drm/i915/display/icl_dsi.c
> +++ b/drivers/gpu/drm/i915/display/icl_dsi.c
> @@ -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;
> diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
> index 3c3fc53376ce..c5571be3c66e 100644
> --- a/drivers/gpu/drm/i915/display/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/display/intel_ddi.c
> @@ -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_state
> intel_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
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> index 952780028630..62f8300c73a5 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -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;
> diff --git a/drivers/gpu/drm/i915/display/intel_display_irq.c b/drivers/gpu/drm/i915/display/intel_display_irq.c
> index 76bba95410e7..036f77c2702d 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_irq.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_irq.c
> @@ -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;
> diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c
> index 715d2f59f565..00fdcbc28e9b 100644
> --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
> +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
> @@ -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",
> diff --git a/drivers/gpu/drm/i915/display/intel_fdi.c b/drivers/gpu/drm/i915/display/intel_fdi.c
> index 007e0f9e9304..d33befd7994d 100644
> --- a/drivers/gpu/drm/i915/display/intel_fdi.c
> +++ b/drivers/gpu/drm/i915/display/intel_fdi.c
> @@ -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;
> }
> diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c
> index ba3eca919900..3ebe035f382e 100644
> --- a/drivers/gpu/drm/i915/display/intel_hdcp.c
> +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
> @@ -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);
> }
> }
> diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c
> index 7704ead5002d..19498ee455fa 100644
> --- a/drivers/gpu/drm/i915/display/intel_hdmi.c
> +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c
> @@ -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");
> }
> diff --git a/drivers/gpu/drm/i915/gvt/display.c b/drivers/gpu/drm/i915/gvt/display.c
> index 95b4b76d3b45..c66d6d3177c8 100644
> --- a/drivers/gpu/drm/i915/gvt/display.c
> +++ b/drivers/gpu/drm/i915/gvt/display.c
> @@ -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);
> diff --git a/drivers/gpu/drm/i915/gvt/handlers.c b/drivers/gpu/drm/i915/gvt/handlers.c
> index f2af234769bf..24abe70afe46 100644
> --- a/drivers/gpu/drm/i915/gvt/handlers.c
> +++ b/drivers/gpu/drm/i915/gvt/handlers.c
> @@ -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));
> diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> index c8488877dd68..14f4060dd573 100644
> --- a/drivers/gpu/drm/i915/i915_reg.h
> +++ b/drivers/gpu/drm/i915/i915_reg.h
> @@ -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 */
> --
> 2.39.2
>
next prev parent reply other threads:[~2024-06-06 16:13 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
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 [this message]
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=ZmHgNYj7tZWXIvul@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.