| Message ID | 20240718081803.3338564-3-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 02/12] drm/i915/display: Use joined pipes in > intel_dp_joiner_needs_dsc > > In preparation of ultrajoiner, use number of joined pipes in the > intel_dp_joiner_needs_dsc helper, instead of joiner flag. > > Signed-off-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com> > --- > drivers/gpu/drm/i915/display/intel_display.c | 2 +- > drivers/gpu/drm/i915/display/intel_display.h | 2 ++ > drivers/gpu/drm/i915/display/intel_dp.c | 18 +++++++++++++----- > drivers/gpu/drm/i915/display/intel_dp.h | 4 +++- > drivers/gpu/drm/i915/display/intel_dp_mst.c | 13 ++++++++++--- > 5 files changed, 29 insertions(+), 10 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c > b/drivers/gpu/drm/i915/display/intel_display.c > index 01a5faa3fea5..eab07a5fa377 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.c > +++ b/drivers/gpu/drm/i915/display/intel_display.c > @@ -276,7 +276,7 @@ bool intel_crtc_is_joiner_primary(const struct > intel_crtc_state *crtc_state) > crtc->pipe == joiner_primary_pipe(crtc_state); } > > -static int intel_joiner_num_pipes(const struct intel_crtc_state *crtc_state) > +int intel_joiner_num_pipes(const struct intel_crtc_state *crtc_state) > { > return hweight8(crtc_state->joiner_pipes); > } this is introduced in Patch 5 too and here it is being changed from static i think some reordering/modification is required. > diff --git a/drivers/gpu/drm/i915/display/intel_display.h > b/drivers/gpu/drm/i915/display/intel_display.h > index b0cf6ca70952..0aecc3330a53 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.h > +++ b/drivers/gpu/drm/i915/display/intel_display.h > @@ -584,4 +584,6 @@ bool assert_port_valid(struct drm_i915_private *i915, > enum port port); > > bool intel_scanout_needs_vtd_wa(struct drm_i915_private *i915); > > +int intel_joiner_num_pipes(const struct intel_crtc_state *crtc_state); > + > #endif > diff --git a/drivers/gpu/drm/i915/display/intel_dp.c > b/drivers/gpu/drm/i915/display/intel_dp.c > index 30442c9da06b..7d66a969c461 100644 > --- a/drivers/gpu/drm/i915/display/intel_dp.c > +++ b/drivers/gpu/drm/i915/display/intel_dp.c > @@ -1202,6 +1202,7 @@ intel_dp_mode_valid(struct drm_connector > *_connector, > u8 dsc_slice_count = 0; > enum drm_mode_status status; > bool dsc = false, joiner = false; > + enum intel_joiner_pipe_count joined_pipes = > INTEL_PIPE_JOINER_NONE; Also as mentioned in the last patch maybe change name convention to pipes_joined instead of joined pipes Regards, Suraj Kandpal > > status = intel_cpu_transcoder_mode_valid(dev_priv, mode); > if (status != MODE_OK) > @@ -1225,7 +1226,8 @@ intel_dp_mode_valid(struct drm_connector > *_connector, > if (intel_dp_need_joiner(intel_dp, connector, > mode->hdisplay, target_clock)) { > joiner = true; > - max_dotclk *= 2; > + joined_pipes = INTEL_PIPE_JOINER_BIG; > + max_dotclk *= INTEL_PIPE_JOINER_BIG; > } > if (target_clock > max_dotclk) > return MODE_CLOCK_HIGH; > @@ -1283,7 +1285,7 @@ intel_dp_mode_valid(struct drm_connector > *_connector, > dsc = dsc_max_compressed_bpp && dsc_slice_count; > } > > - if (intel_dp_joiner_needs_dsc(dev_priv, joiner) && !dsc) > + if (intel_dp_joiner_needs_dsc(dev_priv, joined_pipes) && !dsc) > return MODE_CLOCK_HIGH; > > if (mode_rate > max_rate && !dsc) > @@ -2391,14 +2393,15 @@ int intel_dp_config_required_rate(const struct > intel_crtc_state *crtc_state) > return intel_dp_link_required(adjusted_mode->crtc_clock, bpp); } > > -bool intel_dp_joiner_needs_dsc(struct drm_i915_private *i915, bool > use_joiner) > +bool intel_dp_joiner_needs_dsc(struct drm_i915_private *i915, > + enum intel_joiner_pipe_count joined_pipes) > { > /* > * Pipe joiner needs compression up to display 12 due to bandwidth > * limitation. DG2 onwards pipe joiner can be enabled without > * compression. > */ > - return DISPLAY_VER(i915) < 13 && use_joiner; > + return DISPLAY_VER(i915) < 13 && (joined_pipes == > +INTEL_PIPE_JOINER_BIG); > } > > static int > @@ -2416,6 +2419,7 @@ intel_dp_compute_link_config(struct intel_encoder > *encoder, > struct intel_dp *intel_dp = enc_to_intel_dp(encoder); > struct link_config_limits limits; > bool dsc_needed, joiner_needs_dsc; > + enum intel_joiner_pipe_count joined_pipes; > int ret = 0; > > if (pipe_config->fec_enable && > @@ -2427,7 +2431,11 @@ intel_dp_compute_link_config(struct intel_encoder > *encoder, > adjusted_mode->crtc_clock)) > pipe_config->joiner_pipes = GENMASK(crtc->pipe + 1, crtc- > >pipe); > > - joiner_needs_dsc = intel_dp_joiner_needs_dsc(i915, pipe_config- > >joiner_pipes); > + joined_pipes = intel_joiner_num_pipes(pipe_config); > + if (joined_pipes >= INTEL_PIPE_JOINER_INVALID) > + drm_warn(&i915->drm, "Invalid joined pipes : %d\n", > joined_pipes); > + > + joiner_needs_dsc = intel_dp_joiner_needs_dsc(i915, joined_pipes); > > dsc_needed = joiner_needs_dsc || intel_dp->force_dsc_en || > !intel_dp_compute_config_limits(intel_dp, pipe_config, diff -- > git a/drivers/gpu/drm/i915/display/intel_dp.h > b/drivers/gpu/drm/i915/display/intel_dp.h > index 9be539edf817..a8116210c618 100644 > --- a/drivers/gpu/drm/i915/display/intel_dp.h > +++ b/drivers/gpu/drm/i915/display/intel_dp.h > @@ -8,6 +8,7 @@ > > #include <linux/types.h> > > +enum intel_joiner_pipe_count; > enum intel_output_format; > enum pipe; > enum port; > @@ -121,7 +122,8 @@ int intel_dp_effective_data_rate(int pixel_clock, int > bpp_x16, > int bw_overhead); > int intel_dp_max_link_data_rate(struct intel_dp *intel_dp, > int max_dprx_rate, int max_dprx_lanes); -bool > intel_dp_joiner_needs_dsc(struct drm_i915_private *i915, bool use_joiner); > +bool intel_dp_joiner_needs_dsc(struct drm_i915_private *i915, > + enum intel_joiner_pipe_count joined_pipes); > bool intel_dp_has_joiner(struct intel_dp *intel_dp); bool > intel_dp_needs_vsc_sdp(const struct intel_crtc_state *crtc_state, > const struct drm_connector_state *conn_state); diff - > -git a/drivers/gpu/drm/i915/display/intel_dp_mst.c > b/drivers/gpu/drm/i915/display/intel_dp_mst.c > index 27ce5c3f5951..e5797ee13667 100644 > --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c > +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c > @@ -567,6 +567,7 @@ static int intel_dp_mst_compute_config(struct > intel_encoder *encoder, > &pipe_config->hw.adjusted_mode; > struct link_config_limits limits; > bool dsc_needed, joiner_needs_dsc; > + enum intel_joiner_pipe_count joined_pipes; > int ret = 0; > > if (pipe_config->fec_enable && > @@ -585,7 +586,11 @@ static int intel_dp_mst_compute_config(struct > intel_encoder *encoder, > pipe_config->output_format = INTEL_OUTPUT_FORMAT_RGB; > pipe_config->has_pch_encoder = false; > > - joiner_needs_dsc = intel_dp_joiner_needs_dsc(dev_priv, pipe_config- > >joiner_pipes); > + joined_pipes = intel_joiner_num_pipes(pipe_config); > + if (joined_pipes >= INTEL_PIPE_JOINER_INVALID) > + drm_warn(&dev_priv->drm, "Invalid joined pipes : %d\n", > +joined_pipes); > + > + joiner_needs_dsc = intel_dp_joiner_needs_dsc(dev_priv, joined_pipes); > > dsc_needed = joiner_needs_dsc || intel_dp->force_dsc_en || > !intel_dp_mst_compute_config_limits(intel_dp, > @@ -1392,6 +1397,7 @@ intel_dp_mst_mode_valid_ctx(struct drm_connector > *connector, > u16 dsc_max_compressed_bpp = 0; > u8 dsc_slice_count = 0; > int target_clock = mode->clock; > + enum intel_joiner_pipe_count joined_pipes = > INTEL_PIPE_JOINER_NONE; > > if (drm_connector_is_unregistered(connector)) { > *status = MODE_ERROR; > @@ -1434,7 +1440,8 @@ intel_dp_mst_mode_valid_ctx(struct drm_connector > *connector, > if (intel_dp_need_joiner(intel_dp, intel_connector, > mode->hdisplay, target_clock)) { > joiner = true; > - max_dotclk *= 2; > + joined_pipes = INTEL_PIPE_JOINER_BIG; > + max_dotclk *= INTEL_PIPE_JOINER_BIG; > } > > ret = drm_modeset_lock(&mgr->base.lock, ctx); @@ -1474,7 +1481,7 > @@ intel_dp_mst_mode_valid_ctx(struct drm_connector *connector, > dsc = dsc_max_compressed_bpp && dsc_slice_count; > } > > - if (intel_dp_joiner_needs_dsc(dev_priv, joiner) && !dsc) { > + if (intel_dp_joiner_needs_dsc(dev_priv, joined_pipes) && !dsc) { > *status = MODE_CLOCK_HIGH; > return 0; > } > -- > 2.45.2
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index 01a5faa3fea5..eab07a5fa377 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -276,7 +276,7 @@ bool intel_crtc_is_joiner_primary(const struct intel_crtc_state *crtc_state) crtc->pipe == joiner_primary_pipe(crtc_state); } -static int intel_joiner_num_pipes(const struct intel_crtc_state *crtc_state) +int intel_joiner_num_pipes(const struct intel_crtc_state *crtc_state) { return hweight8(crtc_state->joiner_pipes); } diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h index b0cf6ca70952..0aecc3330a53 100644 --- a/drivers/gpu/drm/i915/display/intel_display.h +++ b/drivers/gpu/drm/i915/display/intel_display.h @@ -584,4 +584,6 @@ bool assert_port_valid(struct drm_i915_private *i915, enum port port); bool intel_scanout_needs_vtd_wa(struct drm_i915_private *i915); +int intel_joiner_num_pipes(const struct intel_crtc_state *crtc_state); + #endif diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index 30442c9da06b..7d66a969c461 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -1202,6 +1202,7 @@ intel_dp_mode_valid(struct drm_connector *_connector, u8 dsc_slice_count = 0; enum drm_mode_status status; bool dsc = false, joiner = false; + enum intel_joiner_pipe_count joined_pipes = INTEL_PIPE_JOINER_NONE; status = intel_cpu_transcoder_mode_valid(dev_priv, mode); if (status != MODE_OK) @@ -1225,7 +1226,8 @@ intel_dp_mode_valid(struct drm_connector *_connector, if (intel_dp_need_joiner(intel_dp, connector, mode->hdisplay, target_clock)) { joiner = true; - max_dotclk *= 2; + joined_pipes = INTEL_PIPE_JOINER_BIG; + max_dotclk *= INTEL_PIPE_JOINER_BIG; } if (target_clock > max_dotclk) return MODE_CLOCK_HIGH; @@ -1283,7 +1285,7 @@ intel_dp_mode_valid(struct drm_connector *_connector, dsc = dsc_max_compressed_bpp && dsc_slice_count; } - if (intel_dp_joiner_needs_dsc(dev_priv, joiner) && !dsc) + if (intel_dp_joiner_needs_dsc(dev_priv, joined_pipes) && !dsc) return MODE_CLOCK_HIGH; if (mode_rate > max_rate && !dsc) @@ -2391,14 +2393,15 @@ int intel_dp_config_required_rate(const struct intel_crtc_state *crtc_state) return intel_dp_link_required(adjusted_mode->crtc_clock, bpp); } -bool intel_dp_joiner_needs_dsc(struct drm_i915_private *i915, bool use_joiner) +bool intel_dp_joiner_needs_dsc(struct drm_i915_private *i915, + enum intel_joiner_pipe_count joined_pipes) { /* * Pipe joiner needs compression up to display 12 due to bandwidth * limitation. DG2 onwards pipe joiner can be enabled without * compression. */ - return DISPLAY_VER(i915) < 13 && use_joiner; + return DISPLAY_VER(i915) < 13 && (joined_pipes == INTEL_PIPE_JOINER_BIG); } static int @@ -2416,6 +2419,7 @@ intel_dp_compute_link_config(struct intel_encoder *encoder, struct intel_dp *intel_dp = enc_to_intel_dp(encoder); struct link_config_limits limits; bool dsc_needed, joiner_needs_dsc; + enum intel_joiner_pipe_count joined_pipes; int ret = 0; if (pipe_config->fec_enable && @@ -2427,7 +2431,11 @@ intel_dp_compute_link_config(struct intel_encoder *encoder, adjusted_mode->crtc_clock)) pipe_config->joiner_pipes = GENMASK(crtc->pipe + 1, crtc->pipe); - joiner_needs_dsc = intel_dp_joiner_needs_dsc(i915, pipe_config->joiner_pipes); + joined_pipes = intel_joiner_num_pipes(pipe_config); + if (joined_pipes >= INTEL_PIPE_JOINER_INVALID) + drm_warn(&i915->drm, "Invalid joined pipes : %d\n", joined_pipes); + + joiner_needs_dsc = intel_dp_joiner_needs_dsc(i915, joined_pipes); dsc_needed = joiner_needs_dsc || intel_dp->force_dsc_en || !intel_dp_compute_config_limits(intel_dp, pipe_config, diff --git a/drivers/gpu/drm/i915/display/intel_dp.h b/drivers/gpu/drm/i915/display/intel_dp.h index 9be539edf817..a8116210c618 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.h +++ b/drivers/gpu/drm/i915/display/intel_dp.h @@ -8,6 +8,7 @@ #include <linux/types.h> +enum intel_joiner_pipe_count; enum intel_output_format; enum pipe; enum port; @@ -121,7 +122,8 @@ int intel_dp_effective_data_rate(int pixel_clock, int bpp_x16, int bw_overhead); int intel_dp_max_link_data_rate(struct intel_dp *intel_dp, int max_dprx_rate, int max_dprx_lanes); -bool intel_dp_joiner_needs_dsc(struct drm_i915_private *i915, bool use_joiner); +bool intel_dp_joiner_needs_dsc(struct drm_i915_private *i915, + enum intel_joiner_pipe_count joined_pipes); bool intel_dp_has_joiner(struct intel_dp *intel_dp); bool intel_dp_needs_vsc_sdp(const struct intel_crtc_state *crtc_state, const struct drm_connector_state *conn_state); diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c index 27ce5c3f5951..e5797ee13667 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c @@ -567,6 +567,7 @@ static int intel_dp_mst_compute_config(struct intel_encoder *encoder, &pipe_config->hw.adjusted_mode; struct link_config_limits limits; bool dsc_needed, joiner_needs_dsc; + enum intel_joiner_pipe_count joined_pipes; int ret = 0; if (pipe_config->fec_enable && @@ -585,7 +586,11 @@ static int intel_dp_mst_compute_config(struct intel_encoder *encoder, pipe_config->output_format = INTEL_OUTPUT_FORMAT_RGB; pipe_config->has_pch_encoder = false; - joiner_needs_dsc = intel_dp_joiner_needs_dsc(dev_priv, pipe_config->joiner_pipes); + joined_pipes = intel_joiner_num_pipes(pipe_config); + if (joined_pipes >= INTEL_PIPE_JOINER_INVALID) + drm_warn(&dev_priv->drm, "Invalid joined pipes : %d\n", joined_pipes); + + joiner_needs_dsc = intel_dp_joiner_needs_dsc(dev_priv, joined_pipes); dsc_needed = joiner_needs_dsc || intel_dp->force_dsc_en || !intel_dp_mst_compute_config_limits(intel_dp, @@ -1392,6 +1397,7 @@ intel_dp_mst_mode_valid_ctx(struct drm_connector *connector, u16 dsc_max_compressed_bpp = 0; u8 dsc_slice_count = 0; int target_clock = mode->clock; + enum intel_joiner_pipe_count joined_pipes = INTEL_PIPE_JOINER_NONE; if (drm_connector_is_unregistered(connector)) { *status = MODE_ERROR; @@ -1434,7 +1440,8 @@ intel_dp_mst_mode_valid_ctx(struct drm_connector *connector, if (intel_dp_need_joiner(intel_dp, intel_connector, mode->hdisplay, target_clock)) { joiner = true; - max_dotclk *= 2; + joined_pipes = INTEL_PIPE_JOINER_BIG; + max_dotclk *= INTEL_PIPE_JOINER_BIG; } ret = drm_modeset_lock(&mgr->base.lock, ctx); @@ -1474,7 +1481,7 @@ intel_dp_mst_mode_valid_ctx(struct drm_connector *connector, dsc = dsc_max_compressed_bpp && dsc_slice_count; } - if (intel_dp_joiner_needs_dsc(dev_priv, joiner) && !dsc) { + if (intel_dp_joiner_needs_dsc(dev_priv, joined_pipes) && !dsc) { *status = MODE_CLOCK_HIGH; return 0; }
In preparation of ultrajoiner, use number of joined pipes in the intel_dp_joiner_needs_dsc helper, instead of joiner flag. Signed-off-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com> --- drivers/gpu/drm/i915/display/intel_display.c | 2 +- drivers/gpu/drm/i915/display/intel_display.h | 2 ++ drivers/gpu/drm/i915/display/intel_dp.c | 18 +++++++++++++----- drivers/gpu/drm/i915/display/intel_dp.h | 4 +++- drivers/gpu/drm/i915/display/intel_dp_mst.c | 13 ++++++++++--- 5 files changed, 29 insertions(+), 10 deletions(-)