commit f72338dffe4a19b86760379b76e7537bf65a4ec6
author Alexandre Courbot <gnurou@gmail.com> Mon Aug 10 20:46:21 2020 +0900
committer Alexandre Courbot <gnurou@gmail.com> Mon Aug 10 20:50:50 2020 +0900
tree d13d5a93a1d38ef92576af518da17745beda53dc
parent 68715e0eea7eb54cc94b66f1646ecb513e1a3cd0

device/queue: query information for all buffers

We will need to offset of each individual buffer in order to expose MMAP
buffers to userspace, so perform a `querybuf` on each buffer.

src/device/queue.rs

diff --git a/src/device/queue.rs b/src/device/queue.rs
index a63e24a..06aae24 100644
--- a/src/device/queue.rs
+++ b/src/device/queue.rs
@@ -210,7 +210,10 @@
             ioctl::reqbufs(&mut self.inner, type_, M::HandleType::MEMORY_TYPE, count)?;
 
         // The buffers have been allocated, now let's get their features.
-        let querybuf: ioctl::QueryBuffer = ioctl::querybuf(&self.inner, self.inner.type_, 0)?;
+        let mut buffer_features = Vec::new();
+        for i in 0..num_buffers {
+            buffer_features.push(ioctl::querybuf(&self.inner, self.inner.type_, i)?);
+        }
 
         Ok(Queue {
             inner: self.inner,
@@ -219,7 +222,7 @@
                 num_buffers,
                 num_queued_buffers: Default::default(),
                 buffers_state: Arc::new(Mutex::new(BuffersManager::new(num_buffers))),
-                buffer_features: querybuf,
+                buffer_features,
             },
         })
     }
@@ -351,7 +354,13 @@
             _ => return Err(Error::AlreadyBorrowed),
         };
 
-        let num_planes = self.state.buffer_features.planes.len();
+        let num_planes = self
+            .state
+            .buffer_features
+            .get(index)
+            .expect("Inconsistent queue state")
+            .planes
+            .len();
 
         // The buffer will remain in PreQueue state until it is queued
         // or the reference to it is lost.
@@ -381,7 +390,13 @@
             _ => panic!("Inconsistent buffer state: buffer not free"),
         }
 
-        let num_planes = self.state.buffer_features.planes.len();
+        let num_planes = self
+            .state
+            .buffer_features
+            .get(index)
+            .expect("Inconsistent buffer state")
+            .planes
+            .len();
 
         // The buffer remains will remain in PreQueue state until it is queued
         // or the reference to it is lost.

src/device/queue/states.rs

diff --git a/src/device/queue/states.rs b/src/device/queue/states.rs
index c8d50a7..9c43493 100644
--- a/src/device/queue/states.rs
+++ b/src/device/queue/states.rs
@@ -84,6 +84,6 @@
     pub(super) num_buffers: usize,
     pub(super) num_queued_buffers: Cell<usize>,
     pub(super) buffers_state: Arc<Mutex<BuffersManager<M>>>,
-    pub(super) buffer_features: ioctl::QueryBuffer,
+    pub(super) buffer_features: Vec<ioctl::QueryBuffer>,
 }
 impl<M: Memory> QueueState for BuffersAllocated<M> {}