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.

Signed-off-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
Reviewed-by: Suraj Kandpal <suraj.kandpal@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241217093244.3938132-9-ankit.k.nautiyal@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
index 2435370b7a0607e344957257d956f0b17fd2e0ce..ab7d9d43712e7db767485b7630da1ecad21e683b 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@ -2194,13 +2194,12 @@ int intel_dp_dsc_min_src_input_bpc(void)
 
 static
 bool is_dsc_pipe_bpp_sufficient(struct intel_display *display,
-                               struct drm_connector_state *conn_state,
                                struct link_config_limits *limits,
                                int pipe_bpp)
 {
        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();
 
        dsc_max_pipe_bpp = min(dsc_max_bpc * 3, limits->pipe.max_bpp);
@@ -2212,7 +2211,6 @@ bool is_dsc_pipe_bpp_sufficient(struct intel_display *display,
 
 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 intel_display *display = to_intel_display(intel_dp);
@@ -2223,7 +2221,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(display, conn_state, limits, forced_bpp)) {
+       if (is_dsc_pipe_bpp_sufficient(display, limits, forced_bpp)) {
                drm_dbg_kms(display->drm, "Input DSC BPC forced to %d\n",
                            intel_dp->force_dsc_bpc);
                return forced_bpp;
@@ -2245,14 +2243,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,
@@ -2267,7 +2264,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();
@@ -2307,16 +2303,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(display, conn_state, limits, pipe_bpp)) {
+               if (!is_dsc_pipe_bpp_sufficient(display, limits, pipe_bpp)) {
                        drm_dbg_kms(display->drm,
                                    "Computed BPC is not in DSC BPC limits\n");
                        return -EINVAL;