From 56d4fdd025ab72c33b110ba2aedd29d08c4f65af Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Sun, 29 Jun 2025 19:48:30 +0200
Subject: [PATCH] graphics: Replace adapter.displays() with .display_count()

---
 graphics/driver-graphics/src/lib.rs | 6 +++---
 graphics/vesad/src/scheme.rs        | 4 ++--
 graphics/virtio-gpud/src/scheme.rs  | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/graphics/driver-graphics/src/lib.rs b/graphics/driver-graphics/src/lib.rs
index 09464cc083..9d6bc87097 100644
--- a/graphics/driver-graphics/src/lib.rs
+++ b/graphics/driver-graphics/src/lib.rs
@@ -11,7 +11,7 @@ pub trait GraphicsAdapter {
     type Framebuffer: Framebuffer;
     type Cursor: CursorFramebuffer;
 
-    fn displays(&self) -> Vec<usize>;
+    fn display_count(&self) -> usize;
     fn display_size(&self, display_id: usize) -> (u32, u32);
 
     fn create_dumb_framebuffer(&mut self, width: u32, height: u32) -> Self::Framebuffer;
@@ -91,7 +91,7 @@ impl<T: GraphicsAdapter> GraphicsScheme<T> {
             VtEventKind::Activate => {
                 log::info!("activate {}", vt_event.vt);
 
-                for display_id in self.adapter.displays() {
+                for display_id in 0..self.adapter.display_count() {
                     let framebuffer = self
                         .vts_fb
                         .entry(vt_event.vt)
@@ -195,7 +195,7 @@ impl<T: GraphicsAdapter> Scheme for GraphicsScheme<T> {
         let vt = screen.next().unwrap_or("").parse::<usize>().unwrap();
         let id = screen.next().unwrap_or("").parse::<usize>().unwrap_or(0);
 
-        if id >= self.adapter.displays().len() {
+        if id >= self.adapter.display_count() {
             return Err(Error::new(EINVAL));
         }
 
diff --git a/graphics/vesad/src/scheme.rs b/graphics/vesad/src/scheme.rs
index 0c140e4767..63a83896c8 100644
--- a/graphics/vesad/src/scheme.rs
+++ b/graphics/vesad/src/scheme.rs
@@ -20,8 +20,8 @@ impl GraphicsAdapter for FbAdapter {
     type Framebuffer = GraphicScreen;
     type Cursor = VesadCursor;
 
-    fn displays(&self) -> Vec<usize> {
-        (0..self.framebuffers.len()).collect()
+    fn display_count(&self) -> usize {
+        self.framebuffers.len()
     }
 
     fn display_size(&self, display_id: usize) -> (u32, u32) {
diff --git a/graphics/virtio-gpud/src/scheme.rs b/graphics/virtio-gpud/src/scheme.rs
index 1a908fbb68..0bb3ee52e9 100644
--- a/graphics/virtio-gpud/src/scheme.rs
+++ b/graphics/virtio-gpud/src/scheme.rs
@@ -149,8 +149,8 @@ impl GraphicsAdapter for VirtGpuAdapter<'_> {
     type Framebuffer = VirtGpuFramebuffer;
     type Cursor = VirtGpuCursor;
 
-    fn displays(&self) -> Vec<usize> {
-        self.displays.iter().enumerate().map(|(i, _)| i).collect()
+    fn display_count(&self) -> usize {
+        self.displays.len()
     }
 
     fn display_size(&self, display_id: usize) -> (u32, u32) {