Skip to content

Commit 4ef8061

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

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
@@ -353,10 +353,10 @@ impl EventChannel::ver {
353353
},
354354
EventMsg::Timeout {
355355
counter,
356+
unk_8,
356357
event_slot,
357-
..
358358
} => match self.gpu.as_ref() {
359-
Some(gpu) => gpu.handle_timeout(counter, event_slot),
359+
Some(gpu) => gpu.handle_timeout(counter, event_slot, unk_8),
360360
None => {
361361
dev_crit!(self.dev, "EventChannel: No GPU manager available!\n")
362362
}
@@ -374,7 +374,6 @@ impl EventChannel::ver {
374374
vm_slot,
375375
buffer_slot,
376376
counter,
377-
..
378377
} => match self.gpu.as_ref() {
379378
Some(gpu) => {
380379
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
@@ -253,7 +253,7 @@ pub(crate) trait GpuManager: Send + Sync {
253253
/// TODO: Does this actually work?
254254
fn flush_fw_cache(&self) -> Result;
255255
/// Handle a GPU work timeout event.
256-
fn handle_timeout(&self, counter: u32, event_slot: i32);
256+
fn handle_timeout(&self, counter: u32, event_slot: i32, unk: u32);
257257
/// Handle a GPU fault event.
258258
fn handle_fault(&self);
259259
/// Acknowledge a Buffer grow op.
@@ -1294,7 +1294,7 @@ impl GpuManager for GpuManager::ver {
12941294
&self.ids
12951295
}
12961296

1297-
fn handle_timeout(&self, counter: u32, event_slot: i32) {
1297+
fn handle_timeout(&self, counter: u32, event_slot: i32, unk: u32) {
12981298
dev_err!(self.dev, " (\\________/) \n");
12991299
dev_err!(self.dev, " | | \n");
13001300
dev_err!(self.dev, "'.| \\ , / |.'\n");
@@ -1304,6 +1304,7 @@ impl GpuManager for GpuManager::ver {
13041304
dev_err!(self.dev, "** GPU timeout nya~!!!!! **\n");
13051305
dev_err!(self.dev, " Event slot: {}\n", event_slot);
13061306
dev_err!(self.dev, " Timeout count: {}\n", counter);
1307+
dev_err!(self.dev, " Unk: {}\n", unk);
13071308

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

0 commit comments

Comments
 (0)