Skip to content

Commit 9cb363a

Browse files
hoshinolinajannau
authored andcommitted
drm/asahi: gpu: Show unknown field in timeouts
Signed-off-by: Asahi Lina <lina@asahilina.net>
1 parent c9c569e commit 9cb363a

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

drivers/gpu/drm/asahi/channel.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -356,10 +356,10 @@ impl EventChannel::ver {
356356
},
357357
EventMsg::Timeout {
358358
counter,
359+
unk_8,
359360
event_slot,
360-
..
361361
} => match self.gpu.as_ref() {
362-
Some(gpu) => gpu.handle_timeout(counter, event_slot),
362+
Some(gpu) => gpu.handle_timeout(counter, event_slot, unk_8),
363363
None => {
364364
dev_crit!(
365365
self.dev.as_ref(),
@@ -380,7 +380,6 @@ impl EventChannel::ver {
380380
vm_slot,
381381
buffer_slot,
382382
counter,
383-
..
384383
} => match self.gpu.as_ref() {
385384
Some(gpu) => {
386385
self.buf_mgr.grow(buffer_slot);

drivers/gpu/drm/asahi/gpu.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ pub(crate) trait GpuManager: Send + Sync {
252252
/// TODO: Does this actually work?
253253
fn flush_fw_cache(&self) -> Result;
254254
/// Handle a GPU work timeout event.
255-
fn handle_timeout(&self, counter: u32, event_slot: i32);
255+
fn handle_timeout(&self, counter: u32, event_slot: i32, unk: u32);
256256
/// Handle a GPU fault event.
257257
fn handle_fault(&self);
258258
/// Acknowledge a Buffer grow op.
@@ -1307,7 +1307,7 @@ impl GpuManager for GpuManager::ver {
13071307
&self.ids
13081308
}
13091309

1310-
fn handle_timeout(&self, counter: u32, event_slot: i32) {
1310+
fn handle_timeout(&self, counter: u32, event_slot: i32, unk: u32) {
13111311
dev_err!(self.dev, " (\\________/) \n");
13121312
dev_err!(self.dev, " | | \n");
13131313
dev_err!(self.dev, "'.| \\ , / |.'\n");
@@ -1317,6 +1317,7 @@ impl GpuManager for GpuManager::ver {
13171317
dev_err!(self.dev, "** GPU timeout nya~!!!!! **\n");
13181318
dev_err!(self.dev, " Event slot: {}\n", event_slot);
13191319
dev_err!(self.dev, " Timeout count: {}\n", counter);
1320+
dev_err!(self.dev, " Unk: {}\n", unk);
13201321

13211322
// If we have fault info, consider it a fault.
13221323
let error = match self.get_fault_info() {

0 commit comments

Comments
 (0)