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

Commit d8a74e18 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/radeon: use rv515_ring_start on r5xx 



This was accidently lost in 76a0df85.

Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
parent 5615f890

drivers/gpu/drm/radeon/radeon_asic.c

+16 −2
Original line number Diff line number Diff line
@@ -333,6 +333,20 @@ static struct radeon_asic_ring r300_gfx_ring = { 
	.set_wptr = &r100_gfx_set_wptr,

};



static struct radeon_asic_ring rv515_gfx_ring = {

	.ib_execute = &r100_ring_ib_execute,

	.emit_fence = &r300_fence_ring_emit,

	.emit_semaphore = &r100_semaphore_ring_emit,

	.cs_parse = &r300_cs_parse,

	.ring_start = &rv515_ring_start,

	.ring_test = &r100_ring_test,

	.ib_test = &r100_ib_test,

	.is_lockup = &r100_gpu_is_lockup,

	.get_rptr = &r100_gfx_get_rptr,

	.get_wptr = &r100_gfx_get_wptr,

	.set_wptr = &r100_gfx_set_wptr,

};



static struct radeon_asic r300_asic = {

	.init = &r300_init,

	.fini = &r300_fini,
@@ -748,7 +762,7 @@ static struct radeon_asic rv515_asic = { 
		.set_page = &rv370_pcie_gart_set_page,

	},

	.ring = {

		[RADEON_RING_TYPE_GFX_INDEX] = &r300_gfx_ring

		[RADEON_RING_TYPE_GFX_INDEX] = &rv515_gfx_ring

	},

	.irq = {

		.set = &rs600_irq_set,
@@ -814,7 +828,7 @@ static struct radeon_asic r520_asic = { 
		.set_page = &rv370_pcie_gart_set_page,

	},

	.ring = {

		[RADEON_RING_TYPE_GFX_INDEX] = &r300_gfx_ring

		[RADEON_RING_TYPE_GFX_INDEX] = &rv515_gfx_ring

	},

	.irq = {

		.set = &rs600_irq_set,