On 04/24/2018 03:01 PM, Daniel Vetter wrote:
On Fri, Apr 20, 2018 at 07:56:34PM +0200, Thomas Hellstrom wrote:
On 04/20/2018 08:51 AM, Daniel Vetter wrote:
Control nodes are no more!

Signed-off-by: Daniel Vetter <[email protected]>
Cc: VMware Graphics <[email protected]>
Cc: Sinclair Yeh <[email protected]>
Cc: Thomas Hellstrom <[email protected]>
---
   drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 8 ++++----
   1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c 
b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
index 70e1a8820a7c..97f37c3c16f2 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
@@ -159,14 +159,14 @@ static const struct drm_ioctl_desc vmw_ioctls[] = {
                      DRM_RENDER_ALLOW),
        VMW_IOCTL_DEF(VMW_CURSOR_BYPASS,
                      vmw_kms_cursor_bypass_ioctl,
-                     DRM_MASTER | DRM_CONTROL_ALLOW),
+                     DRM_MASTER),
        VMW_IOCTL_DEF(VMW_CONTROL_STREAM, vmw_overlay_ioctl,
-                     DRM_MASTER | DRM_CONTROL_ALLOW),
+                     DRM_MASTER),
        VMW_IOCTL_DEF(VMW_CLAIM_STREAM, vmw_stream_claim_ioctl,
-                     DRM_MASTER | DRM_CONTROL_ALLOW),
+                     DRM_MASTER),
        VMW_IOCTL_DEF(VMW_UNREF_STREAM, vmw_stream_unref_ioctl,
-                     DRM_MASTER | DRM_CONTROL_ALLOW),
+                     DRM_MASTER),
        VMW_IOCTL_DEF(VMW_CREATE_CONTEXT, vmw_context_define_ioctl,
                      DRM_AUTH | DRM_RENDER_ALLOW),
Reviewed-by: Thomas Hellstrom <[email protected]>

I can queue this on the next -fixes pull.
Through drm-misc-next would be simpler, assuming I get some review on
patches 1&4.
-Daniel

OK. I'll leave it out.

Thanks,

Thomas


_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Reply via email to