fixup! drm/asahi: Add the Asahi driver for Apple AGX GPUs

Avoid type confusion for file::File and error::code::*

Signed-off-by: Janne Grunau <j@jannau.net>
(cherry picked from commit afa695c https://github.com/AsahiLinux/linux)
Signed-off-by: John Cabaj <john.cabaj@canonical.com>

Author: jannau

drivers/gpu/drm/asahi/driver.rs

@@ -3,7 +3,7 @@
 //! Top-level GPU driver implementation.
 
 use kernel::{
-    c_str, device, drm, drm::drv, drm::ioctl, error::Result, of, platform, prelude::*, sync::Arc,
+    c_str, device, drm, drm::drv, drm::ioctl, error::code, error::Result, of, platform, prelude::*, sync::Arc,
 };
 
 use crate::{debug, file, gem, gpu, hw, regs};
@@ -56,23 +56,23 @@ impl drv::Driver for AsahiDriver {
 
     kernel::declare_drm_ioctls! {
         (ASAHI_GET_PARAMS,      drm_asahi_get_params,
-                          ioctl::RENDER_ALLOW, file::File::get_params),
+                          ioctl::RENDER_ALLOW, crate::file::File::get_params),
         (ASAHI_VM_CREATE,       drm_asahi_vm_create,
-            ioctl::AUTH | ioctl::RENDER_ALLOW, file::File::vm_create),
+            ioctl::AUTH | ioctl::RENDER_ALLOW, crate::file::File::vm_create),
         (ASAHI_VM_DESTROY,      drm_asahi_vm_destroy,
-            ioctl::AUTH | ioctl::RENDER_ALLOW, file::File::vm_destroy),
+            ioctl::AUTH | ioctl::RENDER_ALLOW, crate::file::File::vm_destroy),
         (ASAHI_GEM_CREATE,      drm_asahi_gem_create,
-            ioctl::AUTH | ioctl::RENDER_ALLOW, file::File::gem_create),
+            ioctl::AUTH | ioctl::RENDER_ALLOW, crate::file::File::gem_create),
         (ASAHI_GEM_MMAP_OFFSET, drm_asahi_gem_mmap_offset,
-            ioctl::AUTH | ioctl::RENDER_ALLOW, file::File::gem_mmap_offset),
+            ioctl::AUTH | ioctl::RENDER_ALLOW, crate::file::File::gem_mmap_offset),
         (ASAHI_GEM_BIND,        drm_asahi_gem_bind,
-            ioctl::AUTH | ioctl::RENDER_ALLOW, file::File::gem_bind),
+            ioctl::AUTH | ioctl::RENDER_ALLOW, crate::file::File::gem_bind),
         (ASAHI_QUEUE_CREATE,    drm_asahi_queue_create,
-            ioctl::AUTH | ioctl::RENDER_ALLOW, file::File::queue_create),
+            ioctl::AUTH | ioctl::RENDER_ALLOW, crate::file::File::queue_create),
         (ASAHI_QUEUE_DESTROY,   drm_asahi_queue_destroy,
-            ioctl::AUTH | ioctl::RENDER_ALLOW, file::File::queue_destroy),
+            ioctl::AUTH | ioctl::RENDER_ALLOW, crate::file::File::queue_destroy),
         (ASAHI_SUBMIT,          drm_asahi_submit,
-            ioctl::AUTH | ioctl::RENDER_ALLOW, file::File::submit),
+            ioctl::AUTH | ioctl::RENDER_ALLOW, crate::file::File::submit),
     }
 }