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 (file)
index 0000000..d7c3975
--- /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 <xry111@xry111.site>
+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 <xry111@xry111.site>
+
+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 <liaronce@hotmail.com>
+Fixes: ee7be8f3de1c ("drm/amd/display: Limit DCN32 8 channel or less parts to DPM1 for FPO")
+Signed-off-by: Xi Ruoyao <xry111@xry111.site>
+Reviewed-by: Alex Hung <alex.hung@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+(cherry picked from commit 25bb1d54ba3983c064361033a8ec15474fece37e)
+Cc: stable@vger.kernel.org
+[ dropped missing `dcn32_override_min_req_dcfclk()` call since ]
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ 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 9d971fda6a6f4e57a149b70838d2d603a729e94d..95f6a24ac3d850c584f44937e675ee6e33b31f02 100644 (file)
--- 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