| Message ID | 20240718081803.3338564-4-ankit.k.nautiyal@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Ultrajoiner basic functionality series | expand |
> -----Original Message----- > From: Intel-gfx <intel-gfx-bounces@lists.freedesktop.org> On Behalf Of Ankit > Nautiyal > Sent: Thursday, July 18, 2024 1:48 PM > To: intel-gfx@lists.freedesktop.org > Cc: Lisovskiy, Stanislav <stanislav.lisovskiy@intel.com>; Saarinen, Jani > <jani.saarinen@intel.com>; ville.syrjala@linux.intel.com > Subject: [PATCH 03/12] drm/i915/display: Use joined pipes in > intel_mode_valid_max_plane_size > > In preparation of ultrajoiner, use number of joined pipes in the > intel_mode_valid_max_plane_size helper, instead of joiner flag. > Other than the naming convention changes mentioned in previous patches LGTM, Reviewed-by: Suraj Kandpal <suraj.kandpal@intel.com> > Signed-off-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com> > --- > drivers/gpu/drm/i915/display/intel_display.c | 4 ++-- > drivers/gpu/drm/i915/display/intel_display.h | 3 ++- > 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_dsi.c | 2 +- > drivers/gpu/drm/i915/display/intel_hdmi.c | 2 +- > 6 files changed, 8 insertions(+), 7 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c > b/drivers/gpu/drm/i915/display/intel_display.c > index eab07a5fa377..26e4b0c2e9f7 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.c > +++ b/drivers/gpu/drm/i915/display/intel_display.c > @@ -8081,7 +8081,7 @@ enum drm_mode_status > intel_cpu_transcoder_mode_valid(struct drm_i915_private *de enum > drm_mode_status intel_mode_valid_max_plane_size(struct drm_i915_private > *dev_priv, > const struct drm_display_mode *mode, > - bool joiner) > + enum intel_joiner_pipe_count joined_pipes) > { > int plane_width_max, plane_height_max; > > @@ -8098,7 +8098,7 @@ intel_mode_valid_max_plane_size(struct > drm_i915_private *dev_priv, > * too big for that. > */ > if (DISPLAY_VER(dev_priv) >= 11) { > - plane_width_max = 5120 << joiner; > + plane_width_max = 5120 << joined_pipes / 2; > plane_height_max = 4320; > } else { > plane_width_max = 5120; > diff --git a/drivers/gpu/drm/i915/display/intel_display.h > b/drivers/gpu/drm/i915/display/intel_display.h > index 0aecc3330a53..bf665f947b97 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.h > +++ b/drivers/gpu/drm/i915/display/intel_display.h > @@ -31,6 +31,7 @@ > #include "intel_display_limits.h" > > enum drm_scaling_filter; > +enum intel_joiner_pipe_count; > struct dpll; > struct drm_atomic_state; > struct drm_connector; > @@ -415,7 +416,7 @@ u32 intel_plane_fb_max_stride(struct > drm_i915_private *dev_priv, enum drm_mode_status > intel_mode_valid_max_plane_size(struct drm_i915_private *dev_priv, > const struct drm_display_mode *mode, > - bool joiner); > + enum intel_joiner_pipe_count joined_pipes); > enum drm_mode_status > intel_cpu_transcoder_mode_valid(struct drm_i915_private *i915, > const struct drm_display_mode *mode); diff -- > git a/drivers/gpu/drm/i915/display/intel_dp.c > b/drivers/gpu/drm/i915/display/intel_dp.c > index 7d66a969c461..320d8b6d1bce 100644 > --- a/drivers/gpu/drm/i915/display/intel_dp.c > +++ b/drivers/gpu/drm/i915/display/intel_dp.c > @@ -1295,7 +1295,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, joiner); > + return intel_mode_valid_max_plane_size(dev_priv, mode, > joined_pipes); > } > > bool intel_dp_source_supports_tps3(struct drm_i915_private *i915) diff --git > a/drivers/gpu/drm/i915/display/intel_dp_mst.c > b/drivers/gpu/drm/i915/display/intel_dp_mst.c > index e5797ee13667..3f45ac7ca4d5 100644 > --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c > +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c > @@ -1491,7 +1491,7 @@ intel_dp_mst_mode_valid_ctx(struct drm_connector > *connector, > return 0; > } > > - *status = intel_mode_valid_max_plane_size(dev_priv, mode, joiner); > + *status = intel_mode_valid_max_plane_size(dev_priv, mode, > +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 bd5888ce4852..acc17546215f 100644 > --- a/drivers/gpu/drm/i915/display/intel_dsi.c > +++ b/drivers/gpu/drm/i915/display/intel_dsi.c > @@ -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, false); > + return intel_mode_valid_max_plane_size(dev_priv, mode, > +INTEL_PIPE_JOINER_NONE); > } > > 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 19498ee455fa..5aa4a9f0c470 100644 > --- a/drivers/gpu/drm/i915/display/intel_hdmi.c > +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c > @@ -2048,7 +2048,7 @@ intel_hdmi_mode_valid(struct drm_connector > *connector, > return status; > } > > - return intel_mode_valid_max_plane_size(dev_priv, mode, false); > + return intel_mode_valid_max_plane_size(dev_priv, mode, > +INTEL_PIPE_JOINER_NONE); > } > > bool intel_hdmi_bpc_possible(const struct intel_crtc_state *crtc_state, > -- > 2.45.2
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index eab07a5fa377..26e4b0c2e9f7 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -8081,7 +8081,7 @@ enum drm_mode_status intel_cpu_transcoder_mode_valid(struct drm_i915_private *de enum drm_mode_status intel_mode_valid_max_plane_size(struct drm_i915_private *dev_priv, const struct drm_display_mode *mode, - bool joiner) + enum intel_joiner_pipe_count joined_pipes) { int plane_width_max, plane_height_max; @@ -8098,7 +8098,7 @@ intel_mode_valid_max_plane_size(struct drm_i915_private *dev_priv, * too big for that. */ if (DISPLAY_VER(dev_priv) >= 11) { - plane_width_max = 5120 << joiner; + plane_width_max = 5120 << joined_pipes / 2; plane_height_max = 4320; } else { plane_width_max = 5120; diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h index 0aecc3330a53..bf665f947b97 100644 --- a/drivers/gpu/drm/i915/display/intel_display.h +++ b/drivers/gpu/drm/i915/display/intel_display.h @@ -31,6 +31,7 @@ #include "intel_display_limits.h" enum drm_scaling_filter; +enum intel_joiner_pipe_count; struct dpll; struct drm_atomic_state; struct drm_connector; @@ -415,7 +416,7 @@ u32 intel_plane_fb_max_stride(struct drm_i915_private *dev_priv, enum drm_mode_status intel_mode_valid_max_plane_size(struct drm_i915_private *dev_priv, const struct drm_display_mode *mode, - bool joiner); + enum intel_joiner_pipe_count joined_pipes); enum drm_mode_status intel_cpu_transcoder_mode_valid(struct drm_i915_private *i915, const struct drm_display_mode *mode); diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index 7d66a969c461..320d8b6d1bce 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -1295,7 +1295,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, joiner); + return intel_mode_valid_max_plane_size(dev_priv, mode, joined_pipes); } bool intel_dp_source_supports_tps3(struct drm_i915_private *i915) diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c index e5797ee13667..3f45ac7ca4d5 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c @@ -1491,7 +1491,7 @@ intel_dp_mst_mode_valid_ctx(struct drm_connector *connector, return 0; } - *status = intel_mode_valid_max_plane_size(dev_priv, mode, joiner); + *status = intel_mode_valid_max_plane_size(dev_priv, mode, 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 bd5888ce4852..acc17546215f 100644 --- a/drivers/gpu/drm/i915/display/intel_dsi.c +++ b/drivers/gpu/drm/i915/display/intel_dsi.c @@ -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, false); + return intel_mode_valid_max_plane_size(dev_priv, mode, INTEL_PIPE_JOINER_NONE); } 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 19498ee455fa..5aa4a9f0c470 100644 --- a/drivers/gpu/drm/i915/display/intel_hdmi.c +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c @@ -2048,7 +2048,7 @@ intel_hdmi_mode_valid(struct drm_connector *connector, return status; } - return intel_mode_valid_max_plane_size(dev_priv, mode, false); + return intel_mode_valid_max_plane_size(dev_priv, mode, INTEL_PIPE_JOINER_NONE); } bool intel_hdmi_bpc_possible(const struct intel_crtc_state *crtc_state,
In preparation of ultrajoiner, use number of joined pipes in the intel_mode_valid_max_plane_size helper, instead of joiner flag. Signed-off-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com> --- drivers/gpu/drm/i915/display/intel_display.c | 4 ++-- drivers/gpu/drm/i915/display/intel_display.h | 3 ++- 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_dsi.c | 2 +- drivers/gpu/drm/i915/display/intel_hdmi.c | 2 +- 6 files changed, 8 insertions(+), 7 deletions(-)