drm/radeon: rework gpu lockup detection and processing

Previusly multiple rings could trigger multiple GPU
resets at the same time.

Signed-off-by: Christian König <deathsimple@vodafone.de>
Reviewed-by: Jerome Glisse <jglisse@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

1 files changed, 1 insertions, 2 deletions

diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
index 65855af290a6..35db5bdceda9 100644
--- a/drivers/gpu/drm/radeon/radeon.h
+++ b/drivers/gpu/drm/radeon/radeon.h
@@ -255,8 +255,7 @@ struct radeon_fence_driver {
         volatile uint32_t               *cpu_addr;
         atomic_t                        seq;
         uint32_t                        last_seq;
-        unsigned long                   last_jiffies;
-        unsigned long                   last_timeout;
+        unsigned long                   last_activity;
         wait_queue_head_t               queue;
         struct list_head                created;
         struct list_head                emitted;