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

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.

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/f9246a00a2e7aabaffb86f863915a4307e1fd3f8.1739378095.git.jani.nikula@intel.com

diff --git a/drivers/gpu/drm/i915/display/icl_dsi.c b/drivers/gpu/drm/i915/display/icl_dsi.c
index d6a4114c3e0baee6c80a079c8b795f6a56ba8fce..c2acf3151f2f87ff88155465aac4ebaa37d0f8ba 100644 (file)
--- a/drivers/gpu/drm/i915/display/icl_dsi.c
+++ b/drivers/gpu/drm/i915/display/icl_dsi.c
@@ -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,
                                                 struct drm_display_mode *mode)
 {
-       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;
 

diff --git a/drivers/gpu/drm/i915/display/intel_crt.c b/drivers/gpu/drm/i915/display/intel_crt.c
index 10c16ff25fe0d8f6d768f3b2dec999f2ffa330d4..c2945c6f8de51e1d5da0ae0cb7f1eed7ed89070d 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_crt.c
+++ b/drivers/gpu/drm/i915/display/intel_crt.c
@@ -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;
 

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index ee241604a4265712dd8b8f0c273931a7d0a7e381..650f79b73ea4be8fd290c7357181a4d802da7090 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -8463,14 +8463,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;
@@ -8489,7 +8489,7 @@ enum drm_mode_status intel_cpu_transcoder_mode_valid(struct drm_i915_private *de
         * 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;
 

diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h
index 9439da737f5bc2d4588dd8894f27d23ac70625ab..08e28ea179d29d5eda68775912ae68a85eaf3ed0 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.h
+++ b/drivers/gpu/drm/i915/display/intel_display.h
@@ -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 0fb622c8110c3b5e513c3926e7199ffac59a9e5a..fd5e4b5e69b8bdc41e1bcdae990fd73c19ea1e95 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@ -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;
 

diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c
index 411b7322d460b1a9a8a2265704c3734d61b232aa..235b2ae81ab639e0ca3c96edc1722464c8340ef6 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
@@ -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;
 

diff --git a/drivers/gpu/drm/i915/display/intel_dvo.c b/drivers/gpu/drm/i915/display/intel_dvo.c
index c4888e6f52a18f844b1b7a5da39153eb8d1f923a..0e5728dc09b2a0a52f9053669d349e3ac4d6a9a7 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dvo.c
+++ b/drivers/gpu/drm/i915/display/intel_dvo.c
@@ -219,16 +219,16 @@ static enum drm_mode_status
 intel_dvo_mode_valid(struct drm_connector *_connector,
                     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;
 

diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c
index 0488999d079c2f539b5a3824575d4a489bba0ad7..0b451073c3771e70c9f4b8c222274c525daaa008 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/display/intel_hdmi.c
@@ -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;
 

diff --git a/drivers/gpu/drm/i915/display/intel_lvds.c b/drivers/gpu/drm/i915/display/intel_lvds.c
index c6644e801364675fd8379f4446a04bd8c40b729e..12bbd7ec9d81f6678ce9dee2a892dc9a58ed31fe 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_lvds.c
+++ b/drivers/gpu/drm/i915/display/intel_lvds.c
@@ -394,14 +394,14 @@ static enum drm_mode_status
 intel_lvds_mode_valid(struct drm_connector *_connector,
                      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;
 

diff --git a/drivers/gpu/drm/i915/display/intel_sdvo.c b/drivers/gpu/drm/i915/display/intel_sdvo.c
index 30f52a3091cd5bf5765fb9d1f2d66f5b0dbf1177..efb439f1f6a03be04ee68d04483849e335f389e3 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/display/intel_sdvo.c
@@ -1943,7 +1943,6 @@ intel_sdvo_mode_valid(struct drm_connector *connector,
                      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 =
                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;
 

diff --git a/drivers/gpu/drm/i915/display/intel_tv.c b/drivers/gpu/drm/i915/display/intel_tv.c
index d71994472d05804e1c9fbb6bc61e139ac278dc10..5964d1279a41eff3082d870af19b156e9716ed89 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_tv.c
+++ b/drivers/gpu/drm/i915/display/intel_tv.c
@@ -960,12 +960,11 @@ intel_tv_mode_valid(struct drm_connector *connector,
                    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;
 

diff --git a/drivers/gpu/drm/i915/display/vlv_dsi.c b/drivers/gpu/drm/i915/display/vlv_dsi.c
index d5e135b7a254c68197216787bcfaa30641c4e69d..03ba63c0032b4a2a7811a63065c5c05640be7d35 100644 (file)
--- a/drivers/gpu/drm/i915/display/vlv_dsi.c
+++ b/drivers/gpu/drm/i915/display/vlv_dsi.c
@@ -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,
                                               struct drm_display_mode *mode)
 {
-       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;
        }