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 02:55:53 -0400 |
commit | 1b5475dba7b19cace11c3f466ff7b7a58c23aab0 (patch) | |
tree | 3e1e566c40b82e453118f07906d88cfea41b3852 | |
parent | 498dd8b35ae798c3a6c6c9da029db1806dc2cf93 (diff) |
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>
-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 087bd5053774..5e459a3a872d 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) | |||
253 | return -EINVAL; | 253 | return -EINVAL; |
254 | } | 254 | } |
255 | 255 | ||
256 | /* we only support VM on SI+ */ | ||
257 | if ((p->rdev->family >= CHIP_TAHITI) && | ||
258 | ((p->cs_flags & RADEON_CS_USE_VM) == 0)) { | ||
259 | DRM_ERROR("VM required on SI+!\n"); | ||
260 | return -EINVAL; | ||
261 | } | ||
262 | |||
256 | if (radeon_cs_get_ring(p, ring, priority)) | 263 | if (radeon_cs_get_ring(p, ring, priority)) |
257 | return -EINVAL; | 264 | return -EINVAL; |
258 | 265 | ||