drm/radeon: use the reset mask to determine if rings are hung

fetch the reset mask and check if the relevant ring flags
are set to determine whether the ring is hung or not.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

1 files changed, 20 insertions, 20 deletions

diff --git a/drivers/gpu/drm/radeon/radeon_asic.c b/drivers/gpu/drm/radeon/radeon_asic.c
index 0b202c07fe50..82b5ef043b0e 100644
--- a/drivers/gpu/drm/radeon/radeon_asic.c
+++ b/drivers/gpu/drm/radeon/radeon_asic.c
@@ -946,7 +946,7 @@ static struct radeon_asic r600_asic = {
                         .cs_parse = &r600_cs_parse,
                         .ring_test = &r600_ring_test,
                         .ib_test = &r600_ib_test,
-                        .is_lockup = &r600_gpu_is_lockup,
+                        .is_lockup = &r600_gfx_is_lockup,
                 },
                 [R600_RING_TYPE_DMA_INDEX] = {
                         .ib_execute = &r600_dma_ring_ib_execute,
@@ -1030,7 +1030,7 @@ static struct radeon_asic rs780_asic = {
                         .cs_parse = &r600_cs_parse,
                         .ring_test = &r600_ring_test,
                         .ib_test = &r600_ib_test,
-                        .is_lockup = &r600_gpu_is_lockup,
+                        .is_lockup = &r600_gfx_is_lockup,
                 },
                 [R600_RING_TYPE_DMA_INDEX] = {
                         .ib_execute = &r600_dma_ring_ib_execute,
@@ -1114,7 +1114,7 @@ static struct radeon_asic rv770_asic = {
                         .cs_parse = &r600_cs_parse,
                         .ring_test = &r600_ring_test,
                         .ib_test = &r600_ib_test,
-                        .is_lockup = &r600_gpu_is_lockup,
+                        .is_lockup = &r600_gfx_is_lockup,
                 },
                 [R600_RING_TYPE_DMA_INDEX] = {
                         .ib_execute = &r600_dma_ring_ib_execute,
@@ -1198,7 +1198,7 @@ static struct radeon_asic evergreen_asic = {
                         .cs_parse = &evergreen_cs_parse,
                         .ring_test = &r600_ring_test,
                         .ib_test = &r600_ib_test,
-                        .is_lockup = &evergreen_gpu_is_lockup,
+                        .is_lockup = &evergreen_gfx_is_lockup,
                 },
                 [R600_RING_TYPE_DMA_INDEX] = {
                         .ib_execute = &evergreen_dma_ring_ib_execute,
@@ -1207,7 +1207,7 @@ static struct radeon_asic evergreen_asic = {
                         .cs_parse = &evergreen_dma_cs_parse,
                         .ring_test = &r600_dma_ring_test,
                         .ib_test = &r600_dma_ib_test,
-                        .is_lockup = &r600_dma_is_lockup,
+                        .is_lockup = &evergreen_dma_is_lockup,
                 }
         },
         .irq = {
@@ -1282,7 +1282,7 @@ static struct radeon_asic sumo_asic = {
                         .cs_parse = &evergreen_cs_parse,
                         .ring_test = &r600_ring_test,
                         .ib_test = &r600_ib_test,
-                        .is_lockup = &evergreen_gpu_is_lockup,
+                        .is_lockup = &evergreen_gfx_is_lockup,
                 },
                 [R600_RING_TYPE_DMA_INDEX] = {
                         .ib_execute = &evergreen_dma_ring_ib_execute,
@@ -1291,7 +1291,7 @@ static struct radeon_asic sumo_asic = {
                         .cs_parse = &evergreen_dma_cs_parse,
                         .ring_test = &r600_dma_ring_test,
                         .ib_test = &r600_dma_ib_test,
-                        .is_lockup = &r600_dma_is_lockup,
+                        .is_lockup = &evergreen_dma_is_lockup,
                 }
         },
         .irq = {
@@ -1366,7 +1366,7 @@ static struct radeon_asic btc_asic = {
                         .cs_parse = &evergreen_cs_parse,
                         .ring_test = &r600_ring_test,
                         .ib_test = &r600_ib_test,
-                        .is_lockup = &evergreen_gpu_is_lockup,
+                        .is_lockup = &evergreen_gfx_is_lockup,
                 },
                 [R600_RING_TYPE_DMA_INDEX] = {
                         .ib_execute = &evergreen_dma_ring_ib_execute,
@@ -1375,7 +1375,7 @@ static struct radeon_asic btc_asic = {
                         .cs_parse = &evergreen_dma_cs_parse,
                         .ring_test = &r600_dma_ring_test,
                         .ib_test = &r600_dma_ib_test,
-                        .is_lockup = &r600_dma_is_lockup,
+                        .is_lockup = &evergreen_dma_is_lockup,
                 }
         },
         .irq = {
@@ -1457,7 +1457,7 @@ static struct radeon_asic cayman_asic = {
                         .cs_parse = &evergreen_cs_parse,
                         .ring_test = &r600_ring_test,
                         .ib_test = &r600_ib_test,
-                        .is_lockup = &evergreen_gpu_is_lockup,
+                        .is_lockup = &cayman_gfx_is_lockup,
                         .vm_flush = &cayman_vm_flush,
                 },
                 [CAYMAN_RING_TYPE_CP1_INDEX] = {
@@ -1468,7 +1468,7 @@ static struct radeon_asic cayman_asic = {
                         .cs_parse = &evergreen_cs_parse,
                         .ring_test = &r600_ring_test,
                         .ib_test = &r600_ib_test,
-                        .is_lockup = &evergreen_gpu_is_lockup,
+                        .is_lockup = &cayman_gfx_is_lockup,
                         .vm_flush = &cayman_vm_flush,
                 },
                 [CAYMAN_RING_TYPE_CP2_INDEX] = {
@@ -1479,7 +1479,7 @@ static struct radeon_asic cayman_asic = {
                         .cs_parse = &evergreen_cs_parse,
                         .ring_test = &r600_ring_test,
                         .ib_test = &r600_ib_test,
-                        .is_lockup = &evergreen_gpu_is_lockup,
+                        .is_lockup = &cayman_gfx_is_lockup,
                         .vm_flush = &cayman_vm_flush,
                 },
                 [R600_RING_TYPE_DMA_INDEX] = {
@@ -1584,7 +1584,7 @@ static struct radeon_asic trinity_asic = {
                         .cs_parse = &evergreen_cs_parse,
                         .ring_test = &r600_ring_test,
                         .ib_test = &r600_ib_test,
-                        .is_lockup = &evergreen_gpu_is_lockup,
+                        .is_lockup = &cayman_gfx_is_lockup,
                         .vm_flush = &cayman_vm_flush,
                 },
                 [CAYMAN_RING_TYPE_CP1_INDEX] = {
@@ -1595,7 +1595,7 @@ static struct radeon_asic trinity_asic = {
                         .cs_parse = &evergreen_cs_parse,
                         .ring_test = &r600_ring_test,
                         .ib_test = &r600_ib_test,
-                        .is_lockup = &evergreen_gpu_is_lockup,
+                        .is_lockup = &cayman_gfx_is_lockup,
                         .vm_flush = &cayman_vm_flush,
                 },
                 [CAYMAN_RING_TYPE_CP2_INDEX] = {
@@ -1606,7 +1606,7 @@ static struct radeon_asic trinity_asic = {
                         .cs_parse = &evergreen_cs_parse,
                         .ring_test = &r600_ring_test,
                         .ib_test = &r600_ib_test,
-                        .is_lockup = &evergreen_gpu_is_lockup,
+                        .is_lockup = &cayman_gfx_is_lockup,
                         .vm_flush = &cayman_vm_flush,
                 },
                 [R600_RING_TYPE_DMA_INDEX] = {
@@ -1711,7 +1711,7 @@ static struct radeon_asic si_asic = {
                         .cs_parse = NULL,
                         .ring_test = &r600_ring_test,
                         .ib_test = &r600_ib_test,
-                        .is_lockup = &si_gpu_is_lockup,
+                        .is_lockup = &si_gfx_is_lockup,
                         .vm_flush = &si_vm_flush,
                 },
                 [CAYMAN_RING_TYPE_CP1_INDEX] = {
@@ -1722,7 +1722,7 @@ static struct radeon_asic si_asic = {
                         .cs_parse = NULL,
                         .ring_test = &r600_ring_test,
                         .ib_test = &r600_ib_test,
-                        .is_lockup = &si_gpu_is_lockup,
+                        .is_lockup = &si_gfx_is_lockup,
                         .vm_flush = &si_vm_flush,
                 },
                 [CAYMAN_RING_TYPE_CP2_INDEX] = {
@@ -1733,7 +1733,7 @@ static struct radeon_asic si_asic = {
                         .cs_parse = NULL,
                         .ring_test = &r600_ring_test,
                         .ib_test = &r600_ib_test,
-                        .is_lockup = &si_gpu_is_lockup,
+                        .is_lockup = &si_gfx_is_lockup,
                         .vm_flush = &si_vm_flush,
                 },
                 [R600_RING_TYPE_DMA_INDEX] = {
@@ -1744,7 +1744,7 @@ static struct radeon_asic si_asic = {
                         .cs_parse = NULL,
                         .ring_test = &r600_dma_ring_test,
                         .ib_test = &r600_dma_ib_test,
-                        .is_lockup = &cayman_dma_is_lockup,
+                        .is_lockup = &si_dma_is_lockup,
                         .vm_flush = &si_dma_vm_flush,
                 },
                 [CAYMAN_RING_TYPE_DMA1_INDEX] = {
@@ -1755,7 +1755,7 @@ static struct radeon_asic si_asic = {
                         .cs_parse = NULL,
                         .ring_test = &r600_dma_ring_test,
                         .ib_test = &r600_dma_ib_test,
-                        .is_lockup = &cayman_dma_is_lockup,
+                        .is_lockup = &si_dma_is_lockup,
                         .vm_flush = &si_dma_vm_flush,
                 }
         },