diff --git a/drivers/gpu/drm/asahi/g15/hw.rs b/drivers/gpu/drm/asahi/g15/hw.rs
index f231e573c40176..a9d947bbbdd493 100644
--- a/drivers/gpu/drm/asahi/g15/hw.rs
+++ b/drivers/gpu/drm/asahi/g15/hw.rs
@@ -51,6 +51,7 @@ pub(crate) enum Board {
     /// ([`super::board::record`], [`super::board::device_tree`]), with the SoC's reference
     /// words for what neither carries ([`super::board::record::Reference`]). A value the
     /// builder refuses stops admission, before any firmware is touched.
+    #[cfg(CONFIG_DRM_ASAHI_G15)]
     DeviceTree(&'static super::board::record::Reference),
     /// No board data: admission refuses the SoC before anything firmware-visible.
     None,
diff --git a/drivers/gpu/drm/asahi/mmu.rs b/drivers/gpu/drm/asahi/mmu.rs
index 3a7941b4a36534..948631e16a4597 100644
--- a/drivers/gpu/drm/asahi/mmu.rs
+++ b/drivers/gpu/drm/asahi/mmu.rs
@@ -363,6 +363,7 @@ pub(crate) struct VmReadGuard(VmExecGuard);
 
 #[cfg(CONFIG_DRM_ASAHI_UAT_ADOPTION)]
 impl VmReadGuard {
+    #[cfg(CONFIG_DRM_ASAHI_G15)]
     pub(crate) fn covers_range(&mut self, address: u64, size: u64, read: bool, write: bool) -> bool {
         Vm::covers_range_locked(&mut self.0, address, size, read, write)
     }
@@ -2781,6 +2782,7 @@ impl Uat {
     }
 
     /// Binds a VM without waiting for another slot owner to retire.
+    #[cfg(CONFIG_DRM_ASAHI_G15)]
     pub(crate) fn try_bind(&self, vm: &Vm) -> Result<VmBind> {
         self.bind_inner(vm, false)
     }
diff --git a/tools/asahi/g15-zero-words-tests.py b/tools/asahi/g15-zero-words-tests.py
index 154c291dda2066..49ae02734c7ee3 100644
--- a/tools/asahi/g15-zero-words-tests.py
+++ b/tools/asahi/g15-zero-words-tests.py
@@ -12,7 +12,9 @@
 the tables are unchanged), and when the T6031 board source became the
 device tree with reference words instead of a board file (the Board enum;
 the T6030 tables are unchanged), and for publication-bound slots (removal of
-MAX_VMS and its lifetime-slot comment only). Its T6030 configuration module is
+MAX_VMS and its lifetime-slot comment only), and when Board::DeviceTree was
+gated on CONFIG_DRM_ASAHI_G15 for the T8122 runtime without the G15 backend
+(one #[cfg] line; the tables are unchanged). Its T6030 configuration module is
 independently pinned to the original bytes. prepare_board() is pinned too;
 it was refreshed for the same Board change (its T6030 arm is unchanged).
 """
@@ -30,7 +32,7 @@
 GOLDEN_FILES = {
     "board/data.rs": "7c5ff1077ca3296cbfc9e7144294162b6dea78a3774c38eeed4b0f59a14d7a5c",
     "board/template.rs": "286872f5474a67534f214e83e659253299f85143f3dc59035fa80894022e2549",
-    "hw.rs": "dd024e27c261635c2edd5356f6d79a6e2072ba57f7d13ada0862491b357cdbf3",
+    "hw.rs": "f29da6ef402ec5b0218cb8e57a0f10bb382b5895510f9f0c05a30680b9fbc24c",
     "power/idle.rs": "4928ecf7699b3ca85ff5143eb6e996efd40d47321e29a238a02c8873bc9f102c",
 }
 GOLDEN_FUNCTIONS = {