diff options
author | Alex Deucher <alexander.deucher@amd.com> | 2012-03-20 17:18:16 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2012-03-21 06:55:53 +0000 |
commit | 1b5475dba7b19cace11c3f466ff7b7a58c23aab0 (patch) | |
tree | 3e1e566c40b82e453118f07906d88cfea41b3852 /drivers/gpu | |
parent | 498dd8b35ae798c3a6c6c9da029db1806dc2cf93 (diff) | |
download | linux-3.10-1b5475dba7b19cace11c3f466ff7b7a58c23aab0.tar.gz linux-3.10-1b5475dba7b19cace11c3f466ff7b7a58c23aab0.tar.bz2 linux-3.10-1b5475dba7b19cace11c3f466ff7b7a58c23aab0.zip |
drm/radeon/kms: Only VM CS ioctl is supported on SI (v2)
v2: avoid double free.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_cs.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c index 087bd505377..5e459a3a872 100644 --- a/drivers/gpu/drm/radeon/radeon_cs.c +++ b/drivers/gpu/drm/radeon/radeon_cs.c @@ -253,6 +253,13 @@ int radeon_cs_parser_init(struct radeon_cs_parser *p, void *data) return -EINVAL; } + /* we only support VM on SI+ */ + if ((p->rdev->family >= CHIP_TAHITI) && + ((p->cs_flags & RADEON_CS_USE_VM) == 0)) { + DRM_ERROR("VM required on SI+!\n"); + return -EINVAL; + } + if (radeon_cs_get_ring(p, ring, priority)) return -EINVAL; |