Skip to content

Commit 5f0839c

Browse files
Jerome Glissealexdeucher
authored andcommitted
drm/radeon: improve semaphore debugging on lockup
Signed-off-by: Jerome Glisse <jglisse@redhat.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
1 parent c18b117 commit 5f0839c

File tree

3 files changed

+8
-0
lines changed

3 files changed

+8
-0
lines changed

drivers/gpu/drm/radeon/radeon.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -654,6 +654,8 @@ struct radeon_ring {
654654
u32 ptr_reg_mask;
655655
u32 nop;
656656
u32 idx;
657+
u64 last_semaphore_signal_addr;
658+
u64 last_semaphore_wait_addr;
657659
};
658660

659661
/*

drivers/gpu/drm/radeon/radeon_ring.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -784,6 +784,8 @@ static int radeon_debugfs_ring_info(struct seq_file *m, void *data)
784784
}
785785
seq_printf(m, "driver's copy of the wptr: 0x%08x [%5d]\n", ring->wptr, ring->wptr);
786786
seq_printf(m, "driver's copy of the rptr: 0x%08x [%5d]\n", ring->rptr, ring->rptr);
787+
seq_printf(m, "last semaphore signal addr : 0x%016llx\n", ring->last_semaphore_signal_addr);
788+
seq_printf(m, "last semaphore wait addr : 0x%016llx\n", ring->last_semaphore_wait_addr);
787789
seq_printf(m, "%u free dwords in ring\n", ring->ring_free_dw);
788790
seq_printf(m, "%u dwords in ring\n", count);
789791
/* print 8 dw before current rptr as often it's the last executed

drivers/gpu/drm/radeon/radeon_semaphore.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,10 @@ int radeon_semaphore_sync_rings(struct radeon_device *rdev,
9595
/* we assume caller has already allocated space on waiters ring */
9696
radeon_semaphore_emit_wait(rdev, waiter, semaphore);
9797

98+
/* for debugging lockup only, used by sysfs debug files */
99+
rdev->ring[signaler].last_semaphore_signal_addr = semaphore->gpu_addr;
100+
rdev->ring[waiter].last_semaphore_wait_addr = semaphore->gpu_addr;
101+
98102
return 0;
99103
}
100104

0 commit comments

Comments
 (0)