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/[email protected] [1] Signed-off-by: Alice Ryhl <[email protected]> --- For drm-misc rather than drm-rust. --- drivers/gpu/drm/tyr/gpu.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/tyr/gpu.rs b/drivers/gpu/drm/tyr/gpu.rs index 6c582910dd5d93006ea0ba10f876a487b156e313..fb7ef714540218f7d9b742021af327e1467076f7 100644 --- a/drivers/gpu/drm/tyr/gpu.rs +++ b/drivers/gpu/drm/tyr/gpu.rs @@ -8,6 +8,7 @@ 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 @@ pub(crate) fn new(dev: &Device<Bound>, iomem: &Devres<IoMem>) -> Result<Self> { // 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, --- base-commit: d1c0978a7e7864fcaa7cdd562a8f938afcd2ad39 change-id: 20260120-tyr-pad0-coherency-70dd5257e56d Best regards, -- Alice Ryhl <[email protected]>
