drm/radeon: rework VMID handling

[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 4a6e39f7ffd130bcbcdb042798809dabfe1a7643..98c586ac1999b933439cdf95a0fe92165a177841 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_asic.c
+++ b/drivers/gpu/drm/radeon/radeon_asic.c
@@ -1375,7 +1375,6 @@ static struct radeon_asic cayman_asic = {
        .vm = {
                .init = &cayman_vm_init,
                .fini = &cayman_vm_fini,
-               .bind = &cayman_vm_bind,
                .page_flags = &cayman_vm_page_flags,
                .set_page = &cayman_vm_set_page,
        },
@@ -1480,7 +1479,6 @@ static struct radeon_asic trinity_asic = {
        .vm = {
                .init = &cayman_vm_init,
                .fini = &cayman_vm_fini,
-               .bind = &cayman_vm_bind,
                .page_flags = &cayman_vm_page_flags,
                .set_page = &cayman_vm_set_page,
        },
@@ -1585,7 +1583,6 @@ static struct radeon_asic si_asic = {
        .vm = {
                .init = &si_vm_init,
                .fini = &si_vm_fini,
-               .bind = &si_vm_bind,
                .page_flags = &cayman_vm_page_flags,
                .set_page = &cayman_vm_set_page,
        },
@@ -1599,7 +1596,7 @@ static struct radeon_asic si_asic = {
                        .ring_test = &r600_ring_test,
                        .ib_test = &r600_ib_test,
                        .is_lockup = &si_gpu_is_lockup,
-                       .vm_flush = &cayman_vm_flush,
+                       .vm_flush = &si_vm_flush,
                },
                [CAYMAN_RING_TYPE_CP1_INDEX] = {
                        .ib_execute = &si_ring_ib_execute,
@@ -1610,7 +1607,7 @@ static struct radeon_asic si_asic = {
                        .ring_test = &r600_ring_test,
                        .ib_test = &r600_ib_test,
                        .is_lockup = &si_gpu_is_lockup,
-                       .vm_flush = &cayman_vm_flush,
+                       .vm_flush = &si_vm_flush,
                },
                [CAYMAN_RING_TYPE_CP2_INDEX] = {
                        .ib_execute = &si_ring_ib_execute,
@@ -1621,7 +1618,7 @@ static struct radeon_asic si_asic = {
                        .ring_test = &r600_ring_test,
                        .ib_test = &r600_ib_test,
                        .is_lockup = &si_gpu_is_lockup,
-                       .vm_flush = &cayman_vm_flush,
+                       .vm_flush = &si_vm_flush,
                }
        },
        .irq = {