Commit e005fd94 authored by Alice Ryhl's avatar Alice Ryhl
Browse files

drm/tyr: rename pad0 to selected_coherency 

This applies the uapi change in commit ea78ec98 ("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

 [1]
Acked-by: default avatarDanilo Krummrich <dakr@kernel.org>
Link: https://patch.msgid.link/20260120-tyr-pad0-coherency-v1-1-91f40e56c67a@google.com


Signed-off-by: default avatarAlice Ryhl <aliceryhl@google.com>
parent 81af99cb

drivers/gpu/drm/tyr/gpu.rs

+3 −2
Original line number Diff line number Diff line
@@ -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,