--- radeon/Makefile.orig	2022-02-23 13:59:52 UTC
+++ radeon/Makefile
@@ -149,36 +149,43 @@ CWARNFLAGS+=			-Wno-pointer-arith ${CWARNFLAGS.${.IMPS
 CWARNFLAGS+= -Wno-expansion-to-defined
 CWARNFLAGS+=			-Wno-pointer-arith ${CWARNFLAGS.${.IMPSRC:T}}
 
+CWARNFLAGS.atombios_dp.c=		-Wno-unused-but-set-variable
 CWARNFLAGS.atombios_encoders.c=		-Wno-missing-prototypes
 CWARNFLAGS.atombios_i2c.c=		-Wno-missing-prototypes
-CWARNFLAGS.ci_dpm.c=			-Wno-unused-const-variable
-CWARNFLAGS.cik.c=			-Wno-missing-prototypes -Wno-cast-qual
+CWARNFLAGS.ci_dpm.c=			-Wno-unused-const-variable -Wno-unused-but-set-variable
+CWARNFLAGS.cik.c=			-Wno-missing-prototypes -Wno-cast-qual -Wno-unused-but-set-variable
 CWARNFLAGS.cik_sdma.c=			-Wno-missing-prototypes
 CWARNFLAGS.dce3_1_afmt.c=		-Wno-missing-prototypes
 CWARNFLAGS.dce6_afmt.c=			-Wno-missing-prototypes
-CWARNFLAGS.evergreen.c=			-Wno-missing-prototypes -Wno-cast-qual
+CWARNFLAGS.evergreen.c=			-Wno-missing-prototypes -Wno-cast-qual -Wno-unused-but-set-variable
 CWARNFLAGS.evergreen_hdmi.c=		-Wno-missing-prototypes
 CWARNFLAGS.kv_dpm.c=			-Wno-unused-const-variable
-CWARNFLAGS.ni.c=			-Wno-missing-prototypes -Wno-cast-qual
+CWARNFLAGS.ni.c=			-Wno-missing-prototypes -Wno-cast-qual -Wno-unused-but-set-variable
 CWARNFLAGS.ni_dpm.c=			-Wno-missing-prototypes
-CWARNFLAGS.r600.c=			-Wno-missing-prototypes -Wno-cast-qual
-CWARNFLAGS.r600_cs.c=			-Wno-missing-prototypes
+CWARNFLAGS.r600.c=			-Wno-missing-prototypes -Wno-cast-qual -Wno-unused-but-set-variable
+CWARNFLAGS.r600_cs.c=			-Wno-missing-prototypes -Wno-unused-but-set-variable
 CWARNFLAGS.r600_hdmi.c=			-Wno-missing-prototypes
-CWARNFLAGS.radeon_atombios.c=		-Wno-missing-prototypes
+CWARNFLAGS.radeon_atombios.c=		-Wno-missing-prototypes -Wno-unused-but-set-variable
+CWARNFLAGS.radeon_combios.c=		-Wno-unused-but-set-variable
+CWARNFLAGS.radeon_connectors.c=		-Wno-unused-but-set-variable
 CWARNFLAGS.radeon_device.c=		-Wno-missing-prototypes -Wno-cast-qual
+CWARNFLAGS.radeon_display.c=		-Wno-unused-but-set-variable
+CWARNFLAGS.radeon_dp_mst.c=		-Wno-unused-but-set-variable
+CWARNFLAGS.radeon_drv.c=		-Wno-unused-but-set-variable
 CWARNFLAGS.radeon_gem.c=		-Wno-missing-prototypes
 CWARNFLAGS.radeon_irq_kms.c=		-Wno-missing-prototypes
 CWARNFLAGS.radeon_kms.c=		-Wno-missing-prototypes
 CWARNFLAGS.radeon_legacy_encoders.c=	-Wno-missing-prototypes
+CWARNFLAGS.radeon_legacy_tv.c=		-Wno-unused-but-set-variable
 CWARNFLAGS.radeon_pm.c=			-Wno-missing-prototypes -Wno-unused-function
 CWARNFLAGS.radeon_prime.c=		-Wno-missing-prototypes
 CWARNFLAGS.radeon_ring.c=		-Wno-cast-qual
 CWARNFLAGS.radeon_ttm.c=		-Wno-missing-prototypes
 CWARNFLAGS.radeon_uvd.c=		-Wno-cast-qual
 CWARNFLAGS.rv770.c=			-Wno-missing-prototypes
-CWARNFLAGS.rv770_dpm.c=			-Wno-missing-prototypes
-CWARNFLAGS.si.c=			-Wno-missing-prototypes -Wno-cast-qual
-CWARNFLAGS.si_dpm.c=			-Wno-missing-prototypes -Wno-unused-const-variable
+CWARNFLAGS.rv770_dpm.c=			-Wno-missing-prototypes -Wno-unused-but-set-variable
+CWARNFLAGS.si.c=			-Wno-missing-prototypes -Wno-cast-qual -Wno-unused-but-set-variable
+CWARNFLAGS.si_dpm.c=			-Wno-missing-prototypes -Wno-unused-const-variable -Wno-unused-but-set-variable
 CWARNFLAGS.sumo_dpm.c=			-Wno-missing-prototypes
 CWARNFLAGS.trinity_dpm.c=		-Wno-unused-const-variable
 CWARNFLAGS.vce_v1_0.c=			-Wno-missing-prototypes -Wno-cast-qual
