diff mbox

[3/4] drm/vmwgfx: Drop DRM_CONTROL_ALLOW

Message ID 20180420065159.4531-3-daniel.vetter@ffwll.ch (mailing list archive)
State New, archived
Headers show

Commit Message

Daniel Vetter April 20, 2018, 6:51 a.m. UTC 
Control nodes are no more!

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Cc: VMware Graphics <linux-graphics-maintainer@vmware.com>
Cc: Sinclair Yeh <syeh@vmware.com>
Cc: Thomas Hellstrom <thellstrom@vmware.com>
---
 drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Comments

Thomas Hellström (VMware) April 20, 2018, 5:56 p.m. UTC | #1 
On 04/20/2018 08:51 AM, Daniel Vetter wrote:
> Control nodes are no more!
>
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> Cc: VMware Graphics <linux-graphics-maintainer@vmware.com>
> Cc: Sinclair Yeh <syeh@vmware.com>
> Cc: Thomas Hellstrom <thellstrom@vmware.com>
> ---
>   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 <thellstrom@vmware.com>

I can queue this on the next -fixes pull.

/Thomas
Daniel Vetter April 24, 2018, 1:01 p.m. UTC | #2 
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 <daniel.vetter@intel.com>
> > Cc: VMware Graphics <linux-graphics-maintainer@vmware.com>
> > Cc: Sinclair Yeh <syeh@vmware.com>
> > Cc: Thomas Hellstrom <thellstrom@vmware.com>
> > ---
> >   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 <thellstrom@vmware.com>
> 
> 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
Thomas Hellstrom April 24, 2018, 1:25 p.m. UTC | #3 
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 <daniel.vetter@intel.com>
>>> Cc: VMware Graphics <linux-graphics-maintainer@vmware.com>
>>> Cc: Sinclair Yeh <syeh@vmware.com>
>>> Cc: Thomas Hellstrom <thellstrom@vmware.com>
>>> ---
>>>    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 <thellstrom@vmware.com>
>>
>> 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
Sean Paul May 2, 2018, 3:03 p.m. UTC | #4 
On Fri, Apr 20, 2018 at 08:51:58AM +0200, Daniel Vetter wrote:
> Control nodes are no more!
> 
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

Reviewed-by: Sean Paul <seanpaul@chromium.org>

> Cc: VMware Graphics <linux-graphics-maintainer@vmware.com>
> Cc: Sinclair Yeh <syeh@vmware.com>
> Cc: Thomas Hellstrom <thellstrom@vmware.com>
> ---
>  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),
> -- 
> 2.16.2
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff mbox

Patch

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),