drm/i915/dp: Fix the computation for compressed_bpp for DISPLAY < 13

commit f7caddfd558e32db0ae944256e623a259538b357 upstream.

For DISPLAY < 13, compressed bpp is chosen from a list of
supported compressed bpps. Fix the condition to choose the
appropriate compressed bpp from the list.

Fixes: 1c56e9a39833 ("drm/i915/dp: Get optimal link config to have best compressed bpp")
Cc: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
Cc: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: <stable@vger.kernel.org> # v6.7+
Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/10162
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/20240305054443.2489895-1-ankit.k.nautiyal@intel.com
(cherry picked from commit 5a1da42b50f3594e18738885c2f23ed36629dd00)
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
index 76373d5bf214330303a6cda66517a24b3ea90b21..360e90601ff938dc61e5584ec15b0c1bd9c68bf3 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@ -1916,8 +1916,9 @@ icl_dsc_compute_link_config(struct intel_dp *intel_dp,
        dsc_max_bpp = min(dsc_max_bpp, pipe_bpp - 1);
 
        for (i = 0; i < ARRAY_SIZE(valid_dsc_bpp); i++) {
-               if (valid_dsc_bpp[i] < dsc_min_bpp ||
-                   valid_dsc_bpp[i] > dsc_max_bpp)
+               if (valid_dsc_bpp[i] < dsc_min_bpp)
+                       continue;
+               if (valid_dsc_bpp[i] > dsc_max_bpp)
                        break;
 
                ret = dsc_compute_link_config(intel_dp,