drm/asahi: workqueue,queue: More debug

Signed-off-by: Asahi Lina <lina@asahilina.net>

Author: hoshinolina

drivers/gpu/drm/asahi/queue/mod.rs

@@ -205,7 +205,7 @@ impl QueueJob::ver {
     }
 
     fn commit(&mut self) -> Result {
-        mod_dev_dbg!(self.dev, "QueueJob: Committing\n");
+        mod_dev_dbg!(self.dev, "QueueJob {}: Committing\n", self.id);
 
         self.sj_vtx.as_mut().map(|a| a.commit()).unwrap_or(Ok(()))?;
         self.sj_frag
@@ -794,16 +794,31 @@ impl Queue for Queue::ver {
             }
         }
 
-        mod_dev_dbg!(self.dev, "Queue: Committing job\n");
+        mod_dev_dbg!(
+            self.dev,
+            "Queue {}: Committing job {}\n",
+            self.inner.id,
+            job.id
+        );
         job.commit()?;
 
-        mod_dev_dbg!(self.dev, "Queue: Arming job\n");
+        mod_dev_dbg!(self.dev, "Queue {}: Arming job {}\n", self.inner.id, job.id);
         let job = job.arm();
         let out_fence = job.fences().finished();
-        mod_dev_dbg!(self.dev, "Queue: Pushing job\n");
+        mod_dev_dbg!(
+            self.dev,
+            "Queue {}: Pushing job {}\n",
+            self.inner.id,
+            job.id
+        );
         job.push();
 
-        mod_dev_dbg!(self.dev, "Queue: Adding {} out_syncs\n", out_syncs.len());
+        mod_dev_dbg!(
+            self.dev,
+            "Queue {}: Adding {} out_syncs\n",
+            self.inner.id,
+            out_syncs.len()
+        );
         for mut sync in out_syncs {
             if let Some(chain) = sync.chain_fence.take() {
                 sync.syncobj

drivers/gpu/drm/asahi/workqueue.rs

@@ -379,7 +379,7 @@ impl Job::ver {
             Some(work.get_fence())
         } else {
             pr_err!(
-                "WorkQueue: Cannot submit, but queue is empty? {} > {}, {} > {} (pend={} ls={:#x?} lc={:#x?}) ev={:#x?}\n",
+                "WorkQueue: Cannot submit, but queue is empty? {} > {}, {} > {} (pend={} ls={:#x?} lc={:#x?}) ev={:#x?} cur={:#x?} slot {:?}\n",
                 inner.free_slots(),
                 self.event_count,
                 inner.free_space(),
@@ -388,6 +388,8 @@ impl Job::ver {
                 inner.last_submitted,
                 inner.last_completed,
                 inner.event.as_ref().map(|a| a.1),
+                inner.event.as_ref().map(|a| a.0.current()),
+                inner.event.as_ref().map(|a| a.0.slot()),
             );
             None
         }
@@ -440,6 +442,16 @@ impl Job::ver {
         inner.pending.reserve(command_count, GFP_KERNEL)?;
 
         inner.last_submitted = inner.event.as_ref().map(|e| e.1);
+        mod_dev_dbg!(
+            inner.dev,
+            "WorkQueue: submitting {} cmds at {:#x?}, lc {:#x?}, cur {:#x?}, pending {}, events {}\n",
+            self.pending.len(),
+            inner.last_submitted,
+            inner.last_completed,
+            inner.event.as_ref().map(|a| a.0.current()),
+            inner.pending.len(),
+            self.event_count,
+        );
 
         for mut command in self.pending.drain(..) {
             command.set_wptr(wptr);
@@ -515,6 +527,13 @@ impl Drop for Job::ver {
         mod_pr_debug!("WorkQueue: Dropping Job\n");
         let mut inner = self.wq.inner.lock();
 
+        if !self.committed {
+            pr_info!(
+                "WorkQueue: Dropping uncommitted job with {} events\n",
+                self.event_count
+            );
+        }
+
         if self.committed && !self.submitted {
             let pipe_type = inner.pipe_type;
             let event = inner.event.as_mut().expect("Job lost its event");
@@ -733,7 +752,12 @@ impl WorkQueue::ver {
 
         let ev = &inner.event.as_ref().unwrap();
 
-        mod_pr_debug!("WorkQueue({:?}): New job\n", inner.pipe_type);
+        mod_pr_debug!(
+            "WorkQueue({:?}): New job at value {:#x?} slot {}\n",
+            inner.pipe_type,
+            ev.1,
+            ev.0.slot()
+        );
         Ok(Job::ver {
             wq: self.clone(),
             event_info: QueueEventInfo::ver {
@@ -877,9 +901,12 @@ impl WorkQueue for WorkQueue::ver {
         }
 
         mod_pr_debug!(
-            "WorkQueue({:?}): Completed {} commands\n",
+            "WorkQueue({:?}): Completed {} commands, left pending {}, ls {:#x?}, lc {:#x?}\n",
             inner.pipe_type,
-            completed_commands
+            completed_commands,
+            inner.pending.len(),
+            inner.last_submitted,
+            inner.last_completed,
         );
 
         if let Some(i) = completed.last() {