projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
[linux-2.6-block.git]
/
drivers
/
gpu
/
drm
/
vmwgfx
/
vmwgfx_surface.c
diff --git
a/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c
b/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c
index 03f63c749c02333f412c82184f20def8ce1d8d74..7d620e82e0008fed9f11147f1943239c010ef4de 100644
(file)
--- a/
drivers/gpu/drm/vmwgfx/vmwgfx_surface.c
+++ b/
drivers/gpu/drm/vmwgfx/vmwgfx_surface.c
@@
-1291,6
+1291,8
@@
int vmw_gb_surface_define_ioctl(struct drm_device *dev, void *data,
uint32_t size;
uint32_t backup_handle;
+ if (req->multisample_count != 0)
+ return -EINVAL;
if (unlikely(vmw_user_surface_size == 0))
vmw_user_surface_size = ttm_round_pot(sizeof(*user_srf)) +