diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2011-11-17 14:57:50 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-12-20 14:51:54 -0500 |
| commit | b40e7e1608c332767e6b94bed7af84b30418e739 (patch) | |
| tree | deedf98f2830500cd5fb524c07ed21fc1fc6c57c /drivers/gpu/drm/radeon/radeon_asic.c | |
| parent | 78c5560a08114d7bbbce04cee1628049a22ea104 (diff) | |
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.c | 6 |
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 = { | |||
| 966 | .ring = { | 966 | .ring = { |
| 967 | [RADEON_RING_TYPE_GFX_INDEX] = { | 967 | [RADEON_RING_TYPE_GFX_INDEX] = { |
| 968 | .ib_execute = &evergreen_ring_ib_execute, | 968 | .ib_execute = &evergreen_ring_ib_execute, |
| 969 | .emit_fence = &r600_fence_ring_emit, | 969 | .emit_fence = &cayman_fence_ring_emit, |
| 970 | .emit_semaphore = &r600_semaphore_ring_emit, | 970 | .emit_semaphore = &r600_semaphore_ring_emit, |
| 971 | }, | 971 | }, |
| 972 | [CAYMAN_RING_TYPE_CP1_INDEX] = { | 972 | [CAYMAN_RING_TYPE_CP1_INDEX] = { |
| 973 | .ib_execute = &r600_ring_ib_execute, | 973 | .ib_execute = &r600_ring_ib_execute, |
| 974 | .emit_fence = &r600_fence_ring_emit, | 974 | .emit_fence = &cayman_fence_ring_emit, |
| 975 | .emit_semaphore = &r600_semaphore_ring_emit, | 975 | .emit_semaphore = &r600_semaphore_ring_emit, |
| 976 | }, | 976 | }, |
| 977 | [CAYMAN_RING_TYPE_CP2_INDEX] = { | 977 | [CAYMAN_RING_TYPE_CP2_INDEX] = { |
| 978 | .ib_execute = &r600_ring_ib_execute, | 978 | .ib_execute = &r600_ring_ib_execute, |
| 979 | .emit_fence = &r600_fence_ring_emit, | 979 | .emit_fence = &cayman_fence_ring_emit, |
| 980 | .emit_semaphore = &r600_semaphore_ring_emit, | 980 | .emit_semaphore = &r600_semaphore_ring_emit, |
| 981 | } | 981 | } |
| 982 | }, | 982 | }, |