summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/radeon_asic.c
diff options
context:
space:
mode:
authorAlex Deucher2011-11-17 20:57:50 +0100
committerDave Airlie2011-12-20 20:51:54 +0100
commitb40e7e1608c332767e6b94bed7af84b30418e739 (patch)
treedeedf98f2830500cd5fb524c07ed21fc1fc6c57c /drivers/gpu/drm/radeon/radeon_asic.c
parentdrm/radeon/kms: add some new ring params to better handle other ring types (diff)
downloadkernel-qcow2-linux-b40e7e1608c332767e6b94bed7af84b30418e739.tar.gz
kernel-qcow2-linux-b40e7e1608c332767e6b94bed7af84b30418e739.tar.xz
kernel-qcow2-linux-b40e7e1608c332767e6b94bed7af84b30418e739.zip
drm/radeon/kms: add cayman specific fence_ring_emit
cayman is wb only and doesn't have a VC. Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Christian König <deathsimple@vodafone.de> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_asic.c')
-rw-r--r--drivers/gpu/drm/radeon/radeon_asic.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_asic.c b/drivers/gpu/drm/radeon/radeon_asic.c
index 558933c759cb..8493d406f5e3 100644
--- a/drivers/gpu/drm/radeon/radeon_asic.c
+++ b/drivers/gpu/drm/radeon/radeon_asic.c
@@ -966,17 +966,17 @@ static struct radeon_asic cayman_asic = {
.ring = {
[RADEON_RING_TYPE_GFX_INDEX] = {
.ib_execute = &evergreen_ring_ib_execute,
- .emit_fence = &r600_fence_ring_emit,
+ .emit_fence = &cayman_fence_ring_emit,
.emit_semaphore = &r600_semaphore_ring_emit,
},
[CAYMAN_RING_TYPE_CP1_INDEX] = {
.ib_execute = &r600_ring_ib_execute,
- .emit_fence = &r600_fence_ring_emit,
+ .emit_fence = &cayman_fence_ring_emit,
.emit_semaphore = &r600_semaphore_ring_emit,
},
[CAYMAN_RING_TYPE_CP2_INDEX] = {
.ib_execute = &r600_ring_ib_execute,
- .emit_fence = &r600_fence_ring_emit,
+ .emit_fence = &cayman_fence_ring_emit,
.emit_semaphore = &r600_semaphore_ring_emit,
}
},