On Thu, Jul 02, 2026 at 02:03:52PM +0300, Luca Coelho wrote:
> On Wed, 2026-07-01 at 18:31 +0300, Imre Deak wrote:
> > Add link_config_filter to link_config_limits to track the set of valid
> > link configurations during modeset state computation. Keep the existing
> > min/max rate and lane count limits for now, until all users are
> > converted to use the configuration filter.
> >
> > Add the helpers required to select the maximum configuration from the
> > currently allowed configuration set. This will be used by follow-up
> > changes as well to query the maximum link configuration without having
> > to iterate the configurations.
> >
> > v2:
> > - Rebase on changes using a filter object instead of a mask of
> > configuration indices.
> > - Rebase on changes using an iteration object.
> >
> > Signed-off-by: Imre Deak <[email protected]>
> > ---
> > drivers/gpu/drm/i915/display/intel_dp.c | 42 +++++++++++++++--
> > drivers/gpu/drm/i915/display/intel_dp.h | 11 +++++
> > .../gpu/drm/i915/display/intel_dp_link_caps.c | 46 +++++++++++++++++++
> > .../gpu/drm/i915/display/intel_dp_link_caps.h | 6 +++
> > 4 files changed, 102 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/display/intel_dp.c
> > b/drivers/gpu/drm/i915/display/intel_dp.c
> > index 23001541283b4..bc333bc9296b2 100644
> > --- a/drivers/gpu/drm/i915/display/intel_dp.c
> > +++ b/drivers/gpu/drm/i915/display/intel_dp.c
> > @@ -2577,6 +2577,20 @@ bool intel_dp_mode_valid_with_dsc(struct
> > intel_connector *connector,
> > bw_overhead_flags);
> > }
> >
> > +bool
> > +intel_dp_get_connector_max_link_config(struct intel_connector *connector,
> > + const struct link_config_limits *limits,
> > + struct intel_dp_link_config
> > *max_link_config)
> > +{
> > + struct intel_dp *intel_dp = intel_attached_dp(connector);
> > + struct intel_dp_link_caps *link_caps = intel_dp->link.caps;
> > + struct intel_dp_link_caps_order order =
> > + intel_dp_link_caps_connector_compute_order(connector);
> > +
> > + return intel_dp_link_caps_get_max_config(link_caps, order.key,
> > limits->link_config_filter,
> > + max_link_config);
> > +}
> > +
> > /*
> > * Calculate the output link min, max bpp values in limits based on the
> > pipe bpp
> > * range, crtc_state and dsc mode. Return true on success.
> > @@ -2593,6 +2607,7 @@ intel_dp_compute_config_link_bpp_limits(struct
> > intel_connector *connector,
> > &crtc_state->hw.adjusted_mode;
> > const struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
> > const struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base;
> > + struct intel_dp_link_config max_link_config;
> > int max_link_bpp_x16;
> >
> > max_link_bpp_x16 = min(crtc_state->max_link_bpp_x16,
> > @@ -2622,14 +2637,17 @@ intel_dp_compute_config_link_bpp_limits(struct
> > intel_connector *connector,
> >
> > limits->link.max_bpp_x16 = max_link_bpp_x16;
> >
> > + if (!intel_dp_get_connector_max_link_config(connector, limits,
> > &max_link_config))
> > + return false;
> > +
> > drm_dbg_kms(display->drm,
> > - "[ENCODER:%d:%s][CRTC:%d:%s] DP link limits: pixel clock %d
> > kHz DSC %s max lanes %d max rate %d max pipe_bpp %d min link_bpp "
> > FXP_Q4_FMT " max link_bpp " FXP_Q4_FMT "\n",
> > + "[ENCODER:%d:%s][CRTC:%d:%s] DP link limits: pixel clock %d
> > kHz DSC %s max link %dx%d max pipe_bpp %d min link_bpp " FXP_Q4_FMT " max
> > link_bpp " FXP_Q4_FMT "\n",
> > encoder->base.base.id, encoder->base.name,
> > crtc->base.base.id, crtc->base.name,
> > adjusted_mode->crtc_clock,
> > str_on_off(dsc),
> > - limits->max_lane_count,
> > - limits->max_rate,
> > + max_link_config.lane_count,
> > + max_link_config.rate,
> > limits->pipe.max_bpp,
> > FXP_Q4_ARGS(limits->link.min_bpp_x16),
> > FXP_Q4_ARGS(limits->link.max_bpp_x16));
> > @@ -2680,10 +2698,15 @@ intel_dp_compute_config_limits(struct intel_dp
> > *intel_dp,
> > struct link_config_limits *limits)
> > {
> > struct intel_display *display = to_intel_display(intel_dp);
> > + struct intel_dp_link_caps *link_caps = intel_dp->link.caps;
> > bool is_mst = intel_crtc_has_type(crtc_state, INTEL_OUTPUT_DP_MST);
> > struct intel_connector *connector =
> > to_intel_connector(conn_state->connector);
> >
> > + /*
> > + * Remove the following min/max rate and lane count setup, once
> > + * all users are converted to use link_config_mask instead.
> > + */
>
> Should there be a "TODO" here to make it easier to grep for?
Ok, will add it.
> > limits->min_rate = intel_dp_min_link_rate(intel_dp);
> > limits->max_rate = intel_dp_max_link_rate(intel_dp);
> >
> > @@ -2692,6 +2715,8 @@ intel_dp_compute_config_limits(struct intel_dp
> > *intel_dp,
> > limits->min_lane_count = intel_dp_min_lane_count(intel_dp);
> > limits->max_lane_count = intel_dp_max_lane_count(intel_dp);
> >
> > + limits->link_config_filter = INTEL_DP_LINK_CAPS_FILTER_ALL;
> > +
> > limits->pipe.min_bpp = intel_dp_min_bpp(crtc_state->output_format);
> > if (is_mst) {
> > /*
> > @@ -2755,6 +2780,9 @@ intel_dp_compute_config_limits(struct intel_dp
> > *intel_dp,
> > crtc_state->pipe_bpp, limits->pipe.max_bpp);
> >
> > if (is_mst || intel_dp->use_max_params) {
> > + struct intel_dp_link_caps_filter new_filter =
> > INTEL_DP_LINK_CAPS_FILTER_NONE;
> > + struct intel_dp_link_config max_config;
> > +
> > /*
> > * For MST we always configure max link bw - the spec doesn't
> > * seem to suggest we should do otherwise.
> > @@ -2768,6 +2796,14 @@ intel_dp_compute_config_limits(struct intel_dp
> > *intel_dp,
> > */
> > limits->min_lane_count = limits->max_lane_count;
> > limits->min_rate = limits->max_rate;
> > +
> > + if (!intel_dp_get_connector_max_link_config(connector, limits,
> > &max_config))
> > + return false;
> > +
> > + if (!intel_dp_link_caps_filter_add(link_caps, &new_filter,
> > &max_config))
> > + return false;
> > +
> > + limits->link_config_filter = new_filter;
> > }
> >
> > intel_dp_test_compute_config(intel_dp, crtc_state, limits);
> > diff --git a/drivers/gpu/drm/i915/display/intel_dp.h
> > b/drivers/gpu/drm/i915/display/intel_dp.h
> > index 02b691df67555..13872b8c4975e 100644
> > --- a/drivers/gpu/drm/i915/display/intel_dp.h
> > +++ b/drivers/gpu/drm/i915/display/intel_dp.h
> > @@ -8,6 +8,8 @@
> >
> > #include <linux/types.h>
> >
> > +#include "intel_dp_link_caps.h"
> > +
> > enum intel_output_format;
> > enum pipe;
> > enum port;
> > @@ -22,11 +24,17 @@ struct intel_crtc_state;
> > struct intel_digital_port;
> > struct intel_display;
> > struct intel_dp;
> > +struct intel_dp_link_config;
> > struct intel_encoder;
> >
> > struct link_config_limits {
> > + /*
> > + * TODO: Remove the following min/max rate and lane count limits
> > + * once all users are converted to use link_config_mask instead.
> > + */
>
> ...it would be consistent with this, at least.
>
>
> > int min_rate, max_rate;
> > int min_lane_count, max_lane_count;
> > + struct intel_dp_link_caps_filter link_config_filter;
> > struct {
> > /* Uncompressed DSC input or link output bpp in 1 bpp units */
> > int min_bpp, max_bpp;
> > @@ -144,6 +152,9 @@ int intel_dp_dsc_compute_max_bpp(const struct
> > intel_connector *connector,
> > u8 dsc_max_bpc);
> > int intel_dp_compute_min_compressed_bpp_x16(struct intel_connector
> > *connector,
> > enum intel_output_format
> > output_format);
> > +bool intel_dp_get_connector_max_link_config(struct intel_connector
> > *connector,
> > + const struct link_config_limits
> > *limits,
> > + struct intel_dp_link_config
> > *max_link_config);
> > bool intel_dp_mode_valid_with_dsc(struct intel_connector *connector,
> > int link_clock, int lane_count,
> > int mode_clock, int mode_hdisplay,
> > diff --git a/drivers/gpu/drm/i915/display/intel_dp_link_caps.c
> > b/drivers/gpu/drm/i915/display/intel_dp_link_caps.c
> > index 4482e1f9d6cd8..d00bb8047de2f 100644
> > --- a/drivers/gpu/drm/i915/display/intel_dp_link_caps.c
> > +++ b/drivers/gpu/drm/i915/display/intel_dp_link_caps.c
> > @@ -504,6 +504,52 @@ void intel_dp_link_caps_iter_end(struct
> > intel_dp_link_caps_iter *iter)
> > memset(iter, 0, sizeof(*iter));
> > }
> >
> > +/**
> > + * intel_dp_link_caps_get_max_config - get the maximum config in a given
> > order
> > + * @link_caps: link capabilities state
> > + * @order_key: ordering key used to rank candidate configurations
> > + * @filter: filter for candidate configurations
> > + * @max_config: returned maximum link configuration
> > + *
> > + * Find the last configuration among the currently allowed
> > + * configurations filtered by @filter in the iteration order
> > + * selected by @order_key, and store it in @max_config.
> > + *
> > + * See also:
> > + * - &enum intel_dp_link_caps_order_key
> > + *
> > + * Returns:
> > + * %true if a maximum config is returned
> > + * %false otherwise.
> > + */
> > +bool intel_dp_link_caps_get_max_config(struct intel_dp_link_caps
> > *link_caps,
> > + enum intel_dp_link_caps_order_key
> > order_key,
> > + struct intel_dp_link_caps_filter filter,
> > + struct intel_dp_link_config *max_config)
> > +{
> > + struct intel_dp_link_caps_order order = {
> > + .key = order_key,
> > + .dir = INTEL_DP_LINK_CAPS_ORDER_DIR_DESC
> > + };
> > + struct intel_dp_link_config iter_config;
> > + struct intel_dp_link_caps_iter iter;
> > + bool found = false;
> > +
> > + intel_dp_link_caps_iter_start(&iter, link_caps, order, filter);
> > + for_each_dp_link_config(&iter, &iter_config) {
> > + found = true;
> > + break;
> > + }
> > + intel_dp_link_caps_iter_end(&iter);
> > +
> > + if (!found)
> > + return false;
> > +
> > + *max_config = iter_config;
> > +
> > + return true;
> > +}
> > +
> > static int find_config_idx(struct intel_dp_link_caps *link_caps,
> > struct intel_dp_link_caps_filter filter,
> > const struct intel_dp_link_config *link_config)
> > diff --git a/drivers/gpu/drm/i915/display/intel_dp_link_caps.h
> > b/drivers/gpu/drm/i915/display/intel_dp_link_caps.h
> > index dcbde890809bc..6dd2ce64e24ed 100644
> > --- a/drivers/gpu/drm/i915/display/intel_dp_link_caps.h
> > +++ b/drivers/gpu/drm/i915/display/intel_dp_link_caps.h
> > @@ -29,6 +29,7 @@ struct intel_dp_link_config;
> > *
> > * See also:
> > * - &struct intel_dp_link_caps_order
> > + * - intel_dp_link_caps_get_max_config()
> > */
> > enum intel_dp_link_caps_order_key {
> > INTEL_DP_LINK_CAPS_ORDER_KEY_BW,
> > @@ -140,6 +141,11 @@ bool intel_dp_link_caps_filter_add(struct
> > intel_dp_link_caps *link_caps,
> > struct intel_dp_link_caps_filter *filter,
> > const struct intel_dp_link_config *config);
> >
> > +bool intel_dp_link_caps_get_max_config(struct intel_dp_link_caps
> > *link_caps,
> > + enum intel_dp_link_caps_order_key
> > order_key,
> > + struct intel_dp_link_caps_filter filter,
> > + struct intel_dp_link_config *max_config);
> > +
> > void intel_dp_link_caps_get_max_limits(struct intel_dp_link_caps
> > *link_caps,
> > struct intel_dp_link_config
> > *max_link_limits);
> > bool intel_dp_link_caps_set_max_limits(struct intel_dp_link_caps
> > *link_caps,
>
> Small nit, but regardless:
>
> Reviewed-by: Luca Coelho <[email protected]>
>
> --
> Cheers,
> Luca.
