diff options
| author | Christian König <christian.koenig@amd.com> | 2014-02-18 15:24:06 +0100 |
|---|---|---|
| committer | Christian König <christian.koenig@amd.com> | 2014-02-28 10:53:16 +0100 |
| commit | aee4aa73a1af3176cc3eea5833cae596b4b7dd22 (patch) | |
| tree | 47b15679aef32ca0399b18c9ca07eec7ae34461e /drivers/gpu/drm/radeon/radeon.h | |
| parent | 4d538b79197901fecc42e746d515d07fd1089b62 (diff) | |
| download | blackbird-op-linux-aee4aa73a1af3176cc3eea5833cae596b4b7dd22.tar.gz blackbird-op-linux-aee4aa73a1af3176cc3eea5833cae596b4b7dd22.zip | |
drm/radeon: improve ring lockup detection code v2
Use atomics and jiffies_64, so that we don't need to have the
ring mutex locked any more and avoid wrap arounds.
v2: fix some checkpatch warnings
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon.h')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h index 4581df193932..e98fe5c7f77b 100644 --- a/drivers/gpu/drm/radeon/radeon.h +++ b/drivers/gpu/drm/radeon/radeon.h @@ -805,8 +805,8 @@ struct radeon_ring { unsigned ring_size; unsigned ring_free_dw; int count_dw; - unsigned long last_activity; - unsigned last_rptr; + atomic_t last_rptr; + atomic64_t last_activity; uint64_t gpu_addr; uint32_t align_mask; uint32_t ptr_mask; |
