aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/rust/kernel/drm/ioctl.rs
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2025-07-21 09:13:15 +1000
committerDave Airlie <airlied@redhat.com>2025-07-21 09:16:51 +1000
commitbe3cd668fffe2a1dc8a9c617b44c5f46fa2e4b96 (patch)
tree53ff653774fc63598bd4ff9671ab060af5102698 /rust/kernel/drm/ioctl.rs
parentMerge tag 'drm-xe-next-2025-07-15' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-next (diff)
parentdrm/amdgpu: Fix missing unlocking in an error path in amdgpu_userq_create() (diff)
downloadwireguard-linux-be3cd668fffe2a1dc8a9c617b44c5f46fa2e4b96.tar.xz
wireguard-linux-be3cd668fffe2a1dc8a9c617b44c5f46fa2e4b96.zip
Merge tag 'drm-misc-next-2025-07-17' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-next
drm-misc-next for 6.17: UAPI Changes: Cross-subsystem Changes: Core Changes: - mode_config: Change fb_create prototype to pass the drm_format_info and avoid redundant lookups in drivers - sched: kunit improvements, memory leak fixes, reset handling improvements - tests: kunit EDID update Driver Changes: - amdgpu: Hibernation fixes, structure lifetime fixes - nouveau: sched improvements - sitronix: Add Sitronix ST7567 Support - bridge: - Make connector available to bridge detect hook - panel: - More refcounting changes - New panels: BOE NE14QDM Signed-off-by: Dave Airlie <airlied@redhat.com> From: Maxime Ripard <mripard@redhat.com> Link: https://lore.kernel.org/r/20250717-efficient-kudu-of-fantasy-ff95e0@houat
Diffstat (limited to 'rust/kernel/drm/ioctl.rs')
-rw-r--r--rust/kernel/drm/ioctl.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/rust/kernel/drm/ioctl.rs b/rust/kernel/drm/ioctl.rs
index 445639404fb7..fdec01c37168 100644
--- a/rust/kernel/drm/ioctl.rs
+++ b/rust/kernel/drm/ioctl.rs
@@ -134,7 +134,7 @@ macro_rules! declare_drm_ioctls {
// FIXME: Currently there is nothing enforcing that the types of the
// dev/file match the current driver these ioctls are being declared
// for, and it's not clear how to enforce this within the type system.
- let dev = $crate::drm::device::Device::as_ref(raw_dev);
+ let dev = $crate::drm::device::Device::from_raw(raw_dev);
// SAFETY: The ioctl argument has size `_IOC_SIZE(cmd)`, which we
// asserted above matches the size of this type, and all bit patterns of
// UAPI structs must be valid.
@@ -142,7 +142,7 @@ macro_rules! declare_drm_ioctls {
&*(raw_data as *const $crate::types::Opaque<$crate::uapi::$struct>)
};
// SAFETY: This is just the DRM file structure
- let file = unsafe { $crate::drm::File::as_ref(raw_file) };
+ let file = unsafe { $crate::drm::File::from_raw(raw_file) };
match $func(dev, data, file) {
Err(e) => e.to_errno(),