Commit fdb1698e authored by Alex Deucher's avatar Alex Deucher Committed by Greg Kroah-Hartman

drm/radeon: use rv515_ring_start on r5xx

commit d8a74e18 upstream.

This was accidently lost in 76a0df85.
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4caa38ee
...@@ -335,6 +335,20 @@ static struct radeon_asic_ring r300_gfx_ring = { ...@@ -335,6 +335,20 @@ static struct radeon_asic_ring r300_gfx_ring = {
.set_wptr = &r100_gfx_set_wptr, .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 = { static struct radeon_asic r300_asic = {
.init = &r300_init, .init = &r300_init,
.fini = &r300_fini, .fini = &r300_fini,
...@@ -756,7 +770,7 @@ static struct radeon_asic rv515_asic = { ...@@ -756,7 +770,7 @@ static struct radeon_asic rv515_asic = {
.set_page = &rv370_pcie_gart_set_page, .set_page = &rv370_pcie_gart_set_page,
}, },
.ring = { .ring = {
[RADEON_RING_TYPE_GFX_INDEX] = &r300_gfx_ring [RADEON_RING_TYPE_GFX_INDEX] = &rv515_gfx_ring
}, },
.irq = { .irq = {
.set = &rs600_irq_set, .set = &rs600_irq_set,
...@@ -823,7 +837,7 @@ static struct radeon_asic r520_asic = { ...@@ -823,7 +837,7 @@ static struct radeon_asic r520_asic = {
.set_page = &rv370_pcie_gart_set_page, .set_page = &rv370_pcie_gart_set_page,
}, },
.ring = { .ring = {
[RADEON_RING_TYPE_GFX_INDEX] = &r300_gfx_ring [RADEON_RING_TYPE_GFX_INDEX] = &rv515_gfx_ring
}, },
.irq = { .irq = {
.set = &rs600_irq_set, .set = &rs600_irq_set,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment