Pass &Self::ParentDevice<Bound> as the second argument to ioctl handlers, obtained from the UnbindGuard via Deref. This gives ioctl handlers direct access to the bound parent bus device.
Signed-off-by: Danilo Krummrich <[email protected]> --- drivers/gpu/drm/nova/file.rs | 5 +++++ drivers/gpu/drm/tyr/file.rs | 3 +++ rust/kernel/drm/ioctl.rs | 3 ++- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/nova/file.rs b/drivers/gpu/drm/nova/file.rs index 4c9fa409a8be..df9760947d58 100644 --- a/drivers/gpu/drm/nova/file.rs +++ b/drivers/gpu/drm/nova/file.rs @@ -4,6 +4,8 @@ use crate::gem::NovaObject; use kernel::{ alloc::flags::*, + auxiliary, + device::Bound, drm::{self, gem::BaseObject}, pci, prelude::*, @@ -24,6 +26,7 @@ impl File { /// IOCTL: get_param: Query GPU / driver metadata. pub(crate) fn get_param( dev: &NovaDevice, + _adev: &auxiliary::Device<Bound>, _reg_data: &(), getparam: &mut uapi::drm_nova_getparam, _file: &drm::File<File>, @@ -45,6 +48,7 @@ pub(crate) fn get_param( /// IOCTL: gem_create: Create a new DRM GEM object. pub(crate) fn gem_create( dev: &NovaDevice, + _adev: &auxiliary::Device<Bound>, _reg_data: &(), req: &mut uapi::drm_nova_gem_create, file: &drm::File<File>, @@ -59,6 +63,7 @@ pub(crate) fn gem_create( /// IOCTL: gem_info: Query GEM metadata. pub(crate) fn gem_info( _dev: &NovaDevice, + _adev: &auxiliary::Device<Bound>, _reg_data: &(), req: &mut uapi::drm_nova_gem_info, file: &drm::File<File>, diff --git a/drivers/gpu/drm/tyr/file.rs b/drivers/gpu/drm/tyr/file.rs index 6262114c6a8d..9f53da7633ab 100644 --- a/drivers/gpu/drm/tyr/file.rs +++ b/drivers/gpu/drm/tyr/file.rs @@ -1,7 +1,9 @@ // SPDX-License-Identifier: GPL-2.0 or MIT use kernel::{ + device, drm, + platform, prelude::*, uaccess::UserSlice, uapi, // @@ -29,6 +31,7 @@ fn open(_dev: &drm::Device<Self::Driver>) -> Result<Pin<KBox<Self>>> { impl TyrDrmFileData { pub(crate) fn dev_query( ddev: &TyrDrmDevice, + _pdev: &platform::Device<device::Bound>, _reg_data: &(), devquery: &mut uapi::drm_panthor_dev_query, _file: &TyrDrmFile, diff --git a/rust/kernel/drm/ioctl.rs b/rust/kernel/drm/ioctl.rs index dd177bc399b2..181918303f2f 100644 --- a/rust/kernel/drm/ioctl.rs +++ b/rust/kernel/drm/ioctl.rs @@ -83,6 +83,7 @@ pub mod internal { /// /// ```ignore /// fn foo(device: &kernel::drm::Device<Self>, +/// parent: &Self::ParentDevice<kernel::device::Bound>, /// reg_data: &<Self::RegistrationData as kernel::types::ForLt>::Of<'_>, /// data: &mut uapi::argument_type, /// file: &kernel::drm::File<Self::File>, @@ -157,7 +158,7 @@ macro_rules! declare_drm_ioctls { // SAFETY: This is just the DRM file structure let file = unsafe { $crate::drm::File::from_raw(raw_file) }; - match $func(dev, guard.registration_data(), data, file) { + match $func(dev, &*guard, guard.registration_data(), data, file) { Err(e) => e.to_errno(), Ok(i) => i.try_into() .unwrap_or($crate::error::code::ERANGE.to_errno()), -- 2.54.0
