diff options
author | Dave Airlie <airlied@redhat.com> | 2025-09-12 08:40:15 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2025-09-12 09:05:42 +1000 |
commit | 2c38074c3667ca6940a1ea29930e2cd86efce348 (patch) | |
tree | 8035decc2deedc83819aea7b5cd551a9b7a952b4 | |
parent | 76eeb9b8de9880ca38696b2fb56ac45ac0a25c6c (diff) | |
parent | 349510052f765b6eb9c2a21d0ffe08ba61fa683c (diff) |
Merge tag 'drm-rust-fixes-2025-09-05' of https://gitlab.freedesktop.org/drm/rust/kernel into drm-fixes
- Add drm-rust tree to MAINTAINERS
- Require CONFIG_64BIT for Nova
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alice Ryhl <aliceryhl@google.com>
Link: https://lore.kernel.org/r/aLquN1YvdyI_6PJS@google.com
-rw-r--r-- | MAINTAINERS | 11 | ||||
-rw-r--r-- | drivers/gpu/nova-core/Kconfig | 1 |
2 files changed, 11 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index cd7ff55b5d32..30f267c5f59d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -8080,7 +8080,6 @@ F: Documentation/devicetree/bindings/gpu/ F: Documentation/gpu/ F: drivers/gpu/drm/ F: drivers/gpu/vga/ -F: rust/kernel/drm/ F: include/drm/drm F: include/linux/vga* F: include/uapi/drm/ @@ -8097,6 +8096,16 @@ X: drivers/gpu/drm/radeon/ X: drivers/gpu/drm/tegra/ X: drivers/gpu/drm/xe/ +DRM DRIVERS AND COMMON INFRASTRUCTURE [RUST] +M: Danilo Krummrich <dakr@kernel.org> +M: Alice Ryhl <aliceryhl@google.com> +S: Supported +W: https://drm.pages.freedesktop.org/maintainer-tools/drm-rust.html +T: git https://gitlab.freedesktop.org/drm/rust/kernel.git +F: drivers/gpu/drm/nova/ +F: drivers/gpu/nova-core/ +F: rust/kernel/drm/ + DRM DRIVERS FOR ALLWINNER A10 M: Maxime Ripard <mripard@kernel.org> M: Chen-Yu Tsai <wens@csie.org> diff --git a/drivers/gpu/nova-core/Kconfig b/drivers/gpu/nova-core/Kconfig index 8726d80d6ba4..20d3e6d0d796 100644 --- a/drivers/gpu/nova-core/Kconfig +++ b/drivers/gpu/nova-core/Kconfig @@ -1,5 +1,6 @@ config NOVA_CORE tristate "Nova Core GPU driver" + depends on 64BIT depends on PCI depends on RUST depends on RUST_FW_LOADER_ABSTRACTIONS |