> -----Original Message-----
> From: Intel-gfx <intel-gfx-bounces@xxxxxxxxxxxxxxxxxxxxx> On Behalf Of Jani
> Nikula
> Sent: Wednesday, February 12, 2025 10:07 PM
> To: intel-gfx@xxxxxxxxxxxxxxxxxxxxx; intel-xe@xxxxxxxxxxxxxxxxxxxxx
> Cc: Nikula, Jani <jani.nikula@xxxxxxxxx>
> Subject: [PATCH 09/14] 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.
>
> Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx>
LGTM,
Reviewed-by: Suraj Kandpal <suraj.kandpal@xxxxxxxxx>
> ---
> 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(-)
>
> diff --git a/drivers/gpu/drm/i915/display/icl_dsi.c
> b/drivers/gpu/drm/i915/display/icl_dsi.c
> index 0f2a19690c18..1f0ff4000658 100644
> --- 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,
> const 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 8eedae1d7684..321580b095e7 100644
> --- 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 e1186f46088d..7a25c84bfbac 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -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
> * 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 9439da737f5b..08e28ea179d2 100644
> --- 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 9ed7d46143e9..61827b0fe95e 100644
> --- 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 459440dd6e87..38804254980b 100644
> --- 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 29f8788fb26a..c16fb34b737d 100644
> --- 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,
> 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;
>
> diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c
> b/drivers/gpu/drm/i915/display/intel_hdmi.c
> index 015110fc57a2..60572deeffb3 100644
> --- 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 6b05db2c10ba..7ed8625193fe 100644
> --- 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,
> 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;
>
> diff --git a/drivers/gpu/drm/i915/display/intel_sdvo.c
> b/drivers/gpu/drm/i915/display/intel_sdvo.c
> index 1ae766212e8a..6e2d9929b4d7 100644
> --- 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,
> 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 =
> 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 7838c92f8ded..5dbe857ea85b 100644
> --- 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,
> 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;
>
> diff --git a/drivers/gpu/drm/i915/display/vlv_dsi.c
> b/drivers/gpu/drm/i915/display/vlv_dsi.c
> index d68876fe782c..7414794889e9 100644
> --- 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,
> const 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;
> }
> --
> 2.39.5
