From e5366de32ad4a9e2110a760f1aac75a2998e13ce Mon Sep 17 00:00:00 2001 From: jsg Date: Thu, 6 Jul 2023 04:20:00 +0000 Subject: [PATCH] drm/amd/display: Ensure vmin and vmax adjust for DCE From Rodrigo Siqueira c50065a3927932cd9baf3d5c94c91b58c31200d5 in linux-6.1.y/6.1.38 2820433be2a33beb44b13b367e155cf221f29610 in mainline linux --- sys/dev/pci/drm/amd/display/dc/core/amdgpu_dc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/dev/pci/drm/amd/display/dc/core/amdgpu_dc.c b/sys/dev/pci/drm/amd/display/dc/core/amdgpu_dc.c index 277ccee8b9f..087a4838488 100644 --- a/sys/dev/pci/drm/amd/display/dc/core/amdgpu_dc.c +++ b/sys/dev/pci/drm/amd/display/dc/core/amdgpu_dc.c @@ -405,8 +405,9 @@ bool dc_stream_adjust_vmin_vmax(struct dc *dc, * Don't adjust DRR while there's bandwidth optimizations pending to * avoid conflicting with firmware updates. */ - if (dc->optimized_required || dc->wm_optimized_required) - return false; + if (dc->ctx->dce_version > DCE_VERSION_MAX) + if (dc->optimized_required || dc->wm_optimized_required) + return false; stream->adjust.v_total_max = adjust->v_total_max; stream->adjust.v_total_mid = adjust->v_total_mid; -- 2.20.1