device/drm: Small DRM fixes

Author: marv7000

drivers/video/virtio_gpu/src/device.rs

@@ -241,7 +241,7 @@ impl VirtioGpuDevice {
         ctrl_queue: &SpinMutex<VirtQueue>,
         resource_id: u32,
     ) -> EResult<()> {
-        let cmd = _VirtioGpuResourceUnref {
+        let cmd = VirtioGpuResourceUnref {
             hdr: VirtioGpuCtrlHdr::new(VIRTIO_GPU_CMD_RESOURCE_UNREF),
             resource_id,
             padding: 0,
@@ -532,8 +532,8 @@ impl Device for VirtioGpuDevice {
         (1, 0, 0)
     }
 
-    fn driver_info(&self) -> (&[u8], &[u8], &[u8]) {
-        (b"virtio-gpu", b"VirtIO GPU Driver", b"2026")
+    fn driver_info(&self) -> (&str, &str, &str) {
+        ("virtio-gpu", "VirtIO GPU Driver", "2026")
     }
 
     fn create_dumb(

drivers/video/virtio_gpu/src/spec.rs

@@ -123,7 +123,7 @@ pub struct VirtioGpuResourceCreate2d {
 
 #[repr(C)]
 #[derive(Debug, Clone, Copy)]
-pub struct _VirtioGpuResourceUnref {
+pub struct VirtioGpuResourceUnref {
     pub hdr: VirtioGpuCtrlHdr,
     pub resource_id: u32,
     pub padding: u32,

kernel/src/device/drm/mod.rs

@@ -7,7 +7,9 @@ use crate::{
     process::Identity,
     uapi::{
         self,
-        drm::{self, DRM_FORMAT_XRGB8888, drm_mode_modeinfo},
+        drm::{
+            self, DRM_FORMAT_XRGB8888, DRM_MODE_CURSOR_BO, DRM_MODE_CURSOR_MOVE, drm_mode_modeinfo,
+        },
     },
     util::{event::Event, mutex::spin::SpinMutex},
     vfs::{
@@ -71,7 +73,7 @@ pub trait Device: Send + Sync {
     fn driver_version(&self) -> (i32, i32, i32);
 
     /// Returns a tuple of (name, description, date).
-    fn driver_info(&self) -> (&[u8], &[u8], &[u8]);
+    fn driver_info(&self) -> (&str, &str, &str);
 
     /// Creates a dumb framebuffer. Also returns the pitch in bytes.
     fn create_dumb(
@@ -82,7 +84,11 @@ pub trait Device: Send + Sync {
         bpp: u32,
     ) -> EResult<(Arc<dyn BufferObject>, u32)> {
         let _ = (file, width, height, bpp);
-        Err(Errno::ENOSYS)
+        warn!(
+            "drm::Device::create_dumb is not implemented for {}!",
+            self.driver_info().0
+        );
+        Err(Errno::ENOTTY)
     }
 
     fn create_fb(
@@ -95,7 +101,11 @@ pub trait Device: Send + Sync {
         pitch: u32,
     ) -> EResult<Arc<Framebuffer>> {
         let _ = (file, buffer, width, height, format, pitch);
-        Err(Errno::ENOSYS)
+        warn!(
+            "drm::Device::create_fb is not implemented for {}!",
+            self.driver_info().0
+        );
+        Err(Errno::ENOTTY)
     }
 
     fn commit(&self, state: &AtomicState);
@@ -105,19 +115,29 @@ pub trait Device: Send + Sync {
     /// `hot_x` and `hot_y` are the hotspot offsets (pixels from top-left of cursor image).
     fn set_cursor(
         &self,
-        _crtc_id: u32,
-        _buffer: Option<Arc<dyn BufferObject>>,
-        _width: u32,
-        _height: u32,
-        _hot_x: i32,
-        _hot_y: i32,
+        crtc_id: u32,
+        buffer: Option<Arc<dyn BufferObject>>,
+        width: u32,
+        height: u32,
+        hot_x: i32,
+        hot_y: i32,
     ) -> EResult<()> {
-        Err(Errno::ENOSYS)
+        let _ = (buffer, crtc_id, width, height, hot_x, hot_y);
+        warn!(
+            "drm::Device::set_cursor is not implemented for {}!",
+            self.driver_info().0
+        );
+        Err(Errno::ENOTTY)
     }
 
     /// Move the cursor to a new position on the given CRTC.
-    fn move_cursor(&self, _crtc_id: u32, _x: i32, _y: i32) -> EResult<()> {
-        Err(Errno::ENOSYS)
+    fn move_cursor(&self, crtc_id: u32, x: i32, y: i32) -> EResult<()> {
+        let _ = (crtc_id, x, y);
+        warn!(
+            "drm::Device::move_cursor is not implemented for {}!",
+            self.driver_info().0
+        );
+        Err(Errno::ENOTTY)
     }
 }
 
@@ -289,19 +309,25 @@ impl FileOps for DrmFile {
 
                 if !val.name.is_null() && val.name_len > 0 {
                     let len = name.len().min(val.name_len);
-                    val.name.write_slice(&name[..len]).ok_or(Errno::EFAULT)?;
+                    val.name
+                        .write_slice(&name.as_bytes()[..len])
+                        .ok_or(Errno::EFAULT)?;
                 }
                 val.name_len = name.len();
 
                 if !val.date.is_null() && val.date_len > 0 {
                     let len = date.len().min(val.date_len);
-                    val.date.write_slice(&date[..len]).ok_or(Errno::EFAULT)?;
+                    val.date
+                        .write_slice(&date.as_bytes()[..len])
+                        .ok_or(Errno::EFAULT)?;
                 }
                 val.date_len = date.len();
 
                 if !val.desc.is_null() && val.desc_len > 0 {
                     let len = desc.len().min(val.desc_len);
-                    val.desc.write_slice(&desc[..len]).ok_or(Errno::EFAULT)?;
+                    val.desc
+                        .write_slice(&desc.as_bytes()[..len])
+                        .ok_or(Errno::EFAULT)?;
                 }
                 val.desc_len = desc.len();
 
@@ -997,22 +1023,20 @@ impl FileOps for DrmFile {
                 let ptr = UserPtr::<drm::drm_mode_cursor>::new(arg);
                 let val = ptr.read().ok_or(Errno::EFAULT)?;
 
-                const DRM_MODE_CURSOR_BO: u32 = 0x01;
-                const DRM_MODE_CURSOR_MOVE: u32 = 0x02;
-
                 if val.flags & DRM_MODE_CURSOR_BO != 0 {
                     if val.handle == 0 {
                         // Hide cursor
                         self.device.set_cursor(val.crtc_id, None, 0, 0, 0, 0)?;
                     } else {
                         // Set cursor image
-                        let buffers = self.buffers.lock();
-                        let buffer = buffers
-                            .iter()
-                            .find(|b| b.id() == val.handle)
-                            .ok_or(Errno::EINVAL)?
-                            .clone();
-                        drop(buffers);
+                        let buffer = {
+                            let buffers = self.buffers.lock();
+                            buffers
+                                .iter()
+                                .find(|b| b.id() == val.handle)
+                                .ok_or(Errno::EINVAL)?
+                                .clone()
+                        };
                         self.device.set_cursor(
                             val.crtc_id,
                             Some(buffer),
@@ -1031,22 +1055,20 @@ impl FileOps for DrmFile {
                 let ptr = UserPtr::<drm::drm_mode_cursor2>::new(arg);
                 let val = ptr.read().ok_or(Errno::EFAULT)?;
 
-                const DRM_MODE_CURSOR_BO: u32 = 0x01;
-                const DRM_MODE_CURSOR_MOVE: u32 = 0x02;
-
                 if val.flags & DRM_MODE_CURSOR_BO != 0 {
                     if val.handle == 0 {
                         // Hide cursor
                         self.device.set_cursor(val.crtc_id, None, 0, 0, 0, 0)?;
                     } else {
                         // Set cursor image with hotspot
-                        let buffers = self.buffers.lock();
-                        let buffer = buffers
-                            .iter()
-                            .find(|b| b.id() == val.handle)
-                            .ok_or(Errno::EINVAL)?
-                            .clone();
-                        drop(buffers);
+                        let buffer = {
+                            let buffers = self.buffers.lock();
+                            buffers
+                                .iter()
+                                .find(|b| b.id() == val.handle)
+                                .ok_or(Errno::EINVAL)?
+                                .clone()
+                        };
                         self.device.set_cursor(
                             val.crtc_id,
                             Some(buffer),
@@ -1082,7 +1104,7 @@ impl FileOps for DrmFile {
             }
             x => {
                 error!("Unknown ioctl {x:x}");
-                return Err(Errno::ENOSYS);
+                return Err(Errno::ENOTTY);
             }
         }
         Ok(0)

kernel/src/device/drm/plainfb.rs

@@ -19,21 +19,10 @@ use crate::{
         DRM_FORMAT_ARGB8888, DRM_FORMAT_XRGB8888, DRM_PLANE_TYPE_CURSOR, DRM_PLANE_TYPE_PRIMARY,
         drm_mode_connector_state, drm_mode_connector_type,
     },
-    util::mutex::spin::SpinMutex,
 };
 use alloc::{sync::Arc, vec};
 use core::any::Any;
 
-struct CursorState {
-    buffer: Option<Arc<dyn BufferObject>>,
-    x: i32,
-    y: i32,
-    width: u32,
-    height: u32,
-    hot_x: i32,
-    hot_y: i32,
-}
-
 struct PlainDevice {
     state: DeviceState,
     width: u32,
@@ -42,51 +31,6 @@ struct PlainDevice {
     stride: u32,
     addr: MmioView, // Shared DRM object storage (device-global)
     obj_counter: IdAllocator,
-    cursor: SpinMutex<CursorState>,
-}
-
-impl PlainDevice {
-    /// Alpha-blend cursor pixels onto the MMIO framebuffer.
-    fn composite_cursor(&self, cursor: &CursorState, cbuf: &PlainDumbBuffer) {
-        let fb_w = self.width as i32;
-        let fb_h = self.height as i32;
-        let stride = self.stride as usize;
-        let cw = cursor.width as i32;
-        let ch = cursor.height as i32;
-
-        let dst_base = self.addr.base() as *mut u8;
-        let src_base = cbuf.addr.as_hhdm::<u8>();
-
-        for cy in 0..ch {
-            let py = cursor.y + cy;
-            if py < 0 || py >= fb_h {
-                continue;
-            }
-            for cx in 0..cw {
-                let px = cursor.x + cx;
-                if px < 0 || px >= fb_w {
-                    continue;
-                }
-
-                let src_off = (cy as usize * cursor.width as usize + cx as usize) * 4;
-                let dst_off = py as usize * stride + px as usize * 4;
-
-                unsafe {
-                    let sa = *src_base.add(src_off + 3) as u32;
-                    if sa == 0 {
-                        continue;
-                    }
-                    let inv_a = 255 - sa;
-
-                    for c in 0..3 {
-                        let s = *src_base.add(src_off + c) as u32;
-                        let d = *dst_base.add(dst_off + c) as u32;
-                        *dst_base.add(dst_off + c) = ((s * sa + d * inv_a) / 255) as u8;
-                    }
-                }
-            }
-        }
-    }
 }
 
 impl Device for PlainDevice {
@@ -98,8 +42,8 @@ impl Device for PlainDevice {
         (0, 1, 0)
     }
 
-    fn driver_info(&self) -> (&[u8], &[u8], &[u8]) {
-        (b"plainfb", b"Plain Framebuffer", b"0")
+    fn driver_info(&self) -> (&str, &str, &str) {
+        ("plainfb", "Plain Framebuffer", "0")
     }
 
     fn create_dumb(
@@ -186,43 +130,9 @@ impl Device for PlainDevice {
                         );
                     }
                 }
-
-                // Composite cursor on top if active
-                let cursor = self.cursor.lock();
-                if let Some(ref cursor_buf) = cursor.buffer {
-                    let cursor_data = cursor_buf.as_ref() as &dyn Any;
-                    if let Some(cbuf) = cursor_data.downcast_ref::<PlainDumbBuffer>() {
-                        self.composite_cursor(&cursor, cbuf);
-                    }
-                }
             }
         }
     }
-
-    fn set_cursor(
-        &self,
-        _crtc_id: u32,
-        buffer: Option<Arc<dyn BufferObject>>,
-        width: u32,
-        height: u32,
-        hot_x: i32,
-        hot_y: i32,
-    ) -> EResult<()> {
-        let mut cursor = self.cursor.lock();
-        cursor.buffer = buffer;
-        cursor.width = width;
-        cursor.height = height;
-        cursor.hot_x = hot_x;
-        cursor.hot_y = hot_y;
-        Ok(())
-    }
-
-    fn move_cursor(&self, _crtc_id: u32, x: i32, y: i32) -> EResult<()> {
-        let mut cursor = self.cursor.lock();
-        cursor.x = x;
-        cursor.y = y;
-        Ok(())
-    }
 }
 
 struct PlainDumbBuffer {
@@ -299,15 +209,6 @@ fn PLAINFB_STAGE() {
         stride: fb.pitch as _,
         addr: unsafe { MmioView::new(fb.base, fb.pitch * fb.height) },
         obj_counter: IdAllocator::new(),
-        cursor: SpinMutex::new(CursorState {
-            buffer: None,
-            x: 0,
-            y: 0,
-            width: 0,
-            height: 0,
-            hot_x: 0,
-            hot_y: 0,
-        }),
     });
 
     // Initialize DRM objects and store them in the device