drm/radeon: split PT setup in more functions

Move the decision what to use into the common VM code.

Signed-off-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

1 files changed, 20 insertions, 5 deletions

diff --git a/drivers/gpu/drm/radeon/radeon_asic.c b/drivers/gpu/drm/radeon/radeon_asic.c
index c49a01f92b4d..eeeeabe09758 100644
--- a/drivers/gpu/drm/radeon/radeon_asic.c
+++ b/drivers/gpu/drm/radeon/radeon_asic.c
@@ -1613,7 +1613,10 @@ static struct radeon_asic cayman_asic = {
         .vm = {
                 .init = &cayman_vm_init,
                 .fini = &cayman_vm_fini,
-                .set_page = &cayman_dma_vm_set_page,
+                .copy_pages = &cayman_dma_vm_copy_pages,
+                .write_pages = &cayman_dma_vm_write_pages,
+                .set_pages = &cayman_dma_vm_set_pages,
+                .pad_ib = &cayman_dma_vm_pad_ib,
         },
         .ring = {
                 [RADEON_RING_TYPE_GFX_INDEX] = &cayman_gfx_ring,
@@ -1713,7 +1716,10 @@ static struct radeon_asic trinity_asic = {
         .vm = {
                 .init = &cayman_vm_init,
                 .fini = &cayman_vm_fini,
-                .set_page = &cayman_dma_vm_set_page,
+                .copy_pages = &cayman_dma_vm_copy_pages,
+                .write_pages = &cayman_dma_vm_write_pages,
+                .set_pages = &cayman_dma_vm_set_pages,
+                .pad_ib = &cayman_dma_vm_pad_ib,
         },
         .ring = {
                 [RADEON_RING_TYPE_GFX_INDEX] = &cayman_gfx_ring,
@@ -1843,7 +1849,10 @@ static struct radeon_asic si_asic = {
         .vm = {
                 .init = &si_vm_init,
                 .fini = &si_vm_fini,
-                .set_page = &si_dma_vm_set_page,
+                .copy_pages = &si_dma_vm_copy_pages,
+                .write_pages = &si_dma_vm_write_pages,
+                .set_pages = &si_dma_vm_set_pages,
+                .pad_ib = &cayman_dma_vm_pad_ib,
         },
         .ring = {
                 [RADEON_RING_TYPE_GFX_INDEX] = &si_gfx_ring,
@@ -2001,7 +2010,10 @@ static struct radeon_asic ci_asic = {
         .vm = {
                 .init = &cik_vm_init,
                 .fini = &cik_vm_fini,
-                .set_page = &cik_sdma_vm_set_page,
+                .copy_pages = &cik_sdma_vm_copy_pages,
+                .write_pages = &cik_sdma_vm_write_pages,
+                .set_pages = &cik_sdma_vm_set_pages,
+                .pad_ib = &cik_sdma_vm_pad_ib,
         },
         .ring = {
                 [RADEON_RING_TYPE_GFX_INDEX] = &ci_gfx_ring,
@@ -2105,7 +2117,10 @@ static struct radeon_asic kv_asic = {
         .vm = {
                 .init = &cik_vm_init,
                 .fini = &cik_vm_fini,
-                .set_page = &cik_sdma_vm_set_page,
+                .copy_pages = &cik_sdma_vm_copy_pages,
+                .write_pages = &cik_sdma_vm_write_pages,
+                .set_pages = &cik_sdma_vm_set_pages,
+                .pad_ib = &cik_sdma_vm_pad_ib,
         },
         .ring = {
                 [RADEON_RING_TYPE_GFX_INDEX] = &ci_gfx_ring,