Re: kern/57059 (amdgpu graphics ring test failing)

[Taylor R Campbell <riastradh%NetBSD.org@localhost>]

> Date: Tue, 11 Jul 2023 23:37:30 +0000
> From: Bruno Melo <bmelo%protonmail.com@localhost>
> 
> Please confirm if you received the dmesg file as I think gnats dont
> show attached files.

Confirmed!

Can you please try the attached patch?  Note that this will require a
clean build of the kernel, or of amdgpu.kmod -- it won't automatically
trigger rebuild of the affected files.

diff --git a/sys/external/bsd/drm2/amdgpu/files.amdgpu b/sys/external/bsd/drm2/amdgpu/files.amdgpu
index 01fec4a71975..ab8d7e0f4d52 100644
--- a/sys/external/bsd/drm2/amdgpu/files.amdgpu
+++ b/sys/external/bsd/drm2/amdgpu/files.amdgpu
@@ -33,6 +33,7 @@ makeoptions	amdgpu	"CPPFLAGS.amdgpu"+="-I$S/external/bsd/drm2/dist/drm/amd/displ
 makeoptions	amdgpu	"CPPFLAGS.amdgpu"+="-I$S/external/bsd/drm2/dist/drm/amd/display/dmub/inc"
 
 makeoptions	amdgpu	"CPPFLAGS.amdgpu"+="-DCONFIG_DRM_AMD_ACP=1"
+makeoptions	amdgpu	"CPPFLAGS.amdgpu"+="-DCONFIG_DRM_AMD_DC=1"
 makeoptions	amdgpu	"CPPFLAGS.amdgpu"+="-DCONFIG_DRM_AMD_DC_DCN=1"
 makeoptions	amdgpu	"CPPFLAGS.amdgpu"+="-DCONFIG_DRM_AMD_DC_HDCP=1"
 makeoptions	amdgpu	"CPPFLAGS.amdgpu"+="-DCONFIG_PERF_EVENTS=0"
diff --git a/sys/external/bsd/drm2/dist/drm/amd/display/dc/calcs/amdgpu_dcn_calcs.c b/sys/external/bsd/drm2/dist/drm/amd/display/dc/calcs/amdgpu_dcn_calcs.c
index 2a169acdc48d..73433641be2a 100644
--- a/sys/external/bsd/drm2/dist/drm/amd/display/dc/calcs/amdgpu_dcn_calcs.c
+++ b/sys/external/bsd/drm2/dist/drm/amd/display/dc/calcs/amdgpu_dcn_calcs.c
@@ -733,7 +733,7 @@ bool dcn_validate_bandwidth(
 	struct dcn_bw_internal_vars *v = &context->dcn_bw_vars;
 	int i, input_idx, k;
 	int vesa_sync_start, asic_blank_end, asic_blank_start;
-	bool bw_limit_pass;
+	volatile bool bw_limit_pass;
 	float bw_limit;
 
 	PERFORMANCE_TRACE_START();