On Wed, May 24, 2023 at 03:59:47PM +0300, Lisovskiy, Stanislav wrote:
> On Wed, May 24, 2023 at 03:38:42PM +0300, Ville Syrjälä wrote:
> > On Tue, May 23, 2023 at 12:01:34PM +0300, Lisovskiy, Stanislav wrote:
> > > On Tue, May 16, 2023 at 02:40:27PM +0300, Ville Syrjälä wrote:
> > > > On Tue, May 16, 2023 at 01:43:44PM +0300, Lisovskiy, Stanislav wrote:
> > > > > On Fri, May 12, 2023 at 11:54:16AM +0530, Ankit Nautiyal wrote:
> > > > > > Currently, we take the max lane, rate and pipe bpp, to get the maximum
> > > > > > compressed bpp possible. We then set the output bpp to this value.
> > > > > > This patch provides support to have max bpp, min rate and min lanes,
> > > > > > that can support the min compressed bpp.
> > > > > >
> > > > > > v2:
> > > > > > -Avoid ending up with compressed bpp, same as pipe bpp. (Stan)
> > > > > > -Fix the checks for limits->max/min_bpp while iterating over list of
> > > > > > valid DSC bpcs. (Stan)
> > > > > >
> > > > > > v3:
> > > > > > -Refactor the code to have pipe bpp/compressed bpp computation and slice
> > > > > > count calculation separately for different cases.
> > > > > >
> > > > > > v4:
> > > > > > -Separate the pipe_bpp calculation for eDP and DP.
> > > > > >
> > > > > > Signed-off-by: Ankit Nautiyal <ankit.k.nautiyal@xxxxxxxxx>
> > > > > > ---
> > > > > > drivers/gpu/drm/i915/display/intel_dp.c | 305 +++++++++++++++++++-----
> > > > > > 1 file changed, 245 insertions(+), 60 deletions(-)
> > > > > >
> > > > > > diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
> > > > > > index 39e2bf3d738d..578320220c9a 100644
> > > > > > --- a/drivers/gpu/drm/i915/display/intel_dp.c
> > > > > > +++ b/drivers/gpu/drm/i915/display/intel_dp.c
> > > > > > @@ -1642,6 +1642,209 @@ static bool intel_dp_dsc_supports_format(struct intel_dp *intel_dp,
> > > > > > return drm_dp_dsc_sink_supports_format(intel_dp->dsc_dpcd, sink_dsc_format);
> > > > > > }
> > > > > >
> > > > > > +static bool is_dsc_bw_sufficient(int link_rate, int lane_count, int compressed_bpp,
> > > > > > + const struct drm_display_mode *adjusted_mode)
> > > > > > +{
> > > > > > + int mode_rate = intel_dp_link_required(adjusted_mode->crtc_clock, compressed_bpp);
> > > > > > + int link_avail = intel_dp_max_data_rate(link_rate, lane_count);
> > > > > > +
> > > > > > + return mode_rate <= link_avail;
> > > > > > +}
> > > > > > +
> > > > > > +static int dsc_compute_link_config(struct intel_dp *intel_dp,
> > > > > > + struct intel_crtc_state *pipe_config,
> > > > > > + struct link_config_limits *limits,
> > > > > > + int pipe_bpp,
> > > > > > + u16 compressed_bpp,
> > > > > > + int timeslots)
> > > > > > +{
> > > > > > + const struct drm_display_mode *adjusted_mode =
> > > > > > + &pipe_config->hw.adjusted_mode;
> > > > > > + int link_rate, lane_count;
> > > > > > + int dsc_max_bpp;
> > > > > > + struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
> > > > > > + int i;
> > > > > > +
> > > > > > + for (i = 0; i < intel_dp->num_common_rates; i++) {
> > > > > > + link_rate = intel_dp_common_rate(intel_dp, i);
> > > > > > + if (link_rate < limits->min_rate || link_rate > limits->max_rate)
> > > > > > + continue;
> > > > > > +
> > > > > > + for (lane_count = limits->min_lane_count;
> > > > > > + lane_count <= limits->max_lane_count;
> > > > > > + lane_count <<= 1) {
> > > > > > + dsc_max_bpp = intel_dp_dsc_get_max_compressed_bpp(dev_priv,
> > > > > > + link_rate,
> > > > > > + lane_count,
> > > > > > + adjusted_mode->crtc_clock,
> > > > > > + adjusted_mode->crtc_hdisplay,
> > > > > > + pipe_config->bigjoiner_pipes,
> > > > > > + pipe_config->output_format,
> > > > > > + pipe_bpp, timeslots);
> > > > > > + /*
> > > > > > + * According to DSC 1.2a Section 4.1.1 Table 4.1 the maximum
> > > > > > + * supported PPS value can be 63.9375 and with the further
> > > > > > + * mention that bpp should be programmed double the target bpp
> > > > > > + * restricting our target bpp to be 31.9375 at max
> > > > > > + */
> > > > > > + if (pipe_config->output_format == INTEL_OUTPUT_FORMAT_YCBCR420)
> > > > > > + dsc_max_bpp = min_t(u16, dsc_max_bpp, 31);
> > > > > > +
> > > > > > + if (compressed_bpp > dsc_max_bpp)
> > > > > > + continue;
> > > > > > +
> > > > > > + if (!is_dsc_bw_sufficient(link_rate, lane_count,
> > > > > > + compressed_bpp, adjusted_mode))
> > > > > > + continue;
> > > > > > +
> > > > > > + pipe_config->lane_count = lane_count;
> > > > > > + pipe_config->port_clock = link_rate;
> > > > > > +
> > > > > > + return 0;
> > > > > > + }
> > > > > > + }
> > > > > > +
> > > > > > + return -EINVAL;
> > > > > > +}
> > > > > > +
> > > > > > +static
> > > > > > +u16 intel_dp_dsc_max_sink_compressed_bppx16(struct intel_dp *intel_dp,
> > > > > > + struct intel_crtc_state *pipe_config,
> > > > > > + int bpc)
> > > > > > +{
> > > > > > + u16 max_bppx16 = drm_edp_dsc_sink_output_bpp(intel_dp->dsc_dpcd);
> > > > > > +
> > > > > > + if (max_bppx16)
> > > > > > + return max_bppx16;
> > > > > > + /*
> > > > > > + * If support not given in DPCD 67h, 68h use the Maximum Allowed bit rate
> > > > > > + * values as given in spec Table 2-157 DP v2.0
> > > > > > + */
> > > > > > + switch (pipe_config->output_format) {
> > > > > > + case INTEL_OUTPUT_FORMAT_RGB:
> > > > > > + case INTEL_OUTPUT_FORMAT_YCBCR444:
> > > > > > + return (3 * bpc) << 4;
> > > > > > + case INTEL_OUTPUT_FORMAT_YCBCR420:
> > > > > > + return (3 * (bpc / 2)) << 4;
> > > > > > + default:
> > > > > > + MISSING_CASE(pipe_config->output_format);
> > > > > > + break;
> > > > > > + }
> > > > > > +
> > > > > > + return 0;
> > > > > > +}
> > > > > > +
> > > > > > +static u16 intel_dp_dsc_min_compressed_bppx16(struct intel_crtc_state *pipe_config)
> > > > > > +{
> > > > > > + switch (pipe_config->output_format) {
> > > > > > + case INTEL_OUTPUT_FORMAT_RGB:
> > > > > > + case INTEL_OUTPUT_FORMAT_YCBCR444:
> > > > > > + return 8 << 4;
> > > > > > + case INTEL_OUTPUT_FORMAT_YCBCR420:
> > > > > > + return 6 << 4;
> > > > > > + default:
> > > > > > + MISSING_CASE(pipe_config->output_format);
> > > > > > + break;
> > > > > > + }
> > > > > > +
> > > > > > + return 0;
> > > > > > +}
> > > > > > +
> > > > > > +static int dsc_compute_compressed_bpp(struct intel_dp *intel_dp,
> > > > > > + struct intel_crtc_state *pipe_config,
> > > > > > + struct link_config_limits *limits,
> > > > > > + int pipe_bpp,
> > > > > > + int timeslots)
> > > > > > +{
> > > > > > + struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
> > > > > > + u16 compressed_bpp;
> > > > > > + int dsc_min_bpp, dsc_src_max_bpp, dsc_sink_max_bpp, dsc_max_bpp;
> > > > > > + int ret;
> > > > > > +
> > > > > > + dsc_min_bpp = max(intel_dp_dsc_min_compressed_bppx16(pipe_config) >> 4, 8);
> > > > > > + if (DISPLAY_VER(dev_priv) <= 12)
> > > > > > + dsc_src_max_bpp = 23;
> > > > > > + else
> > > > > > + dsc_src_max_bpp = 27;
> > > > >
> > > > > I would may be added some comment about what are those "23/27" numbers or
> > > > > may be even created some self-explanatory #define constants for those.
> > > >
> > > > I dislike defines like that. They are single use so don't actually
> > > > do anything in terms of avoiding typoes and other accidental
> > > > mismatches, and people always seem put them in some random place
> > > > (eg. top of file) so then it takes extra work to find them.
> > >
> > > Ah come on, even my primitive mcedit with ctags plugin can track it :))
> > > However my point is that anything is better than just hard-coded magic
> > > numbers, which is proven antipattern.
> >
> > It's still a magic number whether you hide it behind a define or not.
>
> define will gixe a clue at least
>
> >
> > > Also you never know if it is a single or multiple use,
> >
> > If you use it multiple times then you aren't using the function
> > correctly.
>
> hmm.. I didn't understand we are using defines in many places, like
> register names, things like PIPE_A(which is enum but still), it is just
> more explanatory and elegant rather than use 0 instead of PIPE_A, right?
>
> >
> > > I think it should be
> > > either defined as a constant or as a define, which is self explanatory.
> >
> > No more self explanatory than a function. Once you have the
> > function the define is entirely redundant.
>
> The function explains what it does, but I'm afraid you can't put explanation
> for all the constants it used in a single function name..
#define FOO_MAX_BPP 23
#define BAR_MAX_BPP 27
...
int max_bpp()
{
if (IS_FOO)
return FOO_MAX_BPP;
else
return BAR_MAX_BPP;
}
vs.
int max_bpp()
{
if (IS_FOO)
return 23;
else
return 27;
}
The defines don't add any extra infrmation here.
--
Ville Syrjälä
Intel
