]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
drm/radeon/kms: set dma_copy to NULL for r6xx+
authorAlex Deucher <alexdeucher@gmail.com>
Mon, 13 Jun 2011 21:33:39 +0000 (21:33 +0000)
committerDave Airlie <airlied@redhat.com>
Tue, 21 Jun 2011 02:32:41 +0000 (12:32 +1000)
No need to assign the same copy callback for both
copy blit and dma.

Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
drivers/gpu/drm/radeon/radeon_asic.c

index b2449629537d3b5922e86e325ac85bb214cacea2..df8218bb83a651a96d37c084044e5aec880a1338 100644 (file)
@@ -625,7 +625,7 @@ static struct radeon_asic r600_asic = {
        .fence_ring_emit = &r600_fence_ring_emit,
        .cs_parse = &r600_cs_parse,
        .copy_blit = &r600_copy_blit,
-       .copy_dma = &r600_copy_blit,
+       .copy_dma = NULL,
        .copy = &r600_copy_blit,
        .get_engine_clock = &radeon_atom_get_engine_clock,
        .set_engine_clock = &radeon_atom_set_engine_clock,
@@ -672,7 +672,7 @@ static struct radeon_asic rs780_asic = {
        .fence_ring_emit = &r600_fence_ring_emit,
        .cs_parse = &r600_cs_parse,
        .copy_blit = &r600_copy_blit,
-       .copy_dma = &r600_copy_blit,
+       .copy_dma = NULL,
        .copy = &r600_copy_blit,
        .get_engine_clock = &radeon_atom_get_engine_clock,
        .set_engine_clock = &radeon_atom_set_engine_clock,
@@ -719,7 +719,7 @@ static struct radeon_asic rv770_asic = {
        .fence_ring_emit = &r600_fence_ring_emit,
        .cs_parse = &r600_cs_parse,
        .copy_blit = &r600_copy_blit,
-       .copy_dma = &r600_copy_blit,
+       .copy_dma = NULL,
        .copy = &r600_copy_blit,
        .get_engine_clock = &radeon_atom_get_engine_clock,
        .set_engine_clock = &radeon_atom_set_engine_clock,
@@ -766,7 +766,7 @@ static struct radeon_asic evergreen_asic = {
        .fence_ring_emit = &r600_fence_ring_emit,
        .cs_parse = &evergreen_cs_parse,
        .copy_blit = &evergreen_copy_blit,
-       .copy_dma = &evergreen_copy_blit,
+       .copy_dma = NULL,
        .copy = &evergreen_copy_blit,
        .get_engine_clock = &radeon_atom_get_engine_clock,
        .set_engine_clock = &radeon_atom_set_engine_clock,
@@ -813,7 +813,7 @@ static struct radeon_asic sumo_asic = {
        .fence_ring_emit = &r600_fence_ring_emit,
        .cs_parse = &evergreen_cs_parse,
        .copy_blit = &evergreen_copy_blit,
-       .copy_dma = &evergreen_copy_blit,
+       .copy_dma = NULL,
        .copy = &evergreen_copy_blit,
        .get_engine_clock = &radeon_atom_get_engine_clock,
        .set_engine_clock = &radeon_atom_set_engine_clock,
@@ -860,7 +860,7 @@ static struct radeon_asic btc_asic = {
        .fence_ring_emit = &r600_fence_ring_emit,
        .cs_parse = &evergreen_cs_parse,
        .copy_blit = &evergreen_copy_blit,
-       .copy_dma = &evergreen_copy_blit,
+       .copy_dma = NULL,
        .copy = &evergreen_copy_blit,
        .get_engine_clock = &radeon_atom_get_engine_clock,
        .set_engine_clock = &radeon_atom_set_engine_clock,
@@ -907,7 +907,7 @@ static struct radeon_asic cayman_asic = {
        .fence_ring_emit = &r600_fence_ring_emit,
        .cs_parse = &evergreen_cs_parse,
        .copy_blit = &evergreen_copy_blit,
-       .copy_dma = &evergreen_copy_blit,
+       .copy_dma = NULL,
        .copy = &evergreen_copy_blit,
        .get_engine_clock = &radeon_atom_get_engine_clock,
        .set_engine_clock = &radeon_atom_set_engine_clock,