git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'vmwgfx-fixes-5.1' of git://people.freedesktop.org/~thomash/linux into...
[sfrench/cifs-2.6.git]
/
drivers
/
gpu
/
drm
/
vmwgfx
/
vmwgfx_drv.c
diff --git
a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
index 2d066383d7fda3dc206b3723717a0ca9f54ff15f..1bfa353d995cf5bb7ca4c4d1ce8a46ba686e55d6 100644
(file)
--- a/
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
+++ b/
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
@@
-1542,7
+1542,7
@@
static const struct file_operations vmwgfx_driver_fops = {
};
static struct drm_driver driver = {
- .driver_features =
DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED |
+ .driver_features =
DRIVER_MODESET | DRIVER_PRIME | DRIVER_RENDER | DRIVER_ATOMIC,
.load = vmw_driver_load,
.unload = vmw_driver_unload,