diff options
author | Thomas Hellstrom <thellstrom@vmware.com> | 2014-03-20 08:06:34 -0400 |
---|---|---|
committer | Thomas Hellstrom <thellstrom@vmware.com> | 2014-03-28 09:19:04 -0400 |
commit | 03f802636bca817623d3c2e93f95a27385b62d68 (patch) | |
tree | 23f9ba114c91fdfa0a20077df2bd9517e82a8258 /drivers/gpu/drm/vmwgfx | |
parent | f6dfe73abf3ae528b8c631d37739e6d61894c0b2 (diff) |
drm/vmwgfx: Enable render nodes
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Diffstat (limited to 'drivers/gpu/drm/vmwgfx')
-rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 43 |
1 files changed, 21 insertions, 22 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c index de8a9dc25f07..c7009581bb23 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | |||
@@ -142,11 +142,11 @@ | |||
142 | 142 | ||
143 | static const struct drm_ioctl_desc vmw_ioctls[] = { | 143 | static const struct drm_ioctl_desc vmw_ioctls[] = { |
144 | VMW_IOCTL_DEF(VMW_GET_PARAM, vmw_getparam_ioctl, | 144 | VMW_IOCTL_DEF(VMW_GET_PARAM, vmw_getparam_ioctl, |
145 | DRM_AUTH | DRM_UNLOCKED), | 145 | DRM_AUTH | DRM_UNLOCKED | DRM_RENDER_ALLOW), |
146 | VMW_IOCTL_DEF(VMW_ALLOC_DMABUF, vmw_dmabuf_alloc_ioctl, | 146 | VMW_IOCTL_DEF(VMW_ALLOC_DMABUF, vmw_dmabuf_alloc_ioctl, |
147 | DRM_AUTH | DRM_UNLOCKED), | 147 | DRM_AUTH | DRM_UNLOCKED | DRM_RENDER_ALLOW), |
148 | VMW_IOCTL_DEF(VMW_UNREF_DMABUF, vmw_dmabuf_unref_ioctl, | 148 | VMW_IOCTL_DEF(VMW_UNREF_DMABUF, vmw_dmabuf_unref_ioctl, |
149 | DRM_UNLOCKED), | 149 | DRM_UNLOCKED | DRM_RENDER_ALLOW), |
150 | VMW_IOCTL_DEF(VMW_CURSOR_BYPASS, | 150 | VMW_IOCTL_DEF(VMW_CURSOR_BYPASS, |
151 | vmw_kms_cursor_bypass_ioctl, | 151 | vmw_kms_cursor_bypass_ioctl, |
152 | DRM_MASTER | DRM_CONTROL_ALLOW | DRM_UNLOCKED), | 152 | DRM_MASTER | DRM_CONTROL_ALLOW | DRM_UNLOCKED), |
@@ -159,29 +159,28 @@ static const struct drm_ioctl_desc vmw_ioctls[] = { | |||
159 | DRM_MASTER | DRM_CONTROL_ALLOW | DRM_UNLOCKED), | 159 | DRM_MASTER | DRM_CONTROL_ALLOW | DRM_UNLOCKED), |
160 | 160 | ||
161 | VMW_IOCTL_DEF(VMW_CREATE_CONTEXT, vmw_context_define_ioctl, | 161 | VMW_IOCTL_DEF(VMW_CREATE_CONTEXT, vmw_context_define_ioctl, |
162 | DRM_AUTH | DRM_UNLOCKED), | 162 | DRM_AUTH | DRM_UNLOCKED | DRM_RENDER_ALLOW), |
163 | VMW_IOCTL_DEF(VMW_UNREF_CONTEXT, vmw_context_destroy_ioctl, | 163 | VMW_IOCTL_DEF(VMW_UNREF_CONTEXT, vmw_context_destroy_ioctl, |
164 | DRM_UNLOCKED), | 164 | DRM_UNLOCKED | DRM_RENDER_ALLOW), |
165 | VMW_IOCTL_DEF(VMW_CREATE_SURFACE, vmw_surface_define_ioctl, | 165 | VMW_IOCTL_DEF(VMW_CREATE_SURFACE, vmw_surface_define_ioctl, |
166 | DRM_AUTH | DRM_UNLOCKED), | 166 | DRM_AUTH | DRM_UNLOCKED | DRM_RENDER_ALLOW), |
167 | VMW_IOCTL_DEF(VMW_UNREF_SURFACE, vmw_surface_destroy_ioctl, | 167 | VMW_IOCTL_DEF(VMW_UNREF_SURFACE, vmw_surface_destroy_ioctl, |
168 | DRM_UNLOCKED), | 168 | DRM_UNLOCKED | DRM_RENDER_ALLOW), |
169 | VMW_IOCTL_DEF(VMW_REF_SURFACE, vmw_surface_reference_ioctl, | 169 | VMW_IOCTL_DEF(VMW_REF_SURFACE, vmw_surface_reference_ioctl, |
170 | DRM_AUTH | DRM_UNLOCKED), | 170 | DRM_AUTH | DRM_UNLOCKED | DRM_RENDER_ALLOW), |
171 | VMW_IOCTL_DEF(VMW_EXECBUF, vmw_execbuf_ioctl, | 171 | VMW_IOCTL_DEF(VMW_EXECBUF, vmw_execbuf_ioctl, |
172 | DRM_AUTH | DRM_UNLOCKED), | 172 | DRM_AUTH | DRM_UNLOCKED | DRM_RENDER_ALLOW), |
173 | VMW_IOCTL_DEF(VMW_FENCE_WAIT, vmw_fence_obj_wait_ioctl, | 173 | VMW_IOCTL_DEF(VMW_FENCE_WAIT, vmw_fence_obj_wait_ioctl, |
174 | DRM_AUTH | DRM_UNLOCKED), | 174 | DRM_AUTH | DRM_UNLOCKED | DRM_RENDER_ALLOW), |
175 | VMW_IOCTL_DEF(VMW_FENCE_SIGNALED, | 175 | VMW_IOCTL_DEF(VMW_FENCE_SIGNALED, |
176 | vmw_fence_obj_signaled_ioctl, | 176 | vmw_fence_obj_signaled_ioctl, |
177 | DRM_AUTH | DRM_UNLOCKED), | 177 | DRM_AUTH | DRM_UNLOCKED | DRM_RENDER_ALLOW), |
178 | VMW_IOCTL_DEF(VMW_FENCE_UNREF, vmw_fence_obj_unref_ioctl, | 178 | VMW_IOCTL_DEF(VMW_FENCE_UNREF, vmw_fence_obj_unref_ioctl, |
179 | DRM_UNLOCKED), | 179 | DRM_UNLOCKED | DRM_RENDER_ALLOW), |
180 | VMW_IOCTL_DEF(VMW_FENCE_EVENT, | 180 | VMW_IOCTL_DEF(VMW_FENCE_EVENT, vmw_fence_event_ioctl, |
181 | vmw_fence_event_ioctl, | 181 | DRM_AUTH | DRM_UNLOCKED | DRM_RENDER_ALLOW), |
182 | DRM_AUTH | DRM_UNLOCKED), | ||
183 | VMW_IOCTL_DEF(VMW_GET_3D_CAP, vmw_get_cap_3d_ioctl, | 182 | VMW_IOCTL_DEF(VMW_GET_3D_CAP, vmw_get_cap_3d_ioctl, |
184 | DRM_AUTH | DRM_UNLOCKED), | 183 | DRM_AUTH | DRM_UNLOCKED | DRM_RENDER_ALLOW), |
185 | 184 | ||
186 | /* these allow direct access to the framebuffers mark as master only */ | 185 | /* these allow direct access to the framebuffers mark as master only */ |
187 | VMW_IOCTL_DEF(VMW_PRESENT, vmw_present_ioctl, | 186 | VMW_IOCTL_DEF(VMW_PRESENT, vmw_present_ioctl, |
@@ -194,19 +193,19 @@ static const struct drm_ioctl_desc vmw_ioctls[] = { | |||
194 | DRM_MASTER | DRM_UNLOCKED), | 193 | DRM_MASTER | DRM_UNLOCKED), |
195 | VMW_IOCTL_DEF(VMW_CREATE_SHADER, | 194 | VMW_IOCTL_DEF(VMW_CREATE_SHADER, |
196 | vmw_shader_define_ioctl, | 195 | vmw_shader_define_ioctl, |
197 | DRM_AUTH | DRM_UNLOCKED), | 196 | DRM_AUTH | DRM_UNLOCKED | DRM_RENDER_ALLOW), |
198 | VMW_IOCTL_DEF(VMW_UNREF_SHADER, | 197 | VMW_IOCTL_DEF(VMW_UNREF_SHADER, |
199 | vmw_shader_destroy_ioctl, | 198 | vmw_shader_destroy_ioctl, |
200 | DRM_UNLOCKED), | 199 | DRM_UNLOCKED | DRM_RENDER_ALLOW), |
201 | VMW_IOCTL_DEF(VMW_GB_SURFACE_CREATE, | 200 | VMW_IOCTL_DEF(VMW_GB_SURFACE_CREATE, |
202 | vmw_gb_surface_define_ioctl, | 201 | vmw_gb_surface_define_ioctl, |
203 | DRM_AUTH | DRM_UNLOCKED), | 202 | DRM_AUTH | DRM_UNLOCKED | DRM_RENDER_ALLOW), |
204 | VMW_IOCTL_DEF(VMW_GB_SURFACE_REF, | 203 | VMW_IOCTL_DEF(VMW_GB_SURFACE_REF, |
205 | vmw_gb_surface_reference_ioctl, | 204 | vmw_gb_surface_reference_ioctl, |
206 | DRM_AUTH | DRM_UNLOCKED), | 205 | DRM_AUTH | DRM_UNLOCKED | DRM_RENDER_ALLOW), |
207 | VMW_IOCTL_DEF(VMW_SYNCCPU, | 206 | VMW_IOCTL_DEF(VMW_SYNCCPU, |
208 | vmw_user_dmabuf_synccpu_ioctl, | 207 | vmw_user_dmabuf_synccpu_ioctl, |
209 | DRM_AUTH | DRM_UNLOCKED), | 208 | DRM_AUTH | DRM_UNLOCKED | DRM_RENDER_ALLOW), |
210 | }; | 209 | }; |
211 | 210 | ||
212 | static struct pci_device_id vmw_pci_id_list[] = { | 211 | static struct pci_device_id vmw_pci_id_list[] = { |
@@ -1406,7 +1405,7 @@ static const struct file_operations vmwgfx_driver_fops = { | |||
1406 | 1405 | ||
1407 | static struct drm_driver driver = { | 1406 | static struct drm_driver driver = { |
1408 | .driver_features = DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | | 1407 | .driver_features = DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | |
1409 | DRIVER_MODESET | DRIVER_PRIME, | 1408 | DRIVER_MODESET | DRIVER_PRIME | DRIVER_RENDER, |
1410 | .load = vmw_driver_load, | 1409 | .load = vmw_driver_load, |
1411 | .unload = vmw_driver_unload, | 1410 | .unload = vmw_driver_unload, |
1412 | .lastclose = vmw_lastclose, | 1411 | .lastclose = vmw_lastclose, |