drm/i915/display: convert vlv_wait_port_ready() to struct intel_display

struct intel_display will replace struct drm_i915_private as the main
device pointer for display code. Switch vlv_wait_port_ready() over to
it. The main motivation to do just one function is to stop passing i915
to intel_de_wait(), so its generic wrapper can be removed.

Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/9505ea49dfc8c7a52cacd2749875a680b01e5bbd.1730146000.git.jani.nikula@intel.com

diff --git a/drivers/gpu/drm/i915/display/g4x_dp.c b/drivers/gpu/drm/i915/display/g4x_dp.c
index dfe5a40..7f19e4d 100644 (file)
--- a/drivers/gpu/drm/i915/display/g4x_dp.c
+++ b/drivers/gpu/drm/i915/display/g4x_dp.c
@@ -705,8 +705,7 @@ static void intel_enable_dp(struct intel_atomic_state *state,
                if (IS_CHERRYVIEW(dev_priv))
                        lane_mask = intel_dp_unused_lane_mask(pipe_config->lane_count);
 
-               vlv_wait_port_ready(dev_priv, dp_to_dig_port(intel_dp),
-                                   lane_mask);
+               vlv_wait_port_ready(display, dp_to_dig_port(intel_dp), lane_mask);
        }
 
        intel_dp_set_power(intel_dp, DP_SET_POWER_D0);

diff --git a/drivers/gpu/drm/i915/display/g4x_hdmi.c b/drivers/gpu/drm/i915/display/g4x_hdmi.c
index 46f23bd..d1a7d0d 100644 (file)
--- a/drivers/gpu/drm/i915/display/g4x_hdmi.c
+++ b/drivers/gpu/drm/i915/display/g4x_hdmi.c
@@ -480,8 +480,8 @@ static void vlv_hdmi_pre_enable(struct intel_atomic_state *state,
                                const struct intel_crtc_state *pipe_config,
                                const struct drm_connector_state *conn_state)
 {
+       struct intel_display *display = to_intel_display(encoder);
        struct intel_digital_port *dig_port = enc_to_dig_port(encoder);
-       struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
 
        vlv_phy_pre_encoder_enable(encoder, pipe_config);
 
@@ -496,7 +496,7 @@ static void vlv_hdmi_pre_enable(struct intel_atomic_state *state,
 
        g4x_hdmi_enable_port(encoder, pipe_config);
 
-       vlv_wait_port_ready(dev_priv, dig_port, 0x0);
+       vlv_wait_port_ready(display, dig_port, 0x0);
 }
 
 static void vlv_hdmi_pre_pll_enable(struct intel_atomic_state *state,
@@ -557,9 +557,8 @@ static void chv_hdmi_pre_enable(struct intel_atomic_state *state,
                                const struct intel_crtc_state *pipe_config,
                                const struct drm_connector_state *conn_state)
 {
+       struct intel_display *display = to_intel_display(encoder);
        struct intel_digital_port *dig_port = enc_to_dig_port(encoder);
-       struct drm_device *dev = encoder->base.dev;
-       struct drm_i915_private *dev_priv = to_i915(dev);
 
        chv_phy_pre_encoder_enable(encoder, pipe_config);
 
@@ -573,7 +572,7 @@ static void chv_hdmi_pre_enable(struct intel_atomic_state *state,
 
        g4x_hdmi_enable_port(encoder, pipe_config);
 
-       vlv_wait_port_ready(dev_priv, dig_port, 0x0);
+       vlv_wait_port_ready(display, dig_port, 0x0);
 
        /* Second common lane will stay alive on its own now */
        chv_phy_release_cl2_override(encoder);

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index c93f502..a410e50 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -475,7 +475,7 @@ static void assert_planes_disabled(struct intel_crtc *crtc)
                assert_plane_disabled(plane);
 }
 
-void vlv_wait_port_ready(struct drm_i915_private *dev_priv,
+void vlv_wait_port_ready(struct intel_display *display,
                         struct intel_digital_port *dig_port,
                         unsigned int expected_mask)
 {
@@ -488,11 +488,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(dev_priv, 0);
+               dpll_reg = DPLL(display, 0);
                break;
        case PORT_C:
                port_mask = DPLL_PORTC_READY_MASK;
-               dpll_reg = DPLL(dev_priv, 0);
+               dpll_reg = DPLL(display, 0);
                expected_mask <<= 4;
                break;
        case PORT_D:
@@ -501,11 +501,11 @@ void vlv_wait_port_ready(struct drm_i915_private *dev_priv,
                break;
        }
 
-       if (intel_de_wait(dev_priv, dpll_reg, port_mask, expected_mask, 1000))
-               drm_WARN(&dev_priv->drm, 1,
+       if (intel_de_wait(display, dpll_reg, port_mask, expected_mask, 1000))
+               drm_WARN(display->drm, 1,
                         "timed out waiting for [ENCODER:%d:%s] port ready: got 0x%x, expected 0x%x\n",
                         dig_port->base.base.base.id, dig_port->base.base.name,
-                        intel_de_read(dev_priv, dpll_reg) & port_mask,
+                        intel_de_read(display, dpll_reg) & port_mask,
                         expected_mask);
 }
 

diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h
index dd56d60..caef04f 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.h
+++ b/drivers/gpu/drm/i915/display/intel_display.h
@@ -492,7 +492,7 @@ bool intel_encoder_is_tc(struct intel_encoder *encoder);
 enum tc_port intel_encoder_to_tc(struct intel_encoder *encoder);
 
 int ilk_get_lanes_required(int target_clock, int link_bw, int bpp);
-void vlv_wait_port_ready(struct drm_i915_private *dev_priv,
+void vlv_wait_port_ready(struct intel_display *display,
                         struct intel_digital_port *dig_port,
                         unsigned int expected_mask);