@@ -2490,8 +2490,11 @@ intel_dp_compute_config_limits(struct intel_dp *intel_dp,
int dsc_min_bpc = intel_dp_dsc_min_src_input_bpc(display);
int dsc_max_bpc = intel_dp_dsc_max_src_input_bpc(display);
- limits->pipe.max_bpp = min(limits->pipe.max_bpp, dsc_max_bpc * 3);
- limits->pipe.min_bpp = max(limits->pipe.min_bpp, dsc_min_bpc * 3);
+ limits->pipe.max_bpp = clamp(limits->pipe.max_bpp,
+ dsc_min_bpc * 3, dsc_max_bpc * 3);
+
+ limits->pipe.min_bpp = clamp(limits->pipe.min_bpp,
+ dsc_min_bpc * 3, dsc_max_bpc * 3);
}
if (intel_dp->use_max_params) {
Currently to get the max pipe_bpp with dsc we take the min of limits->pipe.max_bpp and dsc max bpp (dsc max bpc * 3). This can result in problems when limits->pipe.max_bpp is less than the computed dsc min bpp (dsc min bpc * 3). Replace the min/max functions with clamp while computing limits->pipe.max/min_bpp to ensure that the pipe_bpp limits are constrained within the DSC-defined minimum and maximum values. Signed-off-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com> --- drivers/gpu/drm/i915/display/intel_dp.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)