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

[linux-2.6-block.git] / drivers / gpu / drm / radeon / radeon_asic.c

diff --git a/drivers/gpu/drm/radeon/radeon_asic.c b/drivers/gpu/drm/radeon/radeon_asic.c
index 596bcbe80ed06d5a8e50c271ded50d0a9003afaf..82b5ef043b0eeafda4f940e867b54426d5113306 100644 (file)
--- 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,
@@ -1140,9 +1140,9 @@ static struct radeon_asic rv770_asic = {
        .copy = {
                .blit = &r600_copy_blit,
                .blit_ring_index = RADEON_RING_TYPE_GFX_INDEX,
-               .dma = &r600_copy_dma,
+               .dma = &rv770_copy_dma,
                .dma_ring_index = R600_RING_TYPE_DMA_INDEX,
-               .copy = &r600_copy_dma,
+               .copy = &rv770_copy_dma,
                .copy_ring_index = R600_RING_TYPE_DMA_INDEX,
        },
        .surface = {
@@ -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 = {
@@ -1445,7 +1445,7 @@ static struct radeon_asic cayman_asic = {
        .vm = {
                .init = &cayman_vm_init,
                .fini = &cayman_vm_fini,
-               .pt_ring_index = R600_RING_TYPE_DMA_INDEX,
+               .pt_ring_index = RADEON_RING_TYPE_GFX_INDEX,
                .set_page = &cayman_vm_set_page,
        },
        .ring = {
@@ -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] = {
@@ -1572,7 +1572,7 @@ static struct radeon_asic trinity_asic = {
        .vm = {
                .init = &cayman_vm_init,
                .fini = &cayman_vm_fini,
-               .pt_ring_index = R600_RING_TYPE_DMA_INDEX,
+               .pt_ring_index = RADEON_RING_TYPE_GFX_INDEX,
                .set_page = &cayman_vm_set_page,
        },
        .ring = {
@@ -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] = {
@@ -1699,7 +1699,7 @@ static struct radeon_asic si_asic = {
        .vm = {
                .init = &si_vm_init,
                .fini = &si_vm_fini,
-               .pt_ring_index = R600_RING_TYPE_DMA_INDEX,
+               .pt_ring_index = RADEON_RING_TYPE_GFX_INDEX,
                .set_page = &si_vm_set_page,
        },
        .ring = {
@@ -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,
                }
        },