diff --git a/drivers/gpu/drm/asahi/g17/kick.rs b/drivers/gpu/drm/asahi/g17/kick.rs
index a1f8f70f597d4..4adf2c01ac4d5 100644
--- a/drivers/gpu/drm/asahi/g17/kick.rs
+++ b/drivers/gpu/drm/asahi/g17/kick.rs
@@ -43,7 +43,7 @@ const RENDER_HEADROOM: usize = 24;
 /// The render reserve with every execution context open.
 const FULL_RENDER_RESERVE: usize = render_reserve(crate::mmu::MAX_EXECUTION_CONTEXTS as usize);
 /// Compute channels that stay reachable with every execution context open.
-#[cfg(CONFIG_KUNIT)]
+#[cfg(CONFIG_KUNIT = "y")]
 pub(super) const COMPUTE_FLOOR: usize = QID_COUNT - FULL_RENDER_RESERVE;
 /// Upper bound on distinct physical compute channels named by one kick.
 pub(super) const COMPUTE_CHANNELS: usize = QID_COUNT;
diff --git a/drivers/gpu/drm/asahi/g17/preparation.rs b/drivers/gpu/drm/asahi/g17/preparation.rs
index eb2366fa3451b..2aa3213115076 100644
--- a/drivers/gpu/drm/asahi/g17/preparation.rs
+++ b/drivers/gpu/drm/asahi/g17/preparation.rs
@@ -60,7 +60,7 @@ pub(super) struct Gate {
 }
 
 impl Gate {
-    #[cfg(CONFIG_KUNIT)]
+    #[cfg(CONFIG_KUNIT = "y")]
     pub(super) fn new() -> Result<Arc<Self>> {
         Self::with_waiters(None)
     }
diff --git a/drivers/gpu/drm/asahi/g17/queue/admission.rs b/drivers/gpu/drm/asahi/g17/queue/admission.rs
index e1e7552c243f2..5d770ca1f64b0 100644
--- a/drivers/gpu/drm/asahi/g17/queue/admission.rs
+++ b/drivers/gpu/drm/asahi/g17/queue/admission.rs
@@ -406,7 +406,7 @@ pub(crate) struct Pool {
     renders: Option<Arc<crate::g17::availability::Availability>>,
 }
 impl Pool {
-    #[cfg(CONFIG_KUNIT)]
+    #[cfg(CONFIG_KUNIT = "y")]
     pub(crate) fn new(max_queues: u32) -> Result<Arc<Self>> {
         Self::with_waiters(max_queues, None, None)
     }
diff --git a/drivers/gpu/drm/asahi/g17/runtime.rs b/drivers/gpu/drm/asahi/g17/runtime.rs
index e04295d576606..9fe17db8a2809 100644
--- a/drivers/gpu/drm/asahi/g17/runtime.rs
+++ b/drivers/gpu/drm/asahi/g17/runtime.rs
@@ -186,7 +186,7 @@ pub(super) struct Registry {
 impl Registry {
     /// Initialize inside the firmware allocation instead of staging the whole
     /// registry on the probe stack. No additional allocation is required.
-    #[cfg(CONFIG_KUNIT)]
+    #[cfg(CONFIG_KUNIT = "y")]
     pub(super) fn new(
         clusters: u32,
         deflake: crate::g17::fw::render::Deflake,