drm/asahi: port to new UAPI

Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>

Author: alyssarosenzweig

drivers/gpu/drm/asahi/buffer.rs

@@ -256,20 +256,6 @@ impl Scene::ver {
             .as_ref()
             .map(|c| c.meta.gpu_offset_pointer(self.meta4_off))
     }
-
-    /// Returns the number of TVB bytes used for this scene.
-    pub(crate) fn used_bytes(&self) -> usize {
-        self.object
-            .with(|raw, _inner| raw.total_page_count.load(Ordering::Relaxed) as usize * PAGE_SIZE)
-    }
-
-    /// Returns whether the TVB overflowed while rendering this scene.
-    pub(crate) fn overflowed(&self) -> bool {
-        self.object.with(|raw, _inner| {
-            raw.total_page_count.load(Ordering::Relaxed)
-                > raw.pass_page_count.load(Ordering::Relaxed)
-        })
-    }
 }
 
 #[versions(AGX)]
@@ -442,11 +428,6 @@ impl Buffer::ver {
         self.inner.lock().blocks.len() as u32
     }
 
-    /// Returns the total size in bytes allocated to this Buffer.
-    pub(crate) fn size(&self) -> usize {
-        self.block_count() as usize * BLOCK_SIZE
-    }
-
     /// Automatically grow the Buffer based on feedback from the statistics.
     pub(crate) fn auto_grow(&self) -> Result<bool> {
         let inner = self.inner.lock();

drivers/gpu/drm/asahi/driver.rs

@@ -68,26 +68,26 @@ impl drv::Driver for AsahiDriver {
     kernel::declare_drm_ioctls! {
         (ASAHI_GET_PARAMS,      drm_asahi_get_params,
                           ioctl::RENDER_ALLOW, crate::file::File::get_params),
+        (ASAHI_GET_TIME,        drm_asahi_get_time,
+            ioctl::AUTH | ioctl::RENDER_ALLOW, crate::file::File::get_time),
         (ASAHI_VM_CREATE,       drm_asahi_vm_create,
             ioctl::AUTH | ioctl::RENDER_ALLOW, crate::file::File::vm_create),
         (ASAHI_VM_DESTROY,      drm_asahi_vm_destroy,
             ioctl::AUTH | ioctl::RENDER_ALLOW, crate::file::File::vm_destroy),
+        (ASAHI_VM_BIND,         drm_asahi_vm_bind,
+            ioctl::AUTH | ioctl::RENDER_ALLOW, crate::file::File::vm_bind),
         (ASAHI_GEM_CREATE,      drm_asahi_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, crate::file::File::gem_mmap_offset),
-        (ASAHI_GEM_BIND,        drm_asahi_gem_bind,
-            ioctl::AUTH | ioctl::RENDER_ALLOW, crate::file::File::gem_bind),
+        (ASAHI_GEM_BIND_OBJECT, drm_asahi_gem_bind_object,
+            ioctl::AUTH | ioctl::RENDER_ALLOW, crate::file::File::gem_bind_object),
         (ASAHI_QUEUE_CREATE,    drm_asahi_queue_create,
             ioctl::AUTH | ioctl::RENDER_ALLOW, crate::file::File::queue_create),
         (ASAHI_QUEUE_DESTROY,   drm_asahi_queue_destroy,
             ioctl::AUTH | ioctl::RENDER_ALLOW, crate::file::File::queue_destroy),
         (ASAHI_SUBMIT,          drm_asahi_submit,
             ioctl::AUTH | ioctl::RENDER_ALLOW, crate::file::File::submit),
-        (ASAHI_GET_TIME,        drm_asahi_get_time,
-            ioctl::AUTH | ioctl::RENDER_ALLOW, crate::file::File::get_time),
-        (ASAHI_GEM_BIND_OBJECT, drm_asahi_gem_bind_object,
-            ioctl::AUTH | ioctl::RENDER_ALLOW, crate::file::File::gem_bind_object),
     }
 }