> -----Original Message-----
> From: Nautiyal, Ankit K <ankit.k.nautiyal@xxxxxxxxx>
> Sent: Thursday, October 3, 2024 4:14 PM
> To: intel-gfx@xxxxxxxxxxxxxxxxxxxxx
> Cc: intel-xe@xxxxxxxxxxxxxxxxxxxxx; Kandpal, Suraj
> <suraj.kandpal@xxxxxxxxx>; jani.nikula@xxxxxxxxxxxxxxx
> Subject: [PATCH 4/7] drm/i915/dp: Drop max_requested_bpc for dsc
> pipe_min/max bpp
>
> Currently we are including both max_requested_bpc and
> limits->pipe.bpp_max while computing maximum possible pipe bpp with
> dsc.
> However, while setting limits->pipe.max_bpp, the max_requested_bpc is
> already taken into account.
>
> Drop the redundant check for max_requested_bpc and use only
> limits->pipe.bpp_max. This will also result in dropping conn_state
> argument in functions where it was used only to get max_requested_bpc.
>
LGTM,
Reviewed-by: Suraj Kandpal <suraj.kandpal@xxxxxxxxx>
> Signed-off-by: Ankit Nautiyal <ankit.k.nautiyal@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/display/intel_dp.c | 16 ++++++----------
> 1 file changed, 6 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_dp.c
> b/drivers/gpu/drm/i915/display/intel_dp.c
> index b553b24604e1..46f3b680afe9 100644
> --- a/drivers/gpu/drm/i915/display/intel_dp.c
> +++ b/drivers/gpu/drm/i915/display/intel_dp.c
> @@ -2167,14 +2167,13 @@ int intel_dp_dsc_min_src_input_bpc(struct
> intel_display *display)
>
> static
> bool is_dsc_pipe_bpp_sufficient(struct drm_i915_private *i915,
> - struct drm_connector_state *conn_state,
> struct link_config_limits *limits,
> int pipe_bpp)
> {
> struct intel_display *display = to_intel_display(&i915->drm);
> int dsc_max_bpc, dsc_min_bpc, dsc_max_pipe_bpp,
> dsc_min_pipe_bpp;
>
> - dsc_max_bpc = min(intel_dp_dsc_max_src_input_bpc(display),
> conn_state->max_requested_bpc);
> + dsc_max_bpc = intel_dp_dsc_max_src_input_bpc(display);
> dsc_min_bpc = intel_dp_dsc_min_src_input_bpc(display);
>
> dsc_max_pipe_bpp = min(dsc_max_bpc * 3, limits->pipe.max_bpp);
> @@ -2186,7 +2185,6 @@ bool is_dsc_pipe_bpp_sufficient(struct
> drm_i915_private *i915,
>
> static
> int intel_dp_force_dsc_pipe_bpp(struct intel_dp *intel_dp,
> - struct drm_connector_state *conn_state,
> struct link_config_limits *limits)
> {
> struct drm_i915_private *i915 = dp_to_i915(intel_dp); @@ -2197,7
> +2195,7 @@ int intel_dp_force_dsc_pipe_bpp(struct intel_dp *intel_dp,
>
> forced_bpp = intel_dp->force_dsc_bpc * 3;
>
> - if (is_dsc_pipe_bpp_sufficient(i915, conn_state, limits, forced_bpp))
> {
> + if (is_dsc_pipe_bpp_sufficient(i915, limits, forced_bpp)) {
> drm_dbg_kms(&i915->drm, "Input DSC BPC forced to %d\n",
> intel_dp->force_dsc_bpc);
> return forced_bpp;
> }
> @@ -2217,14 +2215,13 @@ static int
> intel_dp_dsc_compute_pipe_bpp(struct intel_dp *intel_dp,
> struct intel_display *display = to_intel_display(intel_dp);
> const struct intel_connector *connector =
> to_intel_connector(conn_state->connector);
> - int max_req_bpc = conn_state->max_requested_bpc;
> int dsc_max_bpc, dsc_max_bpp;
> int dsc_min_bpc, dsc_min_bpp;
> u8 dsc_bpc[3] = {};
> int forced_bpp, pipe_bpp;
> int num_bpc, i, ret;
>
> - forced_bpp = intel_dp_force_dsc_pipe_bpp(intel_dp, conn_state,
> limits);
> + forced_bpp = intel_dp_force_dsc_pipe_bpp(intel_dp, limits);
>
> if (forced_bpp) {
> ret = dsc_compute_compressed_bpp(intel_dp, connector,
> pipe_config, @@ -2239,7 +2236,6 @@ static int
> intel_dp_dsc_compute_pipe_bpp(struct intel_dp *intel_dp,
> if (!dsc_max_bpc)
> return -EINVAL;
>
> - dsc_max_bpc = min(dsc_max_bpc, max_req_bpc);
> dsc_max_bpp = min(dsc_max_bpc * 3, limits->pipe.max_bpp);
>
> dsc_min_bpc = intel_dp_dsc_min_src_input_bpc(display);
> @@ -2279,16 +2275,16 @@ static int
> intel_edp_dsc_compute_pipe_bpp(struct intel_dp *intel_dp,
> int dsc_src_min_bpp, dsc_sink_min_bpp, dsc_min_bpp;
> int dsc_src_max_bpp, dsc_sink_max_bpp, dsc_max_bpp;
>
> - forced_bpp = intel_dp_force_dsc_pipe_bpp(intel_dp, conn_state,
> limits);
> + forced_bpp = intel_dp_force_dsc_pipe_bpp(intel_dp, limits);
>
> if (forced_bpp) {
> pipe_bpp = forced_bpp;
> } else {
> - int max_bpc = min(limits->pipe.max_bpp / 3,
> (int)conn_state->max_requested_bpc);
> + int max_bpc = limits->pipe.max_bpp / 3;
>
> /* For eDP use max bpp that can be supported with DSC. */
> pipe_bpp = intel_dp_dsc_compute_max_bpp(connector,
> max_bpc);
> - if (!is_dsc_pipe_bpp_sufficient(i915, conn_state, limits,
> pipe_bpp)) {
> + if (!is_dsc_pipe_bpp_sufficient(i915, limits, pipe_bpp)) {
> drm_dbg_kms(&i915->drm,
> "Computed BPC is not in DSC BPC
> limits\n");
> return -EINVAL;
> --
> 2.45.2
