drm/i915/display: convert intel_mode_valid_max_plane_size() to intel_display

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.

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/6e7810c793ecc8ff6a31569830bf162156245668.1739378095.git.jani.nikula@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 650f79b73ea4be8fd290c7357181a4d802da7090..3b895a760d8b5b1eb20448e62bd636ac3ef847e7 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -8497,7 +8497,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)
 {
@@ -8507,7 +8507,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;
 
        /*
@@ -8515,10 +8515,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;
        } else {

diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h
index 08e28ea179d29d5eda68775912ae68a85eaf3ed0..f702425df305fcdd27f250386df06114af2ede94 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.h
+++ b/drivers/gpu/drm/i915/display/intel_display.h
@@ -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,
+intel_mode_valid_max_plane_size(struct intel_display *display,
                                const struct drm_display_mode *mode,
                                int num_joined_pipes);
 enum drm_mode_status

diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
index fd5e4b5e69b8bdc41e1bcdae990fd73c19ea1e95..bee8e107ac2e909fd8b1a8205e85bfe43dad17e2 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@ -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;
        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);
+       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 235b2ae81ab639e0ca3c96edc1722464c8340ef6..7749a6ab47982ebf0505e33d54147b6334e835b6 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
@@ -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,
                return 0;
        }
 
-       *status = intel_mode_valid_max_plane_size(i915, mode, num_joined_pipes);
+       *status = intel_mode_valid_max_plane_size(display, mode, num_joined_pipes);
        return 0;
 }
 

diff --git a/drivers/gpu/drm/i915/display/intel_dsi.c b/drivers/gpu/drm/i915/display/intel_dsi.c
index 0be46c6c9611f7c386a052ad8b79f4924727b892..56a5a517496d01d4def27f23b38a4afcc4b37b4e 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dsi.c
+++ b/drivers/gpu/drm/i915/display/intel_dsi.c
@@ -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,
                                          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");
 
        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 0b451073c3771e70c9f4b8c222274c525daaa008..7ffc76a2ec1edd37f2a8041cd16786d4256e5277 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/display/intel_hdmi.c
@@ -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)->display.cdclk.max_dotclk_freq;
@@ -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,