diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2012-03-20 17:18:24 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-03-21 06:55:55 +0000 |
| commit | 8d5ef7b1f67a2f8e6594b38a68c1566ed0740ec1 (patch) | |
| tree | 6534bd76c06ccb6027c0f6308cbd42b61de484e1 /drivers/gpu/drm/radeon/radeon_cs.c | |
| parent | 9b136d514e3537a41e506f5306cd92d6d142f8bb (diff) | |
| download | blackbird-op-linux-8d5ef7b1f67a2f8e6594b38a68c1566ed0740ec1.tar.gz blackbird-op-linux-8d5ef7b1f67a2f8e6594b38a68c1566ed0740ec1.zip | |
drm/radeon/kms: add support for compute rings in CS ioctl on SI
Very basic implementation for picking the ring priority.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_cs.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_cs.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c index 5e459a3a872d..5cac83278338 100644 --- a/drivers/gpu/drm/radeon/radeon_cs.c +++ b/drivers/gpu/drm/radeon/radeon_cs.c @@ -103,8 +103,13 @@ static int radeon_cs_get_ring(struct radeon_cs_parser *p, u32 ring, s32 priority p->ring = RADEON_RING_TYPE_GFX_INDEX; break; case RADEON_CS_RING_COMPUTE: - /* for now */ - p->ring = RADEON_RING_TYPE_GFX_INDEX; + if (p->rdev->family >= CHIP_TAHITI) { + if (p->priority > 0) + p->ring = CAYMAN_RING_TYPE_CP1_INDEX; + else + p->ring = CAYMAN_RING_TYPE_CP2_INDEX; + } else + p->ring = RADEON_RING_TYPE_GFX_INDEX; break; } return 0; |
