Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 20633442 authored by Alex Deucher's avatar Alex Deucher Committed by Dave Airlie
Browse files

drm/radeon/kms: set dma_copy to NULL for r6xx+ 



No need to assign the same copy callback for both
copy blit and dma.

Signed-off-by: default avatarAlex Deucher <alexdeucher@gmail.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 304eda32

drivers/gpu/drm/radeon/radeon_asic.c

+7 −7
Original line number Diff line number Diff line
@@ -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,