rust: drm: tyr: use generated bindings for GpuInfo
Subsystems (4)
PATCH 1/1 rust: drm: tyr: use generated bindings for GpuInfo
Currently Tyr's struct GpuInfo is manually copied and updated from include/uapi/drm/panthor_drm.h. But an auto generated struct is available, so use that instead to avoid copy/paste errors and to stay up-to-date with the panthor uapi.
--- drivers/gpu/drm/tyr/gpu.rs | 48 ++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 25 deletions(-)
drivers/gpu/drm/tyr/gpu.rs +23 -25
@@ -1,5 +1,7 @@// SPDX-License-Identifier: GPL-2.0 or MIT +use core::ops::Deref ; +use core::ops::DerefMut ;use kernel::bits::genmask_u32;use kernel::device::Bound ;use kernel::device::Device ;
@@ -8,6 +10,7 @@use kernel::prelude::*;use kernel::time;use kernel::transmute::AsBytes ; +use kernel::uapi;use crate ::driver::IoMem ;use crate ::regs;
@@ -18,29 +21,9 @@/// # Invariants /// /// - The layout of this struct identical to the C `struct drm_panthor_gpu_info`. -#[repr( C )] -pub (crate )struct GpuInfo { -pub (crate ) gpu_id:u32 , -pub (crate ) gpu_rev:u32 , -pub (crate ) csf_id:u32 , -pub (crate ) l2_features:u32 , -pub (crate ) tiler_features:u32 , -pub (crate ) mem_features:u32 , -pub (crate ) mmu_features:u32 , -pub (crate ) thread_features:u32 , -pub (crate ) max_threads:u32 , -pub (crate ) thread_max_workgroup_size:u32 , -pub (crate ) thread_max_barrier_size:u32 , -pub (crate ) coherency_features:u32 , -pub (crate ) texture_features: [u32 ;4 ], -pub (crate ) as_present:u32 , -pub (crate ) pad0:u32 , -pub (crate ) shader_present:u64 , -pub (crate ) l2_present:u64 , -pub (crate ) tiler_present:u64 , -pub (crate ) core_features:u32 , -pub (crate ) pad:u32 , -} +#[repr(transparent)] +#[derive( Clone , Copy )] +pub (crate )struct GpuInfo (pub (crate ) uapi::drm_panthor_gpu_info );impl GpuInfo {pub (crate )fn new (dev: &Device <Bound >, iomem: &Devres <IoMem >) ->Result <Self > {
@@ -73,7 +56,7 @@ pub(crate) fn new(dev: &Device<Bound>, iomem: &Devres<IoMem>) -> Result<Self> {let l2_present = u64::from (regs::GPU_L2_PRESENT_LO .read (dev, iomem)?);let l2_present = l2_present | u64::from (regs::GPU_L2_PRESENT_HI .read (dev, iomem)?) <<32 ; -Ok (Self { + Ok(Self(uapi::drm_panthor_gpu_info { gpu_id, gpu_rev, csf_id,
@@ -95,7 +78,8 @@ pub(crate) fn new(dev: &Device<Bound>, iomem: &Devres<IoMem>) -> Result<Self> { tiler_present, core_features, pad: 0, - }) + gpu_features: 0, + })) }pub (crate )fn log (&self, pdev: &platform::Device ) {
@@ -154,6 +138,20 @@ pub(crate) fn pa_bits(&self) -> u32 { } } +impl Deref for GpuInfo { +type Target = uapi::drm_panthor_gpu_info ; + +fn deref (&self) -> &Self ::Target { + &self.0 + } +} + +impl DerefMut for GpuInfo { +fn deref_mut (&mut self) -> &mut Self ::Target { + &mut self.0 + } +} +// SAFETY: `GpuInfo`'s invariant guarantees that it is the same type that is // already exposed to userspace by the C driver. This implies that it fulfills // the requirements for `AsBytes`.
Signature · 1 line
2.51.1
Quoted 6 lines · Deborah Brouwer
Currently Tyr's struct GpuInfo is manually copied and updated from
include/uapi/drm/panthor_drm.h. But an auto generated struct is available, so use that instead to avoid copy/paste errors and to stay up-to-date with the panthor uapi.Signed-off-by Deborah Brouwer <[email protected]>
Quoted 110 lines · Deborah Brouwer
Currently Tyr's struct GpuInfo is manually copied and updated from
include/uapi/drm/panthor_drm.h. But an auto generated struct is available, so use that instead to avoid copy/paste errors and to stay up-to-date with the panthor uapi.Signed-off-by Deborah Brouwer <[email protected]>---
drivers/gpu/drm/tyr/gpu.rs| 48 ++++++++++++++++++--------------------1 file changed, 23 insertions(+), 25 deletions(-)drivers/gpu/drm/tyr/gpu.rs +23
-25@@ -1,5 +1,7 @@// SPDX-License-Identifier: GPL-2.0 or MIT +use core::ops::Deref ; +use core::ops::DerefMut ;use kernel::bits::genmask_u32;use kernel::device::Bound ;use kernel::device::Device ;@@ -8,6 +10,7 @@use kernel::prelude::*;use kernel::time;use kernel::transmute::AsBytes ; +use kernel::uapi;use crate ::driver::IoMem ;use crate ::regs;@@ -18,29 +21,9 @@/// # Invariants /// /// - The layout of this struct identical to the C `struct drm_panthor_gpu_info`. -#[repr( C )] -pub (crate )struct GpuInfo { -pub (crate ) gpu_id:u32 , -pub (crate ) gpu_rev:u32 , -pub (crate ) csf_id:u32 , -pub (crate ) l2_features:u32 , -pub (crate ) tiler_features:u32 , -pub (crate ) mem_features:u32 , -pub (crate ) mmu_features:u32 , -pub (crate ) thread_features:u32 , -pub (crate ) max_threads:u32 , -pub (crate ) thread_max_workgroup_size:u32 , -pub (crate ) thread_max_barrier_size:u32 , -pub (crate ) coherency_features:u32 , -pub (crate ) texture_features: [u32 ;4 ], -pub (crate ) as_present:u32 , -pub (crate ) pad0:u32 , -pub (crate ) shader_present:u64 , -pub (crate ) l2_present:u64 , -pub (crate ) tiler_present:u64 , -pub (crate ) core_features:u32 , -pub (crate ) pad:u32 , -} +#[repr(transparent)] +#[derive( Clone , Copy )] +pub (crate )struct GpuInfo (pub (crate ) uapi::drm_panthor_gpu_info );impl GpuInfo {pub (crate )fn new (dev: &Device <Bound >, iomem: &Devres <IoMem >) ->Result <Self > {@@ -73,7 +56,7 @@ pub(crate) fn new(dev: &Device<Bound>, iomem: &Devres<IoMem>) -> Result<Self> {let l2_present = u64::from (regs::GPU_L2_PRESENT_LO .read (dev, iomem)?);let l2_present = l2_present | u64::from (regs::GPU_L2_PRESENT_HI .read (dev, iomem)?) <<32 ; -Ok (Self { + Ok(Self(uapi::drm_panthor_gpu_info { gpu_id, gpu_rev, csf_id,@@ -95,7 +78,8 @@ pub(crate) fn new(dev: &Device<Bound>, iomem: &Devres<IoMem>) -> Result<Self> { tiler_present, core_features, pad: 0, - }) + gpu_features: 0, + })) }pub (crate )fn log (&self, pdev: &platform::Device ) {@@ -154,6 +138,20 @@ pub(crate) fn pa_bits(&self) -> u32 { } } +impl Deref for GpuInfo { +type Target = uapi::drm_panthor_gpu_info ; + +fn deref (&self) -> &Self ::Target { + &self.0 + } +} + +impl DerefMut for GpuInfo { +fn deref_mut (&mut self) -> &mut Self ::Target { + &mut self.0 + } +} +// SAFETY: `GpuInfo`'s invariant guarantees that it is the same type that is // already exposed to userspace by the C driver. This implies that it fulfills // the requirements for `AsBytes`. Signature · 1 line
2.51.1