From: Greg Kroah-Hartman Date: Sat, 21 Mar 2026 14:40:14 +0000 (+0100) Subject: 6.6-stable patches X-Git-Tag: v6.1.167~55 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c85c32c381460910023fbe33e3e45f51b4fec733;p=thirdparty%2Fkernel%2Fstable-queue.git 6.6-stable patches added patches: drm-amd-display-wrap-dcn32_override_min_req_memclk-in-dc_fp_-start-end.patch --- diff --git a/queue-6.6/drm-amd-display-wrap-dcn32_override_min_req_memclk-in-dc_fp_-start-end.patch b/queue-6.6/drm-amd-display-wrap-dcn32_override_min_req_memclk-in-dc_fp_-start-end.patch new file mode 100644 index 0000000000..d7c39754a4 --- /dev/null +++ b/queue-6.6/drm-amd-display-wrap-dcn32_override_min_req_memclk-in-dc_fp_-start-end.patch @@ -0,0 +1,42 @@ +From ebe82c6e75cfc547154d0fd843b0dd6cca3d548f Mon Sep 17 00:00:00 2001 +From: Xi Ruoyao +Date: Fri, 6 Mar 2026 14:28:03 +0800 +Subject: drm/amd/display: Wrap dcn32_override_min_req_memclk() in DC_FP_{START, END} + +From: Xi Ruoyao + +commit ebe82c6e75cfc547154d0fd843b0dd6cca3d548f upstream. + +[Why] +The dcn32_override_min_req_memclk function is in dcn32_fpu.c, which is +compiled with CC_FLAGS_FPU into FP instructions. So when we call it we +must use DC_FP_{START,END} to save and restore the FP context, and +prepare the FP unit on architectures like LoongArch where the FP unit +isn't always on. + +Reported-by: LiarOnce +Fixes: ee7be8f3de1c ("drm/amd/display: Limit DCN32 8 channel or less parts to DPM1 for FPO") +Signed-off-by: Xi Ruoyao +Reviewed-by: Alex Hung +Signed-off-by: Alex Deucher +(cherry picked from commit 25bb1d54ba3983c064361033a8ec15474fece37e) +Cc: stable@vger.kernel.org +[ dropped missing `dcn32_override_min_req_dcfclk()` call since ] +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.c ++++ b/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.c +@@ -1872,7 +1872,9 @@ bool dcn32_validate_bandwidth(struct dc + + dc->res_pool->funcs->calculate_wm_and_dlg(dc, context, pipes, pipe_cnt, vlevel); + ++ DC_FP_START(); + dcn32_override_min_req_memclk(dc, context); ++ DC_FP_END(); + + BW_VAL_TRACE_END_WATERMARKS(); + diff --git a/queue-6.6/series b/queue-6.6/series index 9d971fda6a..95f6a24ac3 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -492,3 +492,4 @@ drm-amdgpu-mmhub3.0.2-add-bounds-checking-for-cid.patch drm-amdgpu-mmhub3.0-add-bounds-checking-for-cid.patch drm-radeon-apply-state-adjust-rules-to-some-additional-hainan-vairants.patch drm-amdgpu-apply-state-adjust-rules-to-some-additional-hainan-vairants.patch +drm-amd-display-wrap-dcn32_override_min_req_memclk-in-dc_fp_-start-end.patch