Skip to content

drm/asahi: build without the G15 backend again #256

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
erykwieliczko merged 3 commits into from
Oct 28, 2026
Merged

drm/asahi: build without the G15 backend again #256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6c98368
drm/asahi: g15: build Board::DeviceTree only with the G15 backend
erykwieliczko Oct 28, 2026
88e3cc7
drm/asahi: build Uat::try_bind only with the G15 backend
erykwieliczko Oct 28, 2026
f5d7233
drm/asahi: build VmReadGuard::covers_range only with the G15 backend
erykwieliczko Oct 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions drivers/gpu/drm/asahi/g15/hw.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
// SPDX-License-Identifier: GPL-2.0-only OR MIT

//! G15 hardware and firmware-ABI constants (layout values are shared by several modules; change
Expand Down Expand Up @@ -51,6 +51,7 @@
/// ([`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,
Expand Down
2 changes: 2 additions & 0 deletions drivers/gpu/drm/asahi/mmu.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
// SPDX-License-Identifier: GPL-2.0-only OR MIT

//! GPU UAT (MMU) management
Expand Down Expand Up @@ -363,6 +363,7 @@

#[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)
}
Expand Down Expand Up @@ -2781,6 +2782,7 @@
}

/// 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)
}
Expand Down
6 changes: 4 additions & 2 deletions tools/asahi/g15-zero-words-tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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).
"""
Expand All @@ -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 = {
Expand Down