]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
drm/tyr: rename pad0 to selected_coherency
authorAlice Ryhl <aliceryhl@google.com>
Tue, 20 Jan 2026 10:34:58 +0000 (10:34 +0000)
committerAlice Ryhl <aliceryhl@google.com>
Tue, 20 Jan 2026 12:19:26 +0000 (12:19 +0000)
This applies the uapi change in commit ea78ec982653 ("drm/panthor:
Expose the selected coherency protocol to the UMD") to the Tyr driver as
well.

Once this is merged with drm-rust-next, this kind of change to the uapi
struct is automatically reflected in the Tyr driver's GpuInfo. [1]

Link: https://lore.kernel.org/r/aW8-oH7dtp-OTAZC@google.com
Acked-by: Danilo Krummrich <dakr@kernel.org>
Link: https://patch.msgid.link/20260120-tyr-pad0-coherency-v1-1-91f40e56c67a@google.com
Signed-off-by: Alice Ryhl <aliceryhl@google.com>
drivers/gpu/drm/tyr/gpu.rs

index 6c582910dd5d93006ea0ba10f876a487b156e313..fb7ef714540218f7d9b742021af327e1467076f7 100644 (file)
@@ -8,6 +8,7 @@ use kernel::platform;
 use kernel::prelude::*;
 use kernel::time;
 use kernel::transmute::AsBytes;
+use kernel::uapi;
 
 use crate::driver::IoMem;
 use crate::regs;
@@ -34,7 +35,7 @@ pub(crate) struct GpuInfo {
     pub(crate) coherency_features: u32,
     pub(crate) texture_features: [u32; 4],
     pub(crate) as_present: u32,
-    pub(crate) pad0: u32,
+    pub(crate) selected_coherency: u32,
     pub(crate) shader_present: u64,
     pub(crate) l2_present: u64,
     pub(crate) tiler_present: u64,
@@ -89,7 +90,7 @@ impl GpuInfo {
             // TODO: Add texture_features_{1,2,3}.
             texture_features: [texture_features, 0, 0, 0],
             as_present,
-            pad0: 0,
+            selected_coherency: uapi::drm_panthor_gpu_coherency_DRM_PANTHOR_GPU_COHERENCY_NONE,
             shader_present,
             l2_present,
             tiler_present,