Dave Airlie wrote:
> From: Dave Airlie <[email protected]>
>
> For some reason these ioctls have no DRM flags, which just seems wrong,
> so I guess that needs reviewing also before staging exit.
>
> Signed-off-by: Dave Airlie <[email protected]>
>
Dave, is the DRM_UNLOCKED stuff going in for 2.6.33? Otherwise, I'll
provide a patch without the UNLOCKED stuff.
[...]
> ---
> drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 69
> ++++++++---------------------------
> 1 files changed, 16 insertions(+), 53 deletions(-)
>
> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
> b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
> index 7b48bb3..8da66d8 100644
> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
> @@ -103,37 +103,37 @@
> */
>
> VMW_IOCTL_DEF(DRM_IOCTL_VMW_CURSOR_BYPASS,
> - vmw_kms_cursor_bypass_ioctl, 0),
> + vmw_kms_cursor_bypass_ioctl, DRM_AUTH|DRM_UNLOCKED),
>
>
> VMW_IOCTL_DEF(DRM_IOCTL_VMW_CONTROL_STREAM, vmw_overlay_ioctl,
> - 0),
> + DRM_AUTH|DRM_UNLOCKED),
> VMW_IOCTL_DEF(DRM_IOCTL_VMW_CLAIM_STREAM, vmw_stream_claim_ioctl,
> - 0),
> + DRM_AUTH|DRM_UNLOCKED),
> VMW_IOCTL_DEF(DRM_IOCTL_VMW_UNREF_STREAM, vmw_stream_unref_ioctl,
> - 0),
> + DRM_AUTH|DRM_UNLOCKED),
>
The above ioctls are master only.
> VMW_IOCTL_DEF(DRM_IOCTL_VMW_FIFO_DEBUG, vmw_fifo_debug_ioctl,
> - 0),
> + DRM_AUTH|DRM_UNLOCKED),
>
Above ioctl is root + auth, and will probably go away.
> -
> - if (unlikely(ioctl->cmd != cmd)) {
> - DRM_ERROR("Invalid command format, ioctl %d\n",
> - nr - DRM_COMMAND_BASE);
> - return -EINVAL;
> - }
>
We'd like to keep this test, as it really helps catching ioctl usage errors.
/Thomas
------------------------------------------------------------------------------
This SF.Net email is sponsored by the Verizon Developer Community
Take advantage of Verizon's best-in-class app development support
A streamlined, 14 day to market process makes app distribution fast and easy
Join now and get one step closer to millions of Verizon customers
http://p.sf.net/sfu/verizon-dev2dev
--
_______________________________________________
Dri-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/dri-devel
