Skip to contentSkip to conversation

drm/i915/display: conversions to struct intel_display

PATCH Superseded Jani Nikula 4 participants 43 messages Feb 12, 2025 – Feb 13, 2025 Page 2 of 2

Subsystems (3)

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#7 lore raw

RE: [PATCH 02/14] drm/i915/hdmi: convert g4x_hdmi.[ch] to struct intel_display

In reply to Kandpal, Suraj
Quoted 19 lines · Suraj
Quoted 19 lines

-----Original Message-----
From: Intel-gfx <[email protected]> On Behalf Of Jani Nikula
Sent: Wednesday, February 12, 2025 10:07 PM
To: [email protected]; [email protected]
Cc: Nikula, Jani <[email protected]>
Subject: [PATCH 02/14] drm/i915/hdmi: convert g4x_hdmi.[ch] to struct intel_display

Going forward, struct intel_display is the main display device data pointer. Convert as much as possible of g4x_hdmi.[ch] to struct intel_display.

---
 drivers/gpu/drm/i915/display/g4x_hdmi.c      | 139 +++++++++----------
 drivers/gpu/drm/i915/display/g4x_hdmi.h      |   6 +-
 drivers/gpu/drm/i915/display/intel_display.c |  16 +--
 3 files changed, 79 insertions(+), 82 deletions(-)
Quoted 16 lines

drivers/gpu/drm/i915/display/g4x_hdmi.c line 30

Quoted 12 lines
drivers/gpu/drm/i915/display/g4x_hdmi.c +2 -2
index 9e1ca7767392..6670cf101b9a 100644
@@ -27,8 +27,8 @@
 static void intel_hdmi_prepare(struct intel_encoder *encoder,
                             const struct intel_crtc_state *crtc_state)  {
-     struct drm_device *dev = encoder->base.dev;
-     struct drm_i915_private *dev_priv = to_i915(dev);
+     struct intel_display *display = to_intel_display(encoder);
+     struct drm_i915_private *dev_priv = to_i915(display->drm);

Nit: If we are changing having a change here why not rename it to i915 too. It's going to be useless in future since we want to remove drm_i915_private Usage altogether but in the meantime why not follow the i915 naming convention.

I'm keeping it dev_priv to avoid unrelated changes below. And as you say, all of them will need to be removed anyway.

Quoted 550 lines

Otherwise LGTM,

Quoted 545 lines
drivers/gpu/drm/i915/display/g4x_hdmi.c +0 -0
      struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
      struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(encoder);
      const struct drm_display_mode *adjusted_mode = &crtc_state-
Quoted 1 line

hw.adjusted_mode; @@ -54,13 +54,13 @@ static void

intel_hdmi_prepare(struct intel_encoder *encoder,

      if (HAS_PCH_CPT(dev_priv))
              hdmi_val |= SDVO_PIPE_SEL_CPT(crtc->pipe);
drivers/gpu/drm/i915/display/g4x_hdmi.c +3 -3
-     else if (IS_CHERRYVIEW(dev_priv))
+     else if (display->platform.cherryview)
              hdmi_val |= SDVO_PIPE_SEL_CHV(crtc->pipe);
      else
              hdmi_val |= SDVO_PIPE_SEL(crtc->pipe);
 
-     intel_de_write(dev_priv, intel_hdmi->hdmi_reg, hdmi_val);
-     intel_de_posting_read(dev_priv, intel_hdmi->hdmi_reg);
+     intel_de_write(display, intel_hdmi->hdmi_reg, hdmi_val);
+     intel_de_posting_read(display, intel_hdmi->hdmi_reg);
 }
 
 static bool intel_hdmi_get_hw_state(struct intel_encoder *encoder, @@ -

132,6 +132,7 @@ static int g4x_hdmi_compute_config(struct intel_encoder *encoder,
struct intel_crtc_state *crtc_state, struct drm_connector_state *conn_state) {
+ struct intel_display *display = to_intel_display(encoder);
struct intel_atomic_state *state = to_intel_atomic_state(crtc_state-

Quoted 1 line

uapi.state);

      struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
      struct drm_i915_private *i915 = to_i915(encoder->base.dev); @@ -
142,7 +143,7 @@ static int g4x_hdmi_compute_config(struct intel_encoder
*encoder,
                      return -EINVAL;
      }
drivers/gpu/drm/i915/display/g4x_hdmi.c +1 -1
-     if (IS_G4X(i915))
+     if (display->platform.g4x)
              crtc_state->has_hdmi_sink =
g4x_compute_has_hdmi_sink(state, crtc);
      else
              crtc_state->has_hdmi_sink =
drivers/gpu/drm/i915/display/g4x_hdmi.c +0 -0
@@ -154,15 +155,15 @@ static int g4x_hdmi_compute_config(struct

intel_encoder *encoder, static void intel_hdmi_get_config(struct intel_encoder *encoder,

                                struct intel_crtc_state *pipe_config)  {
drivers/gpu/drm/i915/display/g4x_hdmi.c +3 -3
+     struct intel_display *display = to_intel_display(encoder);
+     struct drm_i915_private *dev_priv = to_i915(display->drm);
      struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(encoder);
-     struct drm_device *dev = encoder->base.dev;
-     struct drm_i915_private *dev_priv = to_i915(dev);
      u32 tmp, flags = 0;
      int dotclock;
 
      pipe_config->output_types |= BIT(INTEL_OUTPUT_HDMI);
 
-     tmp = intel_de_read(dev_priv, intel_hdmi->hdmi_reg);
+     tmp = intel_de_read(display, intel_hdmi->hdmi_reg);
 
      if (tmp & SDVO_HSYNC_ACTIVE_HIGH)
              flags |= DRM_MODE_FLAG_PHSYNC;
@@ -222,33 +223,32 @@ static void intel_hdmi_get_config(struct

intel_encoder *encoder, static void g4x_hdmi_enable_port(struct intel_encoder *encoder,

                               const struct intel_crtc_state *pipe_config)  {
drivers/gpu/drm/i915/display/g4x_hdmi.c +4 -5
-     struct drm_device *dev = encoder->base.dev;
-     struct drm_i915_private *dev_priv = to_i915(dev);
+     struct intel_display *display = to_intel_display(encoder);
      struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(encoder);
      u32 temp;
 
-     temp = intel_de_read(dev_priv, intel_hdmi->hdmi_reg);
+     temp = intel_de_read(display, intel_hdmi->hdmi_reg);
 
      temp |= SDVO_ENABLE;
 
-     intel_de_write(dev_priv, intel_hdmi->hdmi_reg, temp);
-     intel_de_posting_read(dev_priv, intel_hdmi->hdmi_reg);
+     intel_de_write(display, intel_hdmi->hdmi_reg, temp);
+     intel_de_posting_read(display, intel_hdmi->hdmi_reg);
 }
 
 static void g4x_hdmi_audio_enable(struct intel_encoder *encoder,
                                const struct intel_crtc_state *crtc_state,
                                const struct drm_connector_state

*conn_state) {

drivers/gpu/drm/i915/display/g4x_hdmi.c +3 -3
-     struct drm_i915_private *i915 = to_i915(encoder->base.dev);
+     struct intel_display *display = to_intel_display(encoder);
      struct intel_hdmi *hdmi = enc_to_intel_hdmi(encoder);
 
      if (!crtc_state->has_audio)
              return;
 
-     drm_WARN_ON(&i915->drm, !crtc_state->has_hdmi_sink);
+     drm_WARN_ON(display->drm, !crtc_state->has_hdmi_sink);
 
      /* Enable audio presence detect */
-     intel_de_rmw(i915, hdmi->hdmi_reg, 0, HDMI_AUDIO_ENABLE);
+     intel_de_rmw(display, hdmi->hdmi_reg, 0, HDMI_AUDIO_ENABLE);
 
      intel_audio_codec_enable(encoder, crtc_state, conn_state);  } @@ -

257,7 +257,7 @@ static void g4x_hdmi_audio_disable(struct intel_encoder *encoder,
const struct intel_crtc_state *old_crtc_state, const struct drm_connector_state
*old_conn_state) {

drivers/gpu/drm/i915/display/g4x_hdmi.c +2 -2
-     struct drm_i915_private *i915 = to_i915(encoder->base.dev);
+     struct intel_display *display = to_intel_display(encoder);
      struct intel_hdmi *hdmi = enc_to_intel_hdmi(encoder);
 
      if (!old_crtc_state->has_audio)
@@ -266,7 +266,7 @@ static void g4x_hdmi_audio_disable(struct
 intel_encoder *encoder,
      intel_audio_codec_disable(encoder, old_crtc_state, old_conn_state);
 
      /* Disable audio presence detect */
-     intel_de_rmw(i915, hdmi->hdmi_reg, HDMI_AUDIO_ENABLE, 0);
+     intel_de_rmw(display, hdmi->hdmi_reg, HDMI_AUDIO_ENABLE, 0);
 }
 

static void g4x_enable_hdmi(struct intel_atomic_state *state, @@ -282,12
+282,11 @@ static void ibx_enable_hdmi(struct intel_atomic_state *state,
const struct intel_crtc_state *pipe_config, const struct drm_connector_state *conn_state) {

drivers/gpu/drm/i915/display/g4x_hdmi.c +6 -7
-     struct drm_device *dev = encoder->base.dev;
-     struct drm_i915_private *dev_priv = to_i915(dev);
+     struct intel_display *display = to_intel_display(encoder);
      struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(encoder);
      u32 temp;
 
-     temp = intel_de_read(dev_priv, intel_hdmi->hdmi_reg);
+     temp = intel_de_read(display, intel_hdmi->hdmi_reg);
 
      temp |= SDVO_ENABLE;
@@ -295,10 +294,10 @@ static void ibx_enable_hdmi(struct
 intel_atomic_state *state,
       * HW workaround, need to write this twice for issue
       * that may result in first write getting masked.
       */
-     intel_de_write(dev_priv, intel_hdmi->hdmi_reg, temp);
-     intel_de_posting_read(dev_priv, intel_hdmi->hdmi_reg);
-     intel_de_write(dev_priv, intel_hdmi->hdmi_reg, temp);
-     intel_de_posting_read(dev_priv, intel_hdmi->hdmi_reg);
+     intel_de_write(display, intel_hdmi->hdmi_reg, temp);
+     intel_de_posting_read(display, intel_hdmi->hdmi_reg);
+     intel_de_write(display, intel_hdmi->hdmi_reg, temp);
+     intel_de_posting_read(display, intel_hdmi->hdmi_reg);
 
      /*

* HW workaround, need to toggle enable bit off and on @@ -
309,18 +308,18 @@ static void ibx_enable_hdmi(struct intel_atomic_state *state,

       */
      if (pipe_config->pipe_bpp > 24 &&
          pipe_config->pixel_multiplier > 1) {
drivers/gpu/drm/i915/display/g4x_hdmi.c +14 -15
-             intel_de_write(dev_priv, intel_hdmi->hdmi_reg,
+             intel_de_write(display, intel_hdmi->hdmi_reg,
                             temp & ~SDVO_ENABLE);
-             intel_de_posting_read(dev_priv, intel_hdmi->hdmi_reg);
+             intel_de_posting_read(display, intel_hdmi->hdmi_reg);
 
              /*
               * HW workaround, need to write this twice for issue
               * that may result in first write getting masked.
               */
-             intel_de_write(dev_priv, intel_hdmi->hdmi_reg, temp);
-             intel_de_posting_read(dev_priv, intel_hdmi->hdmi_reg);
-             intel_de_write(dev_priv, intel_hdmi->hdmi_reg, temp);
-             intel_de_posting_read(dev_priv, intel_hdmi->hdmi_reg);
+             intel_de_write(display, intel_hdmi->hdmi_reg, temp);
+             intel_de_posting_read(display, intel_hdmi->hdmi_reg);
+             intel_de_write(display, intel_hdmi->hdmi_reg, temp);
+             intel_de_posting_read(display, intel_hdmi->hdmi_reg);
      }
 }
@@ -329,14 +328,13 @@ static void cpt_enable_hdmi(struct
 intel_atomic_state *state,
                          const struct intel_crtc_state *pipe_config,
                          const struct drm_connector_state *conn_state)  {
-     struct drm_device *dev = encoder->base.dev;
-     struct drm_i915_private *dev_priv = to_i915(dev);
+     struct intel_display *display = to_intel_display(encoder);
      struct intel_crtc *crtc = to_intel_crtc(pipe_config->uapi.crtc);
      struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(encoder);
      enum pipe pipe = crtc->pipe;
      u32 temp;
 
-     temp = intel_de_read(dev_priv, intel_hdmi->hdmi_reg);
+     temp = intel_de_read(display, intel_hdmi->hdmi_reg);
 
      temp |= SDVO_ENABLE;
 
@@ -351,24 +349,24 @@ static void cpt_enable_hdmi(struct
 intel_atomic_state *state,
       */
 
      if (pipe_config->pipe_bpp > 24) {
-             intel_de_rmw(dev_priv, TRANS_CHICKEN1(pipe),
+             intel_de_rmw(display, TRANS_CHICKEN1(pipe),
                           0, TRANS_CHICKEN1_HDMIUNIT_GC_DISABLE);
 
              temp &= ~SDVO_COLOR_FORMAT_MASK;
              temp |= SDVO_COLOR_FORMAT_8bpc;
      }
 
-     intel_de_write(dev_priv, intel_hdmi->hdmi_reg, temp);
-     intel_de_posting_read(dev_priv, intel_hdmi->hdmi_reg);
+     intel_de_write(display, intel_hdmi->hdmi_reg, temp);
+     intel_de_posting_read(display, intel_hdmi->hdmi_reg);
 
      if (pipe_config->pipe_bpp > 24) {
              temp &= ~SDVO_COLOR_FORMAT_MASK;
              temp |= HDMI_COLOR_FORMAT_12bpc;
 
-             intel_de_write(dev_priv, intel_hdmi->hdmi_reg, temp);
-             intel_de_posting_read(dev_priv, intel_hdmi->hdmi_reg);
+             intel_de_write(display, intel_hdmi->hdmi_reg, temp);
+             intel_de_posting_read(display, intel_hdmi->hdmi_reg);
 
-             intel_de_rmw(dev_priv, TRANS_CHICKEN1(pipe),
+             intel_de_rmw(display, TRANS_CHICKEN1(pipe),
                           TRANS_CHICKEN1_HDMIUNIT_GC_DISABLE, 0);
      }

}

drivers/gpu/drm/i915/display/g4x_hdmi.c +4 -5
@@ -386,19 +384,18 @@ static void intel_disable_hdmi(struct
 intel_atomic_state *state,
                             const struct drm_connector_state
 *old_conn_state)  {
      struct intel_display *display = to_intel_display(encoder);
-     struct drm_device *dev = encoder->base.dev;
-     struct drm_i915_private *dev_priv = to_i915(dev);
+     struct drm_i915_private *dev_priv = to_i915(display->drm);
      struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(encoder);
      struct intel_digital_port *dig_port =
              hdmi_to_dig_port(intel_hdmi);
      struct intel_crtc *crtc = to_intel_crtc(old_crtc_state->uapi.crtc);
      u32 temp;
 
-     temp = intel_de_read(dev_priv, intel_hdmi->hdmi_reg);
+     temp = intel_de_read(display, intel_hdmi->hdmi_reg);
 
      temp &= ~SDVO_ENABLE;
-     intel_de_write(dev_priv, intel_hdmi->hdmi_reg, temp);
-     intel_de_posting_read(dev_priv, intel_hdmi->hdmi_reg);
+     intel_de_write(display, intel_hdmi->hdmi_reg, temp);
+     intel_de_posting_read(display, intel_hdmi->hdmi_reg);
 
      /*

* HW workaround for IBX, we need to move the port @@ -419,14
+416,14 @@ static void intel_disable_hdmi(struct intel_atomic_state *state,
* HW workaround, need to write this twice for issue
* that may result in first write getting masked. */

drivers/gpu/drm/i915/display/g4x_hdmi.c +6 -6
-             intel_de_write(dev_priv, intel_hdmi->hdmi_reg, temp);
-             intel_de_posting_read(dev_priv, intel_hdmi->hdmi_reg);
-             intel_de_write(dev_priv, intel_hdmi->hdmi_reg, temp);
-             intel_de_posting_read(dev_priv, intel_hdmi->hdmi_reg);
+             intel_de_write(display, intel_hdmi->hdmi_reg, temp);
+             intel_de_posting_read(display, intel_hdmi->hdmi_reg);
+             intel_de_write(display, intel_hdmi->hdmi_reg, temp);
+             intel_de_posting_read(display, intel_hdmi->hdmi_reg);
 
              temp &= ~SDVO_ENABLE;
-             intel_de_write(dev_priv, intel_hdmi->hdmi_reg, temp);
-             intel_de_posting_read(dev_priv, intel_hdmi->hdmi_reg);
+             intel_de_write(display, intel_hdmi->hdmi_reg, temp);
+             intel_de_posting_read(display, intel_hdmi->hdmi_reg);
 
              intel_wait_for_vblank_if_active(display, PIPE_A);
              intel_set_cpu_fifo_underrun_reporting(dev_priv, PIPE_A,

true); @@ -544,8 +541,8 @@ static void chv_hdmi_post_disable(struct intel_atomic_state *state,
const struct intel_crtc_state *old_crtc_state, const struct drm_connector_state
*old_conn_state) {

drivers/gpu/drm/i915/display/g4x_hdmi.c +4 -4
-     struct drm_device *dev = encoder->base.dev;
-     struct drm_i915_private *dev_priv = to_i915(dev);
+     struct intel_display *display = to_intel_display(encoder);
+     struct drm_i915_private *dev_priv = to_i915(display->drm);
 
      vlv_dpio_get(dev_priv);
@@ -614,7 +611,7 @@ intel_hdmi_hotplug(struct intel_encoder *encoder,
 int g4x_hdmi_connector_atomic_check(struct drm_connector *connector,
                                  struct drm_atomic_state *state)  {
-     struct drm_i915_private *i915 = to_i915(state->dev);
+     struct intel_display *display = to_intel_display(connector->dev);
      struct drm_connector_list_iter conn_iter;
      struct drm_connector *conn;
      int ret;
@@ -623,7 +620,7 @@ int g4x_hdmi_connector_atomic_check(struct
 drm_connector *connector,
      if (ret)
              return ret;
 
-     if (!IS_G4X(i915))
+     if (!display->platform.g4x)
              return 0;
 

if (!intel_connector_needs_modeset(to_intel_atomic_state(state),
connector)) @@ -637,7 +634,7 @@ int g4x_hdmi_connector_atomic_check(struct drm_connector *connector,

       *
       * See also g4x_compute_has_hdmi_sink().
       */
drivers/gpu/drm/i915/display/g4x_hdmi.c +2 -2
-     drm_connector_list_iter_begin(&i915->drm, &conn_iter);
+     drm_connector_list_iter_begin(display->drm, &conn_iter);
      drm_for_each_connector_iter(conn, &conn_iter) {
              struct drm_connector_state *conn_state;
              struct drm_crtc_state *crtc_state;
@@ -646,7 +643,7 @@ int g4x_hdmi_connector_atomic_check(struct
 drm_connector *connector,
              if (!connector_is_hdmi(conn))
                      continue;
 
-             drm_dbg_kms(&i915->drm, "Adding
 [CONNECTOR:%d:%s]\n",
+             drm_dbg_kms(display->drm, "Adding
 [CONNECTOR:%d:%s]\n",
                          conn->base.id, conn->name);

              conn_state = drm_atomic_get_connector_state(state, conn);
drivers/gpu/drm/i915/display/g4x_hdmi.c +10 -8
@@ -671,24 +668,24 @@ int g4x_hdmi_connector_atomic_check(struct
 drm_connector *connector,
      return ret;
 }
 
-static bool is_hdmi_port_valid(struct drm_i915_private *i915, enum port
 port)
+static bool is_hdmi_port_valid(struct intel_display *display, enum port
+port)
 {
-     if (IS_G4X(i915) || IS_VALLEYVIEW(i915))
+     if (display->platform.g4x || display->platform.valleyview)
              return port == PORT_B || port == PORT_C;
      else
              return port == PORT_B || port == PORT_C || port ==
 PORT_D;  }
 
-static bool assert_hdmi_port_valid(struct drm_i915_private *i915, enum
 port port)
+static bool assert_hdmi_port_valid(struct intel_display *display, enum
+port port)
 {
-     return !drm_WARN(&i915->drm, !is_hdmi_port_valid(i915, port),
+     return !drm_WARN(display->drm, !is_hdmi_port_valid(display,
 port),
                       "Platform does not support HDMI %c\n",
 port_name(port));  }
 
-bool g4x_hdmi_init(struct drm_i915_private *dev_priv,
+bool g4x_hdmi_init(struct intel_display *display,
                 i915_reg_t hdmi_reg, enum port port)  {
-     struct intel_display *display = &dev_priv->display;
+     struct drm_i915_private *dev_priv = to_i915(display->drm);
      const struct intel_bios_encoder_data *devdata;
      struct intel_digital_port *dig_port;
      struct intel_encoder *intel_encoder;
@@ -697,14 +694,14 @@ bool g4x_hdmi_init(struct drm_i915_private
 *dev_priv,
      if (!assert_port_valid(dev_priv, port))
              return false;
 
-     if (!assert_hdmi_port_valid(dev_priv, port))
+     if (!assert_hdmi_port_valid(display, port))
              return false;
 
      devdata = intel_bios_encoder_data_lookup(display, port);
 
      /* FIXME bail? */
      if (!devdata)
-             drm_dbg_kms(&dev_priv->drm, "No VBT child device for
 HDMI-%c\n",
+             drm_dbg_kms(display->drm, "No VBT child device for HDMI-
 %c\n",
                          port_name(port));

      dig_port = kzalloc(sizeof(*dig_port), GFP_KERNEL); @@ -723,7

+720,7 @@ bool g4x_hdmi_init(struct drm_i915_private *dev_priv,

      mutex_init(&dig_port->hdcp_mutex);
drivers/gpu/drm/i915/display/g4x_hdmi.c +1 -1
-     if (drm_encoder_init(&dev_priv->drm, &intel_encoder->base,
+     if (drm_encoder_init(display->drm, &intel_encoder->base,
                           &intel_hdmi_enc_funcs,

DRM_MODE_ENCODER_TMDS,

                           "HDMI %c", port_name(port)))
              goto err_encoder_init;
drivers/gpu/drm/i915/display/g4x_hdmi.c +2 -2
@@ -738,13 +735,13 @@ bool g4x_hdmi_init(struct drm_i915_private
 *dev_priv,
      }
      intel_encoder->get_hw_state = intel_hdmi_get_hw_state;
      intel_encoder->get_config = intel_hdmi_get_config;
-     if (IS_CHERRYVIEW(dev_priv)) {
+     if (display->platform.cherryview) {
              intel_encoder->pre_pll_enable = chv_hdmi_pre_pll_enable;
              intel_encoder->pre_enable = chv_hdmi_pre_enable;
              intel_encoder->enable = vlv_enable_hdmi;
              intel_encoder->post_disable = chv_hdmi_post_disable;
              intel_encoder->post_pll_disable =
 chv_hdmi_post_pll_disable;
-     } else if (IS_VALLEYVIEW(dev_priv)) {
+     } else if (display->platform.valleyview) {
              intel_encoder->pre_pll_enable = vlv_hdmi_pre_pll_enable;
              intel_encoder->pre_enable = vlv_hdmi_pre_enable;
              intel_encoder->enable = vlv_enable_hdmi; @@ -765,7
+762,7 @@ bool g4x_hdmi_init(struct drm_i915_private *dev_priv,
      intel_encoder->type = INTEL_OUTPUT_HDMI;
      intel_encoder->power_domain =
intel_display_power_ddi_lanes_domain(display, port);
      intel_encoder->port = port;
drivers/gpu/drm/i915/display/g4x_hdmi.c +2 -2
-     if (IS_CHERRYVIEW(dev_priv)) {
+     if (display->platform.cherryview) {
              if (port == PORT_D)
                      intel_encoder->pipe_mask = BIT(PIPE_C);
              else
@@ -780,7 +777,7 @@ bool g4x_hdmi_init(struct drm_i915_private
 *dev_priv,
       * to work on real hardware. And since g4x can send infoframes to
       * only one port anyway, nothing is lost by allowing it.
       */
-     if (IS_G4X(dev_priv))
+     if (display->platform.g4x)
              intel_encoder->cloneable |= BIT(INTEL_OUTPUT_HDMI);
 
      dig_port->hdmi.hdmi_reg = hdmi_reg;
drivers/gpu/drm/i915/display/g4x_hdmi.h +3 -2
index a52e8986ec7a..039d2bdba06c 100644
@@ -13,15 +13,15 @@
 enum port;
 struct drm_atomic_state;
 struct drm_connector;
-struct drm_i915_private;
+struct intel_display;
 
 #ifdef I915
-bool g4x_hdmi_init(struct drm_i915_private *dev_priv,
+bool g4x_hdmi_init(struct intel_display *display,
                 i915_reg_t hdmi_reg, enum port port);  int
 g4x_hdmi_connector_atomic_check(struct drm_connector *connector,
                                  struct drm_atomic_state *state);  #else -
 static inline bool g4x_hdmi_init(struct drm_i915_private *dev_priv,
+static inline bool g4x_hdmi_init(struct intel_display *display,
                               i915_reg_t hdmi_reg, int port)
 {
      return false;
drivers/gpu/drm/i915/display/intel_display.c +2 -2
index e5ceedf56335..b8c57a5d26a0 100644
@@ -8235,16 +8235,16 @@ void intel_setup_outputs(struct
 drm_i915_private *dev_priv)
                      /* PCH SDVOB multiplex with HDMIB */
                      found = intel_sdvo_init(dev_priv, PCH_SDVOB,
 PORT_B);
                      if (!found)
-                             g4x_hdmi_init(dev_priv, PCH_HDMIB,
 PORT_B);
+                             g4x_hdmi_init(display, PCH_HDMIB,
 PORT_B);
                      if (!found && (intel_de_read(dev_priv, PCH_DP_B) &
 DP_DETECTED))
                              g4x_dp_init(display, PCH_DP_B, PORT_B);
              }
 
              if (intel_de_read(dev_priv, PCH_HDMIC) & SDVO_DETECTED)
-                     g4x_hdmi_init(dev_priv, PCH_HDMIC, PORT_C);
+                     g4x_hdmi_init(display, PCH_HDMIC, PORT_C);
 
              if (!dpd_is_edp && intel_de_read(dev_priv, PCH_HDMID) &

SDVO_DETECTED)

drivers/gpu/drm/i915/display/intel_display.c +1 -1
-                     g4x_hdmi_init(dev_priv, PCH_HDMID, PORT_D);
+                     g4x_hdmi_init(display, PCH_HDMID, PORT_D);
 
              if (intel_de_read(dev_priv, PCH_DP_C) & DP_DETECTED)
                      g4x_dp_init(display, PCH_DP_C, PORT_C); @@ -

8277,14 +8277,14 @@ void intel_setup_outputs(struct drm_i915_private *dev_priv)

              if (intel_de_read(dev_priv, VLV_DP_B) & DP_DETECTED ||
has_port)
                      has_edp &= g4x_dp_init(display, VLV_DP_B,

PORT_B);
if ((intel_de_read(dev_priv, VLV_HDMIB) & SDVO_DETECTED
|| has_port) && !has_edp)

drivers/gpu/drm/i915/display/intel_display.c +1 -1
-                     g4x_hdmi_init(dev_priv, VLV_HDMIB, PORT_B);
+                     g4x_hdmi_init(display, VLV_HDMIB, PORT_B);
 
              has_edp = intel_dp_is_port_edp(display, PORT_C);
              has_port = intel_bios_is_port_present(display, PORT_C);
              if (intel_de_read(dev_priv, VLV_DP_C) & DP_DETECTED ||

has_port)

                      has_edp &= g4x_dp_init(display, VLV_DP_C,

PORT_C);
if ((intel_de_read(dev_priv, VLV_HDMIC) & SDVO_DETECTED
|| has_port) && !has_edp)

drivers/gpu/drm/i915/display/intel_display.c +1 -2
-                     g4x_hdmi_init(dev_priv, VLV_HDMIC, PORT_C);
+                     g4x_hdmi_init(display, VLV_HDMIC, PORT_C);
 
              if (IS_CHERRYVIEW(dev_priv)) {
                      /*
@@ -8295,7 +8295,7 @@ void intel_setup_outputs(struct drm_i915_private
 *dev_priv)
                      if (intel_de_read(dev_priv, CHV_DP_D) &
 DP_DETECTED || has_port)
                              g4x_dp_init(display, CHV_DP_D, PORT_D);
                      if (intel_de_read(dev_priv, CHV_HDMID) &
 SDVO_DETECTED || has_port)
-                             g4x_hdmi_init(dev_priv, CHV_HDMID,

PORT_D);
+ g4x_hdmi_init(display, CHV_HDMID,

PORT_D);
              }

              vlv_dsi_init(dev_priv);
drivers/gpu/drm/i915/display/intel_display.c +1 -1
@@ -8316,7 +8316,7 @@ void intel_setup_outputs(struct drm_i915_private
 *dev_priv)
                      if (!found && IS_G4X(dev_priv)) {
                              drm_dbg_kms(&dev_priv->drm,
                                          "probing HDMI on SDVOB\n");
-                             g4x_hdmi_init(dev_priv, GEN4_HDMIB,
 PORT_B);
+                             g4x_hdmi_init(display, GEN4_HDMIB,
 PORT_B);
                      }

                      if (!found && IS_G4X(dev_priv))
drivers/gpu/drm/i915/display/intel_display.c +1 -1
@@ -8335,7 +8335,7 @@ void intel_setup_outputs(struct drm_i915_private
 *dev_priv)
                      if (IS_G4X(dev_priv)) {
                              drm_dbg_kms(&dev_priv->drm,
                                          "probing HDMI on SDVOC\n");
-                             g4x_hdmi_init(dev_priv, GEN4_HDMIC,
 PORT_C);
+                             g4x_hdmi_init(display, GEN4_HDMIC,
 PORT_C);
                      }
                      if (IS_G4X(dev_priv))
                              g4x_dp_init(display, DP_C, PORT_C);

--
2.39.5

Signature · 1 line
Jani Nikula, Intel
Reviewed-by on v1 9/14
#22 lore raw

RE: [PATCH 09/14] drm/i915/display: convert intel_cpu_transcoder_mode_valid() to intel_display

In reply to Jani Nikula
Quoted 11 lines

-----Original Message-----
From: Intel-gfx <[email protected]> On Behalf Of Jani Nikula
Sent: Wednesday, February 12, 2025 10:07 PM
To: [email protected]; [email protected]
Cc: Nikula, Jani <[email protected]>
Subject: [PATCH 09/14] drm/i915/display: convert intel_cpu_transcoder_mode_valid() to intel_display

Quoted 5 lines

Going forward, struct intel_display is the main display device data pointer. Convert the intel_cpu_transcoder_mode_valid()() helper to struct intel_display, allowing further conversions elsewhere.

LGTM,

Quoted 260 lines
---
 drivers/gpu/drm/i915/display/icl_dsi.c       | 4 ++--
 drivers/gpu/drm/i915/display/intel_crt.c     | 2 +-
 drivers/gpu/drm/i915/display/intel_display.c | 6 +++---
drivers/gpu/drm/i915/display/intel_display.h | 2 +-
 drivers/gpu/drm/i915/display/intel_dp.c      | 2 +-
 drivers/gpu/drm/i915/display/intel_dp_mst.c  | 2 +-
 drivers/gpu/drm/i915/display/intel_dvo.c     | 6 +++---
 drivers/gpu/drm/i915/display/intel_hdmi.c    | 2 +-
 drivers/gpu/drm/i915/display/intel_lvds.c    | 6 +++---
 drivers/gpu/drm/i915/display/intel_sdvo.c    | 3 +--
 drivers/gpu/drm/i915/display/intel_tv.c      | 3 +--
 drivers/gpu/drm/i915/display/vlv_dsi.c       | 6 +++---
 12 files changed, 21 insertions(+), 23 deletions(-)
drivers/gpu/drm/i915/display/icl_dsi.c +0 -0
index 0f2a19690c18..1f0ff4000658 100644
@@ -1460,10 +1460,10 @@ static void gen11_dsi_post_disable(struct

intel_atomic_state *state, static enum drm_mode_status gen11_dsi_mode_valid(struct drm_connector *connector,
const struct
drm_display_mode *mode) {

drivers/gpu/drm/i915/display/icl_dsi.c +2 -2
-	struct drm_i915_private *i915 = to_i915(connector->dev);
+	struct intel_display *display = to_intel_display(connector->dev);
 	enum drm_mode_status status;
 
-	status = intel_cpu_transcoder_mode_valid(i915, mode);
+	status = intel_cpu_transcoder_mode_valid(display, mode);
 	if (status != MODE_OK)
 		return status;
drivers/gpu/drm/i915/display/intel_crt.c +1 -1
index 8eedae1d7684..321580b095e7 100644
@@ -360,7 +360,7 @@ intel_crt_mode_valid(struct drm_connector
 *connector,
 	enum drm_mode_status status;
 	int max_clock;
 
-	status = intel_cpu_transcoder_mode_valid(dev_priv, mode);
+	status = intel_cpu_transcoder_mode_valid(display, mode);
 	if (status != MODE_OK)
 		return status;
drivers/gpu/drm/i915/display/intel_display.c +3 -2
index e1186f46088d..7a25c84bfbac 100644
@@ -8464,14 +8464,14 @@ enum drm_mode_status intel_mode_valid(struct
 drm_device *dev,
 	return MODE_OK;
 }
 
-enum drm_mode_status intel_cpu_transcoder_mode_valid(struct
 drm_i915_private *dev_priv,
+enum drm_mode_status intel_cpu_transcoder_mode_valid(struct
+intel_display *display,
 						     const struct
 drm_display_mode *mode)  {
 	/*
 	 * Additional transcoder timing limits,
 	 * excluding BXT/GLK DSI transcoders.
 	 */
-	if (DISPLAY_VER(dev_priv) >= 5) {
+	if (DISPLAY_VER(display) >= 5) {
 		if (mode->hdisplay < 64 ||
 		    mode->htotal - mode->hdisplay < 32)
 			return MODE_H_ILLEGAL;
@@ -8490,7 +8490,7 @@ enum drm_mode_status

intel_cpu_transcoder_mode_valid(struct drm_i915_private *de

drivers/gpu/drm/i915/display/intel_display.c +1 -1
 	 * Cantiga+ cannot handle modes with a hsync front porch of 0.
 	 * WaPruneModeWithIncorrectHsyncOffset:ctg,elk,ilk,snb,ivb,vlv,hsw.
 	 */
-	if ((DISPLAY_VER(dev_priv) >= 5 || IS_G4X(dev_priv)) &&
+	if ((DISPLAY_VER(display) >= 5 || display->platform.g4x) &&
 	    mode->hsync_start == mode->hdisplay)
 		return MODE_H_ILLEGAL;
drivers/gpu/drm/i915/display/intel_display.h +1 -1
index 9439da737f5b..08e28ea179d2 100644
@@ -428,7 +428,7 @@ intel_mode_valid_max_plane_size(struct
 drm_i915_private *dev_priv,
 				const struct drm_display_mode *mode,
 				int num_joined_pipes);
 enum drm_mode_status
-intel_cpu_transcoder_mode_valid(struct drm_i915_private *i915,
+intel_cpu_transcoder_mode_valid(struct intel_display *display,
 				const struct drm_display_mode *mode);
 enum phy intel_port_to_phy(struct drm_i915_private *i915, enum port port);

bool is_trans_port_sync_mode(const struct intel_crtc_state *state); diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
index 9ed7d46143e9..61827b0fe95e 100644

drivers/gpu/drm/i915/display/intel_dp.c +1 -1
@@ -1407,7 +1407,7 @@ intel_dp_mode_valid(struct drm_connector
 *_connector,
 	bool dsc = false;
 	int num_joined_pipes;
 
-	status = intel_cpu_transcoder_mode_valid(dev_priv, mode);
+	status = intel_cpu_transcoder_mode_valid(display, mode);
 	if (status != MODE_OK)
 		return status;
drivers/gpu/drm/i915/display/intel_dp_mst.c +1 -1
index 459440dd6e87..38804254980b 100644
@@ -1481,7 +1481,7 @@ mst_connector_mode_valid_ctx(struct
 drm_connector *_connector,
 		return 0;
 	}
 
-	*status = intel_cpu_transcoder_mode_valid(i915, mode);
+	*status = intel_cpu_transcoder_mode_valid(display, mode);
 	if (*status != MODE_OK)
 		return 0;
drivers/gpu/drm/i915/display/intel_dvo.c +3 -3
index 29f8788fb26a..c16fb34b737d 100644
@@ -219,16 +219,16 @@ static enum drm_mode_status
 intel_dvo_mode_valid(struct drm_connector *_connector,
 		     const struct drm_display_mode *mode)  {
+	struct intel_display *display = to_intel_display(_connector->dev);
 	struct intel_connector *connector = to_intel_connector(_connector);
-	struct drm_i915_private *i915 = to_i915(connector->base.dev);
 	struct intel_dvo *intel_dvo = intel_attached_dvo(connector);
 	const struct drm_display_mode *fixed_mode =
 		intel_panel_fixed_mode(connector, mode);
-	int max_dotclk = to_i915(connector->base.dev)-
 >display.cdclk.max_dotclk_freq;
+	int max_dotclk = display->cdclk.max_dotclk_freq;
 	int target_clock = mode->clock;
 	enum drm_mode_status status;
 
-	status = intel_cpu_transcoder_mode_valid(i915, mode);
+	status = intel_cpu_transcoder_mode_valid(display, mode);
 	if (status != MODE_OK)
 		return status;
 
drivers/gpu/drm/i915/display/intel_hdmi.c +1 -1
index 015110fc57a2..60572deeffb3 100644
@@ -2023,7 +2023,7 @@ intel_hdmi_mode_valid(struct drm_connector
 *connector,
 	bool ycbcr_420_only;
 	enum intel_output_format sink_format;
 
-	status = intel_cpu_transcoder_mode_valid(dev_priv, mode);
+	status = intel_cpu_transcoder_mode_valid(display, mode);
 	if (status != MODE_OK)
 		return status;
drivers/gpu/drm/i915/display/intel_lvds.c +3 -3
index 6b05db2c10ba..7ed8625193fe 100644
@@ -394,14 +394,14 @@ static enum drm_mode_status
 intel_lvds_mode_valid(struct drm_connector *_connector,
 		      const struct drm_display_mode *mode)  {
+	struct intel_display *display = to_intel_display(_connector->dev);
 	struct intel_connector *connector = to_intel_connector(_connector);
-	struct drm_i915_private *i915 = to_i915(connector->base.dev);
 	const struct drm_display_mode *fixed_mode =
 		intel_panel_fixed_mode(connector, mode);
-	int max_pixclk = to_i915(connector->base.dev)-
 >display.cdclk.max_dotclk_freq;
+	int max_pixclk = display->cdclk.max_dotclk_freq;
 	enum drm_mode_status status;
 
-	status = intel_cpu_transcoder_mode_valid(i915, mode);
+	status = intel_cpu_transcoder_mode_valid(display, mode);
 	if (status != MODE_OK)
 		return status;
 
drivers/gpu/drm/i915/display/intel_sdvo.c +0 -1
index 1ae766212e8a..6e2d9929b4d7 100644
@@ -1943,7 +1943,6 @@ intel_sdvo_mode_valid(struct drm_connector
 *connector,
 		      const struct drm_display_mode *mode)  {
 	struct intel_display *display = to_intel_display(connector->dev);
-	struct drm_i915_private *i915 = to_i915(connector->dev);
 	struct intel_sdvo *intel_sdvo =
 intel_attached_sdvo(to_intel_connector(connector));
 	struct intel_sdvo_connector *intel_sdvo_connector =
drivers/gpu/drm/i915/display/intel_sdvo.c +1 -1
 		to_intel_sdvo_connector(connector);
@@ -1952,7 +1951,7 @@ intel_sdvo_mode_valid(struct drm_connector
 *connector,
 	enum drm_mode_status status;
 	int clock = mode->clock;
 
-	status = intel_cpu_transcoder_mode_valid(i915, mode);
+	status = intel_cpu_transcoder_mode_valid(display, mode);
 	if (status != MODE_OK)
 		return status;
drivers/gpu/drm/i915/display/intel_tv.c +1 -2
index 7838c92f8ded..5dbe857ea85b 100644
@@ -960,12 +960,11 @@ intel_tv_mode_valid(struct drm_connector
 *connector,
 		    const struct drm_display_mode *mode)  {
 	struct intel_display *display = to_intel_display(connector->dev);
-	struct drm_i915_private *i915 = to_i915(connector->dev);
 	const struct tv_mode *tv_mode = intel_tv_mode_find(connector-
 >state);
 	int max_dotclk = display->cdclk.max_dotclk_freq;
 	enum drm_mode_status status;
 
-	status = intel_cpu_transcoder_mode_valid(i915, mode);
+	status = intel_cpu_transcoder_mode_valid(display, mode);
 	if (status != MODE_OK)
 		return status;
drivers/gpu/drm/i915/display/vlv_dsi.c +0 -0
index d68876fe782c..7414794889e9 100644
@@ -1543,12 +1543,12 @@ static const struct drm_encoder_funcs

intel_dsi_funcs = { static enum drm_mode_status vlv_dsi_mode_valid(struct drm_connector *connector,
const struct drm_display_mode
*mode) {

drivers/gpu/drm/i915/display/vlv_dsi.c +3 -4
-	struct drm_i915_private *i915 = to_i915(connector->dev);
+	struct intel_display *display = to_intel_display(connector->dev);
 
-	if (IS_VALLEYVIEW(i915) || IS_CHERRYVIEW(i915)) {
+	if (display->platform.valleyview || display->platform.cherryview) {
 		enum drm_mode_status status;
 
-		status = intel_cpu_transcoder_mode_valid(i915, mode);
+		status = intel_cpu_transcoder_mode_valid(display, mode);
 		if (status != MODE_OK)
 			return status;
 	}
--

2.39.5

Reviewed-by on v1 10/14
#24 lore raw

RE: [PATCH 10/14] drm/i915/display: convert intel_mode_valid_max_plane_size() to intel_display

In reply to Jani Nikula
Quoted 11 lines

-----Original Message-----
From: Intel-xe <[email protected]> On Behalf Of Jani Nikula
Sent: Wednesday, February 12, 2025 10:07 PM
To: [email protected]; [email protected]
Cc: Nikula, Jani <[email protected]>
Subject: [PATCH 10/14] drm/i915/display: convert intel_mode_valid_max_plane_size() to intel_display

Quoted 5 lines

Going forward, struct intel_display is the main display device data pointer. Convert the intel_mode_valid_max_plane_size() helper to struct intel_display, allowing further conversions elsewhere.

LGTM,

Quoted 174 lines
---
 drivers/gpu/drm/i915/display/intel_display.c | 8 ++++----
drivers/gpu/drm/i915/display/intel_display.h | 2 +-
 drivers/gpu/drm/i915/display/intel_dp.c      | 3 +--
 drivers/gpu/drm/i915/display/intel_dp_mst.c  | 3 +--
 drivers/gpu/drm/i915/display/intel_dsi.c     | 8 ++++----
 drivers/gpu/drm/i915/display/intel_hdmi.c    | 3 +--
 6 files changed, 12 insertions(+), 15 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +2 -2
index 7a25c84bfbac..0450fdf9d4de 100644
@@ -8498,7 +8498,7 @@ enum drm_mode_status
 intel_cpu_transcoder_mode_valid(struct intel_display *displ  }
 
 enum drm_mode_status
-intel_mode_valid_max_plane_size(struct drm_i915_private *dev_priv,
+intel_mode_valid_max_plane_size(struct intel_display *display,
 				const struct drm_display_mode *mode,
 				int num_joined_pipes)
 {
@@ -8508,7 +8508,7 @@ intel_mode_valid_max_plane_size(struct
 drm_i915_private *dev_priv,
 	 * intel_mode_valid() should be
 	 * sufficient on older platforms.
 	 */
-	if (DISPLAY_VER(dev_priv) < 9)
+	if (DISPLAY_VER(display) < 9)
 		return MODE_OK;
 
drivers/gpu/drm/i915/display/intel_display.c +2 -2
 	/*
@@ -8516,10 +8516,10 @@ intel_mode_valid_max_plane_size(struct
 drm_i915_private *dev_priv,
 	 * plane so let's not advertize modes that are
 	 * too big for that.
 	 */
-	if (DISPLAY_VER(dev_priv) >= 30) {
+	if (DISPLAY_VER(display) >= 30) {
 		plane_width_max = 6144 * num_joined_pipes;
 		plane_height_max = 4800;
-	} else if (DISPLAY_VER(dev_priv) >= 11) {
+	} else if (DISPLAY_VER(display) >= 11) {
 		plane_width_max = 5120 * num_joined_pipes;
 		plane_height_max = 4320;
drivers/gpu/drm/i915/display/intel_display.c +0 -0
 	} else {
drivers/gpu/drm/i915/display/intel_display.h +0 -0
index 08e28ea179d2..f702425df305 100644
@@ -424,7 +424,7 @@ void intel_link_compute_m_n(u16 bpp, int nlanes,
 u32 intel_plane_fb_max_stride(struct drm_device *drm,
 			      u32 pixel_format, u64 modifier);  enum

drm_mode_status -intel_mode_valid_max_plane_size(struct drm_i915_private *dev_priv,

drivers/gpu/drm/i915/display/intel_display.h +1 -0
+intel_mode_valid_max_plane_size(struct intel_display *display,
 				const struct drm_display_mode *mode,
 				int num_joined_pipes);
 enum drm_mode_status
drivers/gpu/drm/i915/display/intel_dp.c +0 -1
index 61827b0fe95e..29970baaf03e 100644
@@ -1396,7 +1396,6 @@ intel_dp_mode_valid(struct drm_connector
 *_connector,
 	struct intel_display *display = to_intel_display(_connector->dev);
 	struct intel_connector *connector = to_intel_connector(_connector);
 	struct intel_dp *intel_dp = intel_attached_dp(connector);
-	struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
 	const struct drm_display_mode *fixed_mode;
 	int target_clock = mode->clock;
drivers/gpu/drm/i915/display/intel_dp.c +1 -1
 	int max_rate, mode_rate, max_lanes, max_link_clock; @@ -1496,7
+1495,7 @@ intel_dp_mode_valid(struct drm_connector *_connector,
 	if (status != MODE_OK)
 		return status;
 
-	return intel_mode_valid_max_plane_size(dev_priv, mode,

num_joined_pipes);

drivers/gpu/drm/i915/display/intel_dp.c +2 -0
+	return intel_mode_valid_max_plane_size(display, mode,
+num_joined_pipes);
 }
 
 bool intel_dp_source_supports_tps3(struct intel_display *display) diff --git

a/drivers/gpu/drm/i915/display/intel_dp_mst.c
b/drivers/gpu/drm/i915/display/intel_dp_mst.c
index 38804254980b..73a0a0f9b3d0 100644

drivers/gpu/drm/i915/display/intel_dp_mst.c +1 -1
@@ -1462,7 +1462,6 @@ mst_connector_mode_valid_ctx(struct
 drm_connector *_connector,  {
 	struct intel_connector *connector = to_intel_connector(_connector);
 	struct intel_display *display = to_intel_display(connector);
-	struct drm_i915_private *i915 = to_i915(display->drm);
 	struct intel_dp *intel_dp = connector->mst_port;
 	struct drm_dp_mst_topology_mgr *mgr = &intel_dp->mst_mgr;
 	struct drm_dp_mst_port *port = connector->port; @@ -1565,7
+1564,7 @@ mst_connector_mode_valid_ctx(struct drm_connector

*_connector,

drivers/gpu/drm/i915/display/intel_dp_mst.c +0 -1
 		return 0;
 	}
 
-	*status = intel_mode_valid_max_plane_size(i915, mode,

num_joined_pipes);

drivers/gpu/drm/i915/display/intel_dp_mst.c +2 -0
+	*status = intel_mode_valid_max_plane_size(display, mode,
+num_joined_pipes);
 	return 0;
 }
drivers/gpu/drm/i915/display/intel_dsi.c +3 -3
index c93a3cf75c52..403151175a87 100644
@@ -60,14 +60,14 @@ int intel_dsi_get_modes(struct drm_connector
 *connector)  enum drm_mode_status intel_dsi_mode_valid(struct
 drm_connector *connector,
 					  const struct drm_display_mode
 *mode)  {
-	struct drm_i915_private *dev_priv = to_i915(connector->dev);
+	struct intel_display *display = to_intel_display(connector->dev);
 	struct intel_connector *intel_connector =
 to_intel_connector(connector);
 	const struct drm_display_mode *fixed_mode =
 		intel_panel_fixed_mode(intel_connector, mode);
-	int max_dotclk = to_i915(connector->dev)-
 >display.cdclk.max_dotclk_freq;
+	int max_dotclk = display->cdclk.max_dotclk_freq;
 	enum drm_mode_status status;
 
-	drm_dbg_kms(&dev_priv->drm, "\n");
+	drm_dbg_kms(display->drm, "\n");
drivers/gpu/drm/i915/display/intel_dsi.c +1 -1
 	status = intel_panel_mode_valid(intel_connector, mode);
 	if (status != MODE_OK)
@@ -76,7 +76,7 @@ enum drm_mode_status intel_dsi_mode_valid(struct
 drm_connector *connector,
 	if (fixed_mode->clock > max_dotclk)
 		return MODE_CLOCK_HIGH;
 
-	return intel_mode_valid_max_plane_size(dev_priv, mode, 1);
+	return intel_mode_valid_max_plane_size(display, mode, 1);
 }
 

struct intel_dsi_host *intel_dsi_host_init(struct intel_dsi *intel_dsi, diff --git
a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c
index 60572deeffb3..ed017d9de920 100644

drivers/gpu/drm/i915/display/intel_hdmi.c +0 -1
@@ -2015,7 +2015,6 @@ intel_hdmi_mode_valid(struct drm_connector
 *connector,  {
 	struct intel_display *display = to_intel_display(connector->dev);
 	struct intel_hdmi *hdmi =
 intel_attached_hdmi(to_intel_connector(connector));
-	struct drm_i915_private *dev_priv = to_i915(display->drm);
 	enum drm_mode_status status;
 	int clock = mode->clock;

int max_dotclk = to_i915(connector->dev)-

Quoted 1 line

display.cdclk.max_dotclk_freq;

drivers/gpu/drm/i915/display/intel_hdmi.c +1 -1
@@ -2068,7 +2067,7 @@ intel_hdmi_mode_valid(struct drm_connector
 *connector,
 			return status;
 	}
 
-	return intel_mode_valid_max_plane_size(dev_priv, mode, 1);
+	return intel_mode_valid_max_plane_size(display, mode, 1);
 }
 

bool intel_hdmi_bpc_possible(const struct intel_crtc_state *crtc_state,
--
2.39.5

#4 lore raw

RE: [PATCH 01/14] drm/i915/dp: convert g4x_dp.[ch] to struct intel display

In reply to Jani Nikula
Quoted 284 lines

-----Original Message-----
From: Nikula, Jani <[email protected]>
Sent: Thursday, February 13, 2025 2:43 PM
To: Kandpal, Suraj <[email protected]>; [email protected]; [email protected]
Subject: RE: [PATCH 01/14] drm/i915/dp: convert g4x_dp.[ch] to struct intel display

Quoted 130 lines · Suraj
Quoted 130 lines

-----Original Message-----
From: Intel-gfx <[email protected]> On Behalf Of Jani Nikula
Sent: Wednesday, February 12, 2025 10:07 PM
To: [email protected]; [email protected]
Cc: Nikula, Jani <[email protected]>
Subject: [PATCH 01/14] drm/i915/dp: convert g4x_dp.[ch] to struct intel display

Going forward, struct intel_display is the main display device data pointer. Convert as much as possible of g4x_dp.[ch] to struct intel_display.

---
 drivers/gpu/drm/i915/display/g4x_dp.c         | 80 +++++++++----------
 drivers/gpu/drm/i915/display/g4x_dp.h         | 14 ++--
 drivers/gpu/drm/i915/display/intel_display.c  | 20 ++---
.../gpu/drm/i915/display/intel_pch_display.c  |  2 +-
 drivers/gpu/drm/i915/display/intel_pps.c      | 11 ++-
 5 files changed, 61 insertions(+), 66 deletions(-)
drivers/gpu/drm/i915/display/g4x_dp.c +0 -0
index d3b5ead188ba..cfc796607a78 100644
@@ -51,28 +51,29 @@ static const struct dpll chv_dpll[] = {
      { .dot = 270000, .p1 = 4, .p2 = 1, .n = 1, .m1 = 2, .m2 =

0x6c00000 /*
27.0 */ }, };

drivers/gpu/drm/i915/display/g4x_dp.c +8 -6
-const struct dpll *vlv_get_dpll(struct drm_i915_private *i915)
+const struct dpll *vlv_get_dpll(struct intel_display *display)
 {
-     return IS_CHERRYVIEW(i915) ? &chv_dpll[0] : &vlv_dpll[0];
+     return display->platform.cherryview ? &chv_dpll[0] :
+ &vlv_dpll[0];
 }
 
 static void g4x_dp_set_clock(struct intel_encoder *encoder,
                           struct intel_crtc_state *pipe_config)  {
+     struct intel_display *display = to_intel_display(encoder);
      struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
      const struct dpll *divisor = NULL;
      int i, count = 0;
 
-     if (IS_G4X(dev_priv)) {
+     if (display->platform.g4x) {
              divisor = g4x_dpll;
              count = ARRAY_SIZE(g4x_dpll);
      } else if (HAS_PCH_SPLIT(dev_priv)) {
              divisor = pch_dpll;
              count = ARRAY_SIZE(pch_dpll);
-     } else if (IS_CHERRYVIEW(dev_priv)) {
+     } else if (display->platform.cherryview) {
              divisor = chv_dpll;
              count = ARRAY_SIZE(chv_dpll);
-     } else if (IS_VALLEYVIEW(dev_priv)) {
+     } else if (display->platform.valleyview) {
              divisor = vlv_dpll;
              count = ARRAY_SIZE(vlv_dpll);
      }
@@ -129,7 +130,7 @@ static void intel_dp_prepare(struct intel_encoder
 *encoder,
 
      /* Split out the IBX/CPU vs CPT settings */
 
-     if (IS_IVYBRIDGE(dev_priv) && port == PORT_A) {
+     if (display->platform.ivybridge && port == PORT_A) {
              if (adjusted_mode->flags & DRM_MODE_FLAG_PHSYNC)
                      intel_dp->DP |= DP_SYNC_HS_HIGH;
              if (adjusted_mode->flags & DRM_MODE_FLAG_PVSYNC) @@
-148,7 +149,7 @@ static void intel_dp_prepare(struct intel_encoder
*encoder,
                           pipe_config->enhanced_framing ?
                           TRANS_DP_ENH_FRAMING : 0);
      } else {
drivers/gpu/drm/i915/display/g4x_dp.c +1 -1
-             if (IS_G4X(dev_priv) && pipe_config->limited_color_range)
+             if (display->platform.g4x && pipe_config-
Quoted 1 line

limited_color_range)

                      intel_dp->DP |= DP_COLOR_RANGE_16_235;

              if (adjusted_mode->flags & DRM_MODE_FLAG_PHSYNC) @@
-160,7 +161,7 @@ static void intel_dp_prepare(struct intel_encoder
*encoder,
              if (pipe_config->enhanced_framing)
                      intel_dp->DP |= DP_ENHANCED_FRAMING;
drivers/gpu/drm/i915/display/g4x_dp.c +3 -2
-             if (IS_CHERRYVIEW(dev_priv))
+             if (display->platform.cherryview)
                      intel_dp->DP |= DP_PIPE_SEL_CHV(crtc->pipe);
              else
                      intel_dp->DP |= DP_PIPE_SEL(crtc->pipe); @@
-180,9
+181,8 @@ static void assert_dp_port(struct intel_dp *intel_dp, bool
+state)

} #define assert_dp_port_disabled(d) assert_dp_port((d), false)

-static void assert_edp_pll(struct drm_i915_private *dev_priv, bool state)

drivers/gpu/drm/i915/display/g4x_dp.c +4 -2
+static void assert_edp_pll(struct intel_display *display, bool
+state)
 {
-     struct intel_display *display = &dev_priv->display;
      bool cur_state = intel_de_read(display, DP_A) & DP_PLL_ENABLE;
 
      INTEL_DISPLAY_STATE_WARN(display, cur_state != state, @@ -201,7
+201,7 @@ static void ilk_edp_pll_on(struct intel_dp *intel_dp,
 
      assert_transcoder_disabled(dev_priv, pipe_config->cpu_transcoder);
      assert_dp_port_disabled(intel_dp);
-     assert_edp_pll_disabled(dev_priv);
+     assert_edp_pll_disabled(display);
 
      drm_dbg_kms(display->drm, "enabling eDP PLL for clock %d\n",
                  pipe_config->port_clock); @@ -223,7 +223,7 @@

static void ilk_edp_pll_on(struct intel_dp *intel_dp,
* 1. Wait for the start of vertical blank on the enabled pipe
going to FDI
* 2. Program DP PLL enable
*/

drivers/gpu/drm/i915/display/g4x_dp.c +1 -1
-     if (IS_IRONLAKE(dev_priv))
+     if (display->platform.ironlake)
              intel_wait_for_vblank_if_active(display, !crtc->pipe);
 
      intel_dp->DP |= DP_PLL_ENABLE;
@@ -242,7 +242,7 @@ static void ilk_edp_pll_off(struct intel_dp
 *intel_dp,
 
      assert_transcoder_disabled(dev_priv, old_crtc_state-
Quoted 8 lines

drivers/gpu/drm/i915/display/g4x_dp.c static void ilk_edp_pll_off(struct intel_dp

Quoted 8 lines
drivers/gpu/drm/i915/display/g4x_dp.c +1 -1
 >cpu_transcoder);
      assert_dp_port_disabled(intel_dp);
-     assert_edp_pll_enabled(dev_priv);
+     assert_edp_pll_enabled(display);
 
      drm_dbg_kms(display->drm, "disabling eDP PLL\n");
drivers/gpu/drm/i915/display/g4x_dp.c +0 -0
@@ -253,10 +253,9 @@ static void ilk_edp_pll_off(struct intel_dp

*intel_dp,

Quoted 130 lines
Quoted 123 lines
drivers/gpu/drm/i915/display/g4x_dp.c +6 -7
      udelay(200);
 }
 
-static bool cpt_dp_port_selected(struct drm_i915_private *dev_priv,
+static bool cpt_dp_port_selected(struct intel_display *display,
                               enum port port, enum pipe *pipe)  {
-     struct intel_display *display = &dev_priv->display;
      enum pipe p;
 
      for_each_pipe(display, p) {
@@ -277,11 +276,11 @@ static bool cpt_dp_port_selected(struct
 drm_i915_private *dev_priv,
      return false;
 }
 
-bool g4x_dp_port_enabled(struct drm_i915_private *dev_priv,
+bool g4x_dp_port_enabled(struct intel_display *display,
                       i915_reg_t dp_reg, enum port port,
                       enum pipe *pipe)  {
-     struct intel_display *display = &dev_priv->display;
+     struct drm_i915_private *dev_priv = to_i915(display->drm);
      bool ret;
      u32 val;
 
@@ -290,11 +289,11 @@ bool g4x_dp_port_enabled(struct
 drm_i915_private *dev_priv,
      ret = val & DP_PORT_EN;
 
      /* asserts want to know the pipe even if the port is disabled */
-     if (IS_IVYBRIDGE(dev_priv) && port == PORT_A)
+     if (display->platform.ivybridge && port == PORT_A)
              *pipe = (val & DP_PIPE_SEL_MASK_IVB) >>
 DP_PIPE_SEL_SHIFT_IVB;
      else if (HAS_PCH_CPT(dev_priv) && port != PORT_A)
-             ret &= cpt_dp_port_selected(dev_priv, port, pipe);
-     else if (IS_CHERRYVIEW(dev_priv))
+             ret &= cpt_dp_port_selected(display, port, pipe);
+     else if (display->platform.cherryview)
              *pipe = (val & DP_PIPE_SEL_MASK_CHV) >>
DP_PIPE_SEL_SHIFT_CHV;
      else
              *pipe = (val & DP_PIPE_SEL_MASK) >> DP_PIPE_SEL_SHIFT;
drivers/gpu/drm/i915/display/g4x_dp.c +1 -2
@@ -306,7 +305,6 @@ static bool intel_dp_get_hw_state(struct
 intel_encoder *encoder,
                                enum pipe *pipe)  {
      struct intel_display *display = to_intel_display(encoder);
-     struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
      struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
      intel_wakeref_t wakeref;
      bool ret;
@@ -316,7 +314,7 @@ static bool intel_dp_get_hw_state(struct
 intel_encoder *encoder,
      if (!wakeref)
              return false;
 
-     ret = g4x_dp_port_enabled(dev_priv, intel_dp->output_reg,
+     ret = g4x_dp_port_enabled(display, intel_dp->output_reg,
                                encoder->port, pipe);
 
      intel_display_power_put(display, encoder->power_domain,

wakeref); @@ -391,7 +389,7 @@ static void intel_dp_get_config(struct intel_encoder *encoder,

      pipe_config->hw.adjusted_mode.flags |= flags;
drivers/gpu/drm/i915/display/g4x_dp.c +6 -5
-     if (IS_G4X(dev_priv) && tmp & DP_COLOR_RANGE_16_235)
+     if (display->platform.g4x && tmp & DP_COLOR_RANGE_16_235)
              pipe_config->limited_color_range = true;
 
      pipe_config->lane_count =
@@ -433,7 +431,7 @@ intel_dp_link_down(struct intel_encoder *encoder,
 
      drm_dbg_kms(display->drm, "\n");
 
-     if ((IS_IVYBRIDGE(dev_priv) && port == PORT_A) ||
+     if ((display->platform.ivybridge && port == PORT_A) ||
          (HAS_PCH_CPT(dev_priv) && port != PORT_A)) {
              intel_dp->DP &= ~DP_LINK_TRAIN_MASK_CPT;
              intel_dp->DP |= DP_LINK_TRAIN_PAT_IDLE_CPT; @@ -479,7
+477,7 @@ intel_dp_link_down(struct intel_encoder *encoder,
 
      msleep(intel_dp->pps.panel_power_down_delay);
 
-     if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv))
+     if (display->platform.valleyview ||
+ display->platform.cherryview)
              vlv_pps_port_disable(encoder, old_crtc_state);  }
@@ -682,7 +680,6 @@ static void intel_enable_dp(struct
 intel_atomic_state *state,
                          const struct drm_connector_state *conn_state)  {
      struct intel_display *display = to_intel_display(state);
-     struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
      struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
      u32 dp_reg = intel_de_read(display, intel_dp->output_reg);
      intel_wakeref_t wakeref;
@@ -691,7 +688,7 @@ static void intel_enable_dp(struct
 intel_atomic_state *state,
              return;
 
      with_intel_pps_lock(intel_dp, wakeref) {
-             if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv))
+             if (display->platform.valleyview || display-
 >platform.cherryview)
                      vlv_pps_port_enable_unlocked(encoder,

pipe_config);

              intel_dp_enable_port(intel_dp, pipe_config); @@ -701,10

+698,10 @@ static void intel_enable_dp(struct intel_atomic_state

drivers/gpu/drm/i915/display/g4x_dp.c +4 -2
+*state,
              intel_pps_vdd_off_unlocked(intel_dp, true);
      }
 
-     if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) {
+     if (display->platform.valleyview ||
+ display->platform.cherryview) {
              unsigned int lane_mask = 0x0;
 
-             if (IS_CHERRYVIEW(dev_priv))
+             if (display->platform.cherryview)
                      lane_mask =

intel_dp_unused_lane_mask(pipe_config->lane_count);

Quoted 6 lines

vlv_wait_port_ready(display, dp_to_dig_port(intel_dp),
lane_mask); @@ -1264,7 +1261,6 @@ static void intel_dp_encoder_destroy(struct drm_encoder *encoder) static void

intel_dp_encoder_reset(struct drm_encoder *encoder)  {
      struct intel_display *display = to_intel_display(encoder->dev);

- struct drm_i915_private *dev_priv = to_i915(encoder->dev);

Quoted 3 lines

I know this hasn't changed in this patch and is already there merged in code but a good chance to Do to_intel_display(encoder) instead of encoder->dev

Quoted 7 lines

to_intel_display() intentionally doesn't handle drm_encoder, so can't.

Quoted 3 lines

Otherwise
LGTM,

Thanks, but I've just merged the series with Ville's Reviewed-by.

Ohkay didn't read this till I got to the 10th patch

Regards,
Suraj Kandpal

Quoted 329 lines

BR,
Jani.

Quoted 262 lines
Quoted 262 lines

struct intel_dp *intel_dp =
enc_to_intel_dp(to_intel_encoder(encoder));

      intel_dp->DP = intel_de_read(display, intel_dp->output_reg); @@

-
1272,7 +1268,7 @@ static void intel_dp_encoder_reset(struct drm_encoder
*encoder)

      intel_dp->reset_link_params = true;
      intel_dp_invalidate_source_oui(intel_dp);
drivers/gpu/drm/i915/display/g4x_dp.c +4 -3
-     if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv))
+     if (display->platform.valleyview ||
+ display->platform.cherryview)
              vlv_pps_pipe_reset(intel_dp);
 
      intel_pps_encoder_reset(intel_dp);
@@ -1283,10 +1279,10 @@ static const struct drm_encoder_funcs
 intel_dp_enc_funcs = {
      .destroy = intel_dp_encoder_destroy,  };
 
-bool g4x_dp_init(struct drm_i915_private *dev_priv,
+bool g4x_dp_init(struct intel_display *display,
               i915_reg_t output_reg, enum port port)  {
-     struct intel_display *display = &dev_priv->display;
+     struct drm_i915_private *dev_priv = to_i915(display->drm);
      const struct intel_bios_encoder_data *devdata;
      struct intel_digital_port *dig_port;
      struct intel_encoder *intel_encoder; @@ -1337,14 +1333,14 @@
 bool g4x_dp_init(struct drm_i915_private *dev_priv,
      intel_encoder->suspend = intel_dp_encoder_suspend;
      intel_encoder->suspend_complete = g4x_dp_suspend_complete;
      intel_encoder->shutdown = intel_dp_encoder_shutdown;
drivers/gpu/drm/i915/display/g4x_dp.c +7 -6
-     if (IS_CHERRYVIEW(dev_priv)) {
+     if (display->platform.cherryview) {
              intel_encoder->pre_pll_enable = chv_dp_pre_pll_enable;
              intel_encoder->pre_enable = chv_pre_enable_dp;
              intel_encoder->enable = vlv_enable_dp;
              intel_encoder->disable = vlv_disable_dp;
              intel_encoder->post_disable = chv_post_disable_dp;
              intel_encoder->post_pll_disable = chv_dp_post_pll_disable;
-     } else if (IS_VALLEYVIEW(dev_priv)) {
+     } else if (display->platform.valleyview) {
              intel_encoder->pre_pll_enable = vlv_dp_pre_pll_enable;
              intel_encoder->pre_enable = vlv_pre_enable_dp;
              intel_encoder->enable = vlv_enable_dp; @@ -1359,24
+1355,24 @@ bool g4x_dp_init(struct drm_i915_private *dev_priv,
      intel_encoder->audio_enable = g4x_dp_audio_enable;
      intel_encoder->audio_disable = g4x_dp_audio_disable;
 
-     if ((IS_IVYBRIDGE(dev_priv) && port == PORT_A) ||
+     if ((display->platform.ivybridge && port == PORT_A) ||
          (HAS_PCH_CPT(dev_priv) && port != PORT_A))
              dig_port->dp.set_link_train = cpt_set_link_train;
      else
              dig_port->dp.set_link_train = g4x_set_link_train;
 
-     if (IS_CHERRYVIEW(dev_priv))
+     if (display->platform.cherryview)
              intel_encoder->set_signal_levels = chv_set_signal_levels;
-     else if (IS_VALLEYVIEW(dev_priv))
+     else if (display->platform.valleyview)
              intel_encoder->set_signal_levels = vlv_set_signal_levels;
-     else if (IS_IVYBRIDGE(dev_priv) && port == PORT_A)
+     else if (display->platform.ivybridge && port == PORT_A)
              intel_encoder->set_signal_levels =

ivb_cpu_edp_set_signal_levels;

drivers/gpu/drm/i915/display/g4x_dp.c +1 -1
-     else if (IS_SANDYBRIDGE(dev_priv) && port == PORT_A)
+     else if (display->platform.sandybridge && port == PORT_A)
              intel_encoder->set_signal_levels =
snb_cpu_edp_set_signal_levels;
      else
              intel_encoder->set_signal_levels =

g4x_set_signal_levels;

drivers/gpu/drm/i915/display/g4x_dp.c +2 -1
-     if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv) ||
+     if (display->platform.valleyview ||
+ display->platform.cherryview ||
          (HAS_PCH_SPLIT(dev_priv) && port != PORT_A)) {
              dig_port->dp.preemph_max = intel_dp_preemph_max_3;
              dig_port->dp.voltage_max = intel_dp_voltage_max_3; @@ -

1390,7 +1386,7 @@ bool g4x_dp_init(struct drm_i915_private *dev_priv,

      intel_encoder->type = INTEL_OUTPUT_DP;
      intel_encoder->power_domain =

intel_display_power_ddi_lanes_domain(display, port);

drivers/gpu/drm/i915/display/g4x_dp.c +1 -1
-     if (IS_CHERRYVIEW(dev_priv)) {
+     if (display->platform.cherryview) {
              if (port == PORT_D)
                      intel_encoder->pipe_mask = BIT(PIPE_C);
              else
drivers/gpu/drm/i915/display/g4x_dp.h +9 -5
index 839a251dc069..0b28951b8365 100644
@@ -12,30 +12,30 @@
 
 enum pipe;
 enum port;
-struct drm_i915_private;
 struct intel_crtc_state;
+struct intel_display;
 struct intel_dp;
 struct intel_encoder;
 
 #ifdef I915
-const struct dpll *vlv_get_dpll(struct drm_i915_private *i915);
-bool g4x_dp_port_enabled(struct drm_i915_private *dev_priv,
+const struct dpll *vlv_get_dpll(struct intel_display *display); bool
+g4x_dp_port_enabled(struct intel_display *display,
                       i915_reg_t dp_reg, enum port port,
                       enum pipe *pipe); -bool g4x_dp_init(struct
 drm_i915_private *dev_priv,
+bool g4x_dp_init(struct intel_display *display,
               i915_reg_t output_reg, enum port port);  #else -static
 inline const struct dpll *vlv_get_dpll(struct drm_i915_private *i915)
+static inline const struct dpll *vlv_get_dpll(struct intel_display
+*display)
 {
      return NULL;
 }
-static inline bool g4x_dp_port_enabled(struct drm_i915_private
 *dev_priv,
+static inline bool g4x_dp_port_enabled(struct intel_display
+*display,
                                     i915_reg_t dp_reg, int port,
                                     enum pipe *pipe)  {
      return false;
 }
-static inline bool g4x_dp_init(struct drm_i915_private *dev_priv,
+static inline bool g4x_dp_init(struct intel_display *display,
                             i915_reg_t output_reg, int port)  {
      return false;
drivers/gpu/drm/i915/display/intel_display.c +0 -0
index 6c1e7441313e..e5ceedf56335 100644
@@ -8229,7 +8229,7 @@ void intel_setup_outputs(struct

drm_i915_private
*dev_priv)

              dpd_is_edp = intel_dp_is_port_edp(display, PORT_D);

              if (ilk_has_edp_a(dev_priv))
drivers/gpu/drm/i915/display/intel_display.c +1 -1
-                     g4x_dp_init(dev_priv, DP_A, PORT_A);
+                     g4x_dp_init(display, DP_A, PORT_A);
 
              if (intel_de_read(dev_priv, PCH_HDMIB) & SDVO_DETECTED)
{
                      /* PCH SDVOB multiplex with HDMIB */ @@ -8237,7
+8237,7 @@ void intel_setup_outputs(struct drm_i915_private
+*dev_priv)
                      if (!found)
                              g4x_hdmi_init(dev_priv, PCH_HDMIB,
PORT_B);
                      if (!found && (intel_de_read(dev_priv,

PCH_DP_B) &
DP_DETECTED))

drivers/gpu/drm/i915/display/intel_display.c +4 -4
-                             g4x_dp_init(dev_priv, PCH_DP_B, PORT_B);
+                             g4x_dp_init(display, PCH_DP_B, PORT_B);
              }
 
              if (intel_de_read(dev_priv, PCH_HDMIC) & SDVO_DETECTED)
@@ -8247,10 +8247,10 @@ void intel_setup_outputs(struct
 drm_i915_private *dev_priv)
                      g4x_hdmi_init(dev_priv, PCH_HDMID, PORT_D);
 
              if (intel_de_read(dev_priv, PCH_DP_C) & DP_DETECTED)
-                     g4x_dp_init(dev_priv, PCH_DP_C, PORT_C);
+                     g4x_dp_init(display, PCH_DP_C, PORT_C);
 
              if (intel_de_read(dev_priv, PCH_DP_D) & DP_DETECTED)
-                     g4x_dp_init(dev_priv, PCH_DP_D, PORT_D);
+                     g4x_dp_init(display, PCH_DP_D, PORT_D);
      } else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) {
              bool has_edp, has_port;
@@ -8275,14 +8275,14 @@ void intel_setup_outputs(struct
 drm_i915_private *dev_priv)
              has_edp = intel_dp_is_port_edp(display, PORT_B);
              has_port = intel_bios_is_port_present(display, PORT_B);
              if (intel_de_read(dev_priv, VLV_DP_B) & DP_DETECTED ||
 has_port)
-                     has_edp &= g4x_dp_init(dev_priv, VLV_DP_B,
 PORT_B);
+                     has_edp &= g4x_dp_init(display, VLV_DP_B,
 PORT_B);
              if ((intel_de_read(dev_priv, VLV_HDMIB) & SDVO_DETECTED
 || has_port) && !has_edp)
                      g4x_hdmi_init(dev_priv, VLV_HDMIB, PORT_B);
 
              has_edp = intel_dp_is_port_edp(display, PORT_C);
              has_port = intel_bios_is_port_present(display, PORT_C);
              if (intel_de_read(dev_priv, VLV_DP_C) & DP_DETECTED ||

has_port)
- has_edp &= g4x_dp_init(dev_priv, VLV_DP_C,
PORT_C);
+ has_edp &= g4x_dp_init(display, VLV_DP_C,
PORT_C);
if ((intel_de_read(dev_priv, VLV_HDMIC) & SDVO_DETECTED
|| has_port) && !has_edp)

                      g4x_hdmi_init(dev_priv, VLV_HDMIC, PORT_C);
drivers/gpu/drm/i915/display/intel_display.c +0 -0
@@ -8293,7 +8293,7 @@ void intel_setup_outputs(struct

drm_i915_private
*dev_priv)
*/
has_port = intel_bios_is_port_present(display,

PORT_D);
                      if (intel_de_read(dev_priv, CHV_DP_D) &

DP_DETECTED || has_port)

drivers/gpu/drm/i915/display/intel_display.c +1 -1
-                             g4x_dp_init(dev_priv, CHV_DP_D, PORT_D);
+                             g4x_dp_init(display, CHV_DP_D, PORT_D);
                      if (intel_de_read(dev_priv, CHV_HDMID) &

SDVO_DETECTED || has_port)
g4x_hdmi_init(dev_priv, CHV_HDMID,

PORT_D);
              }
drivers/gpu/drm/i915/display/intel_display.c +0 -0
@@ -8320,7 +8320,7 @@ void intel_setup_outputs(struct

drm_i915_private
*dev_priv)

                      }

                      if (!found && IS_G4X(dev_priv))
drivers/gpu/drm/i915/display/intel_display.c +1 -1
-                             g4x_dp_init(dev_priv, DP_B, PORT_B);
+                             g4x_dp_init(display, DP_B, PORT_B);
              }
 
              /* Before G4X SDVOC doesn't have its own detect

register */ @@ -8338,11 +8338,11 @@ void intel_setup_outputs(struct drm_i915_private *dev_priv)

                              g4x_hdmi_init(dev_priv, GEN4_HDMIC,
PORT_C);
                      }
                      if (IS_G4X(dev_priv))
drivers/gpu/drm/i915/display/intel_display.c +1 -1
-                             g4x_dp_init(dev_priv, DP_C, PORT_C);
+                             g4x_dp_init(display, DP_C, PORT_C);
              }
 
              if (IS_G4X(dev_priv) && (intel_de_read(dev_priv, DP_D)

&
DP_DETECTED))

drivers/gpu/drm/i915/display/intel_display.c +1 -1
-                     g4x_dp_init(dev_priv, DP_D, PORT_D);
+                     g4x_dp_init(display, DP_D, PORT_D);
 
              if (SUPPORTS_TV(dev_priv))
                      intel_tv_init(display); diff --git

a/drivers/gpu/drm/i915/display/intel_pch_display.c b/drivers/gpu/drm/i915/display/intel_pch_display.c index 75ff5592312f..98a6b57ac956 100644

drivers/gpu/drm/i915/display/intel_pch_display.c +1 -1
@@ -45,7 +45,7 @@ static void assert_pch_dp_disabled(struct
 drm_i915_private *dev_priv,
      enum pipe port_pipe;
      bool state;
 
-     state = g4x_dp_port_enabled(dev_priv, dp_reg, port, &port_pipe);
+     state = g4x_dp_port_enabled(display, dp_reg, port, &port_pipe);
 
Quoted 9 lines

drivers/gpu/drm/i915/display/intel_pps.c vlv_power_sequencer_kick(struct intel_dp

Quoted 9 lines
drivers/gpu/drm/i915/display/intel_pch_display.c +0 -0
      INTEL_DISPLAY_STATE_WARN(display, state && port_pipe == pipe,

"PCH DP %c enabled on transcoder %c,
should be disabled\n", diff --git a/drivers/gpu/drm/i915/display/intel_pps.c b/drivers/gpu/drm/i915/display/intel_pps.c
index ef6effaf82e0..617ce4993172 100644

drivers/gpu/drm/i915/display/intel_pps.c +0 -0
@@ -134,7 +134,7 @@ vlv_power_sequencer_kick(struct intel_dp

*intel_dp)

Quoted 41 lines
Quoted 41 lines
drivers/gpu/drm/i915/display/intel_pps.c +2 -1
              release_cl_override = display->platform.cherryview &&
                      !chv_phy_powergate_ch(display, phy, ch, true);
 
-             if (vlv_force_pll_on(dev_priv, pipe, vlv_get_dpll(dev_priv))) {
+             if (vlv_force_pll_on(dev_priv, pipe,
+ vlv_get_dpll(display))) {
                      drm_err(display->drm,
                              "Failed to force on PLL for pipe %c!\n",
                              pipe_name(pipe)); @@ -1225,11 +1225,10

@@ static void vlv_steal_power_sequencer(struct intel_display *display, static enum pipe vlv_active_pipe(struct intel_dp

*intel_dp)  {
      struct intel_display *display = to_intel_display(intel_dp);
drivers/gpu/drm/i915/display/intel_pps.c +3 -4
-     struct drm_i915_private *dev_priv = to_i915(display->drm);
      struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base;
      enum pipe pipe;
 
-     if (g4x_dp_port_enabled(dev_priv, intel_dp->output_reg,
+     if (g4x_dp_port_enabled(display, intel_dp->output_reg,
                              encoder->port, &pipe))
              return pipe;
@@ -1859,13 +1858,13 @@ void assert_pps_unlocked(struct intel_display
 *display, enum pipe pipe)
                      intel_lvds_port_enabled(dev_priv, PCH_LVDS,
 &panel_pipe);
                      break;
              case PANEL_PORT_SELECT_DPA:
-                     g4x_dp_port_enabled(dev_priv, DP_A, PORT_A,
 &panel_pipe);
+                     g4x_dp_port_enabled(display, DP_A, PORT_A,
 &panel_pipe);
                      break;
              case PANEL_PORT_SELECT_DPC:
-                     g4x_dp_port_enabled(dev_priv, PCH_DP_C, PORT_C,
 &panel_pipe);
+                     g4x_dp_port_enabled(display, PCH_DP_C, PORT_C,
 &panel_pipe);
                      break;
              case PANEL_PORT_SELECT_DPD:

- g4x_dp_port_enabled(dev_priv, PCH_DP_D, PORT_D,

Quoted 9 lines
Quoted 8 lines

&panel_pipe);
+ g4x_dp_port_enabled(display, PCH_DP_D, PORT_D,

&panel_pipe);
                      break;
              default:
                      MISSING_CASE(port_sel);

--
2.39.5

--
Jani Nikula, Intel

#20 lore raw

RE: [PATCH 08/14] drm/i915/sdvo: convert intel_sdvo.[ch] to struct intel_display

In reply to Kandpal, Suraj
Quoted 6 lines · Suraj

drivers/gpu/drm/i915/display/intel_sdvo.c static enum drm_mode_status · line 1944

Quoted 4 lines
drivers/gpu/drm/i915/display/intel_sdvo.c +1 -0
@@ -1941,12 +1942,13 @@ static enum drm_mode_status
 intel_sdvo_mode_valid(struct drm_connector *connector,
                    const struct drm_display_mode *mode)  {
+     struct intel_display *display = to_intel_display(connector->dev);

Why not &i915->display and declare this after i915 declaration

Because i915 will go away eventually, and I don't want to have to change this line again.

BR,
Jani.

Quoted 17 lines

Otherwise LGTM,

Quoted 12 lines
drivers/gpu/drm/i915/display/intel_sdvo.c +1 -1
      struct drm_i915_private *i915 = to_i915(connector->dev);
      struct intel_sdvo *intel_sdvo =
 intel_attached_sdvo(to_intel_connector(connector));
      struct intel_sdvo_connector *intel_sdvo_connector =
              to_intel_sdvo_connector(connector);
      bool has_hdmi_sink = intel_has_hdmi_sink(intel_sdvo_connector,
 connector->state);
-     int max_dotclk = i915->display.cdclk.max_dotclk_freq;
+     int max_dotclk = display->cdclk.max_dotclk_freq;
      enum drm_mode_status status;
      int clock = mode->clock;
Signature · 1 line
Jani Nikula, Intel