From: Alex Deucher Date: Tue, 20 Mar 2012 21:18:24 +0000 (-0400) Subject: drm/radeon/kms: add support for compute rings in CS ioctl on SI X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8d5ef7b1f67a2f8e6594b38a68c1566ed0740ec1;p=linux-beck.git 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 Signed-off-by: Dave Airlie --- 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;