1 files changed, 63 insertions, 0 deletions

diff --git a/drivers/gpu/drm/radeon/radeon_asic.c b/drivers/gpu/drm/radeon/radeon_asic.c
index aba0a893ea98..a7a7b2bc4204 100644
--- a/drivers/gpu/drm/radeon/radeon_asic.c
+++ b/drivers/gpu/drm/radeon/radeon_asic.c
@@ -1130,6 +1130,15 @@ static struct radeon_asic rv770_asic = {
                         .ring_test = &r600_dma_ring_test,
                         .ib_test = &r600_dma_ib_test,
                         .is_lockup = &r600_dma_is_lockup,
+                },
+                [R600_RING_TYPE_UVD_INDEX] = {
+                        .ib_execute = &r600_uvd_ib_execute,
+                        .emit_fence = &r600_uvd_fence_emit,
+                        .emit_semaphore = &r600_uvd_semaphore_emit,
+                        .cs_parse = &radeon_uvd_cs_parse,
+                        .ring_test = &r600_uvd_ring_test,
+                        .ib_test = &r600_uvd_ib_test,
+                        .is_lockup = &radeon_ring_test_lockup,
                 }
         },
         .irq = {
@@ -1216,6 +1225,15 @@ static struct radeon_asic evergreen_asic = {
                         .ring_test = &r600_dma_ring_test,
                         .ib_test = &r600_dma_ib_test,
                         .is_lockup = &evergreen_dma_is_lockup,
+                },
+                [R600_RING_TYPE_UVD_INDEX] = {
+                        .ib_execute = &r600_uvd_ib_execute,
+                        .emit_fence = &r600_uvd_fence_emit,
+                        .emit_semaphore = &r600_uvd_semaphore_emit,
+                        .cs_parse = &radeon_uvd_cs_parse,
+                        .ring_test = &r600_uvd_ring_test,
+                        .ib_test = &r600_uvd_ib_test,
+                        .is_lockup = &radeon_ring_test_lockup,
                 }
         },
         .irq = {
@@ -1302,6 +1320,15 @@ static struct radeon_asic sumo_asic = {
                         .ring_test = &r600_dma_ring_test,
                         .ib_test = &r600_dma_ib_test,
                         .is_lockup = &evergreen_dma_is_lockup,
+                },
+                [R600_RING_TYPE_UVD_INDEX] = {
+                        .ib_execute = &r600_uvd_ib_execute,
+                        .emit_fence = &r600_uvd_fence_emit,
+                        .emit_semaphore = &r600_uvd_semaphore_emit,
+                        .cs_parse = &radeon_uvd_cs_parse,
+                        .ring_test = &r600_uvd_ring_test,
+                        .ib_test = &r600_uvd_ib_test,
+                        .is_lockup = &radeon_ring_test_lockup,
                 }
         },
         .irq = {
@@ -1388,6 +1415,15 @@ static struct radeon_asic btc_asic = {
                         .ring_test = &r600_dma_ring_test,
                         .ib_test = &r600_dma_ib_test,
                         .is_lockup = &evergreen_dma_is_lockup,
+                },
+                [R600_RING_TYPE_UVD_INDEX] = {
+                        .ib_execute = &r600_uvd_ib_execute,
+                        .emit_fence = &r600_uvd_fence_emit,
+                        .emit_semaphore = &r600_uvd_semaphore_emit,
+                        .cs_parse = &radeon_uvd_cs_parse,
+                        .ring_test = &r600_uvd_ring_test,
+                        .ib_test = &r600_uvd_ib_test,
+                        .is_lockup = &radeon_ring_test_lockup,
                 }
         },
         .irq = {
@@ -1517,6 +1553,15 @@ static struct radeon_asic cayman_asic = {
                         .ib_test = &r600_dma_ib_test,
                         .is_lockup = &cayman_dma_is_lockup,
                         .vm_flush = &cayman_dma_vm_flush,
+                },
+                [R600_RING_TYPE_UVD_INDEX] = {
+                        .ib_execute = &r600_uvd_ib_execute,
+                        .emit_fence = &r600_uvd_fence_emit,
+                        .emit_semaphore = &cayman_uvd_semaphore_emit,
+                        .cs_parse = &radeon_uvd_cs_parse,
+                        .ring_test = &r600_uvd_ring_test,
+                        .ib_test = &r600_uvd_ib_test,
+                        .is_lockup = &radeon_ring_test_lockup,
                 }
         },
         .irq = {
@@ -1646,6 +1691,15 @@ static struct radeon_asic trinity_asic = {
                         .ib_test = &r600_dma_ib_test,
                         .is_lockup = &cayman_dma_is_lockup,
                         .vm_flush = &cayman_dma_vm_flush,
+                },
+                [R600_RING_TYPE_UVD_INDEX] = {
+                        .ib_execute = &r600_uvd_ib_execute,
+                        .emit_fence = &r600_uvd_fence_emit,
+                        .emit_semaphore = &cayman_uvd_semaphore_emit,
+                        .cs_parse = &radeon_uvd_cs_parse,
+                        .ring_test = &r600_uvd_ring_test,
+                        .ib_test = &r600_uvd_ib_test,
+                        .is_lockup = &radeon_ring_test_lockup,
                 }
         },
         .irq = {
@@ -1775,6 +1829,15 @@ static struct radeon_asic si_asic = {
                         .ib_test = &r600_dma_ib_test,
                         .is_lockup = &si_dma_is_lockup,
                         .vm_flush = &si_dma_vm_flush,
+                },
+                [R600_RING_TYPE_UVD_INDEX] = {
+                        .ib_execute = &r600_uvd_ib_execute,
+                        .emit_fence = &r600_uvd_fence_emit,
+                        .emit_semaphore = &cayman_uvd_semaphore_emit,
+                        .cs_parse = &radeon_uvd_cs_parse,
+                        .ring_test = &r600_uvd_ring_test,
+                        .ib_test = &r600_uvd_ib_test,
+                        .is_lockup = &radeon_ring_test_lockup,
                 }
         },
         .irq = {