drm: switch all GEM/KMS ioctls to unlocked ioctl status.
Subsystems (3)
Dave Airlie
maintainerPATCH 1/2 drm: switch all GEM/KMS ioctls to unlocked ioctl status.
From: Dave Airlie <[email protected]>
These ioctls are all protected by their own locking mechanisms so should be fine to not bother locking around.
--- drivers/gpu/drm/drm_drv.c | 44 ++++++++++++++++++++++---------------------- 1 files changed, 22 insertions(+), 22 deletions(-)
drivers/gpu/drm/drm_drv.c +22 -22
@@ -125,28 +125,28 @@ static struct drm_ioctl_desc drm_ioctls[] = {DRM_IOCTL_DEF (DRM_IOCTL_UPDATE_DRAW , drm_update_drawable_info,DRM_AUTH |DRM_MASTER |DRM_ROOT_ONLY ), -DRM_IOCTL_DEF (DRM_IOCTL_GEM_CLOSE , drm_gem_close_ioctl,0 ), -DRM_IOCTL_DEF (DRM_IOCTL_GEM_FLINK , drm_gem_flink_ioctl,DRM_AUTH ), -DRM_IOCTL_DEF (DRM_IOCTL_GEM_OPEN , drm_gem_open_ioctl,DRM_AUTH ), - -DRM_IOCTL_DEF (DRM_IOCTL_MODE_GETRESOURCES , drm_mode_getresources,DRM_MASTER |DRM_CONTROL_ALLOW ), -DRM_IOCTL_DEF (DRM_IOCTL_MODE_GETCRTC , drm_mode_getcrtc,DRM_MASTER |DRM_CONTROL_ALLOW ), -DRM_IOCTL_DEF (DRM_IOCTL_MODE_SETCRTC , drm_mode_setcrtc,DRM_MASTER |DRM_CONTROL_ALLOW ), -DRM_IOCTL_DEF (DRM_IOCTL_MODE_CURSOR , drm_mode_cursor_ioctl,DRM_MASTER |DRM_CONTROL_ALLOW ), -DRM_IOCTL_DEF (DRM_IOCTL_MODE_GETGAMMA , drm_mode_gamma_get_ioctl,DRM_MASTER ), -DRM_IOCTL_DEF (DRM_IOCTL_MODE_SETGAMMA , drm_mode_gamma_set_ioctl,DRM_MASTER ), -DRM_IOCTL_DEF (DRM_IOCTL_MODE_GETENCODER , drm_mode_getencoder,DRM_MASTER |DRM_CONTROL_ALLOW ), -DRM_IOCTL_DEF (DRM_IOCTL_MODE_GETCONNECTOR , drm_mode_getconnector,DRM_MASTER |DRM_CONTROL_ALLOW ), -DRM_IOCTL_DEF (DRM_IOCTL_MODE_ATTACHMODE , drm_mode_attachmode_ioctl,DRM_MASTER |DRM_CONTROL_ALLOW ), -DRM_IOCTL_DEF (DRM_IOCTL_MODE_DETACHMODE , drm_mode_detachmode_ioctl,DRM_MASTER |DRM_CONTROL_ALLOW ), -DRM_IOCTL_DEF (DRM_IOCTL_MODE_GETPROPERTY , drm_mode_getproperty_ioctl,DRM_MASTER |DRM_CONTROL_ALLOW ), -DRM_IOCTL_DEF (DRM_IOCTL_MODE_SETPROPERTY , drm_mode_connector_property_set_ioctl,DRM_MASTER |DRM_CONTROL_ALLOW ), -DRM_IOCTL_DEF (DRM_IOCTL_MODE_GETPROPBLOB , drm_mode_getblob_ioctl,DRM_MASTER |DRM_CONTROL_ALLOW ), -DRM_IOCTL_DEF (DRM_IOCTL_MODE_GETFB , drm_mode_getfb,DRM_MASTER |DRM_CONTROL_ALLOW ), -DRM_IOCTL_DEF (DRM_IOCTL_MODE_ADDFB , drm_mode_addfb,DRM_MASTER |DRM_CONTROL_ALLOW ), -DRM_IOCTL_DEF (DRM_IOCTL_MODE_RMFB , drm_mode_rmfb,DRM_MASTER |DRM_CONTROL_ALLOW ), -DRM_IOCTL_DEF (DRM_IOCTL_MODE_PAGE_FLIP , drm_mode_page_flip_ioctl,DRM_MASTER |DRM_CONTROL_ALLOW ), -DRM_IOCTL_DEF (DRM_IOCTL_MODE_DIRTYFB , drm_mode_dirtyfb_ioctl,DRM_MASTER |DRM_CONTROL_ALLOW ) +DRM_IOCTL_DEF (DRM_IOCTL_GEM_CLOSE , drm_gem_close_ioctl,DRM_UNLOCKED ), +DRM_IOCTL_DEF (DRM_IOCTL_GEM_FLINK , drm_gem_flink_ioctl,DRM_AUTH |DRM_UNLOCKED ), +DRM_IOCTL_DEF (DRM_IOCTL_GEM_OPEN , drm_gem_open_ioctl,DRM_AUTH |DRM_UNLOCKED ), + +DRM_IOCTL_DEF (DRM_IOCTL_MODE_GETRESOURCES , drm_mode_getresources,DRM_MASTER |DRM_CONTROL_ALLOW |DRM_UNLOCKED ), +DRM_IOCTL_DEF (DRM_IOCTL_MODE_GETCRTC , drm_mode_getcrtc,DRM_MASTER |DRM_CONTROL_ALLOW |DRM_UNLOCKED ), +DRM_IOCTL_DEF (DRM_IOCTL_MODE_SETCRTC , drm_mode_setcrtc,DRM_MASTER |DRM_CONTROL_ALLOW |DRM_UNLOCKED ), +DRM_IOCTL_DEF (DRM_IOCTL_MODE_CURSOR , drm_mode_cursor_ioctl,DRM_MASTER |DRM_CONTROL_ALLOW |DRM_UNLOCKED ), +DRM_IOCTL_DEF (DRM_IOCTL_MODE_GETGAMMA , drm_mode_gamma_get_ioctl,DRM_MASTER |DRM_UNLOCKED ), +DRM_IOCTL_DEF (DRM_IOCTL_MODE_SETGAMMA , drm_mode_gamma_set_ioctl,DRM_MASTER |DRM_UNLOCKED ), +DRM_IOCTL_DEF (DRM_IOCTL_MODE_GETENCODER , drm_mode_getencoder,DRM_MASTER |DRM_CONTROL_ALLOW |DRM_UNLOCKED ), +DRM_IOCTL_DEF (DRM_IOCTL_MODE_GETCONNECTOR , drm_mode_getconnector,DRM_MASTER |DRM_CONTROL_ALLOW |DRM_UNLOCKED ), +DRM_IOCTL_DEF (DRM_IOCTL_MODE_ATTACHMODE , drm_mode_attachmode_ioctl,DRM_MASTER |DRM_CONTROL_ALLOW |DRM_UNLOCKED ), +DRM_IOCTL_DEF (DRM_IOCTL_MODE_DETACHMODE , drm_mode_detachmode_ioctl,DRM_MASTER |DRM_CONTROL_ALLOW |DRM_UNLOCKED ), +DRM_IOCTL_DEF (DRM_IOCTL_MODE_GETPROPERTY , drm_mode_getproperty_ioctl,DRM_MASTER |DRM_CONTROL_ALLOW |DRM_UNLOCKED ), +DRM_IOCTL_DEF (DRM_IOCTL_MODE_SETPROPERTY , drm_mode_connector_property_set_ioctl,DRM_MASTER |DRM_CONTROL_ALLOW |DRM_UNLOCKED ), +DRM_IOCTL_DEF (DRM_IOCTL_MODE_GETPROPBLOB , drm_mode_getblob_ioctl,DRM_MASTER |DRM_CONTROL_ALLOW |DRM_UNLOCKED ), +DRM_IOCTL_DEF (DRM_IOCTL_MODE_GETFB , drm_mode_getfb,DRM_MASTER |DRM_CONTROL_ALLOW |DRM_UNLOCKED ), +DRM_IOCTL_DEF (DRM_IOCTL_MODE_ADDFB , drm_mode_addfb,DRM_MASTER |DRM_CONTROL_ALLOW |DRM_UNLOCKED ), +DRM_IOCTL_DEF (DRM_IOCTL_MODE_RMFB , drm_mode_rmfb,DRM_MASTER |DRM_CONTROL_ALLOW |DRM_UNLOCKED ), +DRM_IOCTL_DEF (DRM_IOCTL_MODE_PAGE_FLIP , drm_mode_page_flip_ioctl,DRM_MASTER |DRM_CONTROL_ALLOW |DRM_UNLOCKED ), +DRM_IOCTL_DEF (DRM_IOCTL_MODE_DIRTYFB , drm_mode_dirtyfb_ioctl,DRM_MASTER |DRM_CONTROL_ALLOW |DRM_UNLOCKED ) };#define DRM_CORE_IOCTL_COUNT ARRAY_SIZE( drm_ioctls )
Signature · 10 lines
1.6.6 ------------------------------------------------------------------------------ The Planet: dedicated and managed hosting, cloud storage, colocation Stay online with enterprise data centers and the best network in the business Choose flexible plans and management services without long-term contracts Personal 24x7 support from experience hosting pros just a phone call away. http://p.sf.net/sfu/theplanet-com --
Dave Airlie
maintainerPATCH 2/2 drm/radeon/kms: switch all KMS driver ioctls to unlocked.
From: Dave Airlie <[email protected]>
Internal locking should be sufficent for all these cases.
--- drivers/gpu/drm/radeon/radeon_kms.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-)
drivers/gpu/drm/radeon/radeon_kms.c +12 -12
@@ -276,17 +276,17 @@ struct drm_ioctl_desc radeon_ioctls_kms[] = {DRM_IOCTL_DEF (DRM_RADEON_SURF_ALLOC , radeon_surface_alloc_kms,DRM_AUTH ),DRM_IOCTL_DEF (DRM_RADEON_SURF_FREE , radeon_surface_free_kms,DRM_AUTH ),/* KMS */ -DRM_IOCTL_DEF (DRM_RADEON_GEM_INFO , radeon_gem_info_ioctl,DRM_AUTH ), -DRM_IOCTL_DEF (DRM_RADEON_GEM_CREATE , radeon_gem_create_ioctl,DRM_AUTH ), -DRM_IOCTL_DEF (DRM_RADEON_GEM_MMAP , radeon_gem_mmap_ioctl,DRM_AUTH ), -DRM_IOCTL_DEF (DRM_RADEON_GEM_SET_DOMAIN , radeon_gem_set_domain_ioctl,DRM_AUTH ), -DRM_IOCTL_DEF (DRM_RADEON_GEM_PREAD , radeon_gem_pread_ioctl,DRM_AUTH ), -DRM_IOCTL_DEF (DRM_RADEON_GEM_PWRITE , radeon_gem_pwrite_ioctl,DRM_AUTH ), -DRM_IOCTL_DEF (DRM_RADEON_GEM_WAIT_IDLE , radeon_gem_wait_idle_ioctl,DRM_AUTH ), -DRM_IOCTL_DEF (DRM_RADEON_CS , radeon_cs_ioctl,DRM_AUTH ), -DRM_IOCTL_DEF (DRM_RADEON_INFO , radeon_info_ioctl,DRM_AUTH ), -DRM_IOCTL_DEF (DRM_RADEON_GEM_SET_TILING , radeon_gem_set_tiling_ioctl,DRM_AUTH ), -DRM_IOCTL_DEF (DRM_RADEON_GEM_GET_TILING , radeon_gem_get_tiling_ioctl,DRM_AUTH ), - DRM_IOCTL_DEF(DRM_RADEON_GEM_BUSY, radeon_gem_busy_ioctl, DRM_AUTH), +DRM_IOCTL_DEF (DRM_RADEON_GEM_INFO , radeon_gem_info_ioctl,DRM_AUTH |DRM_UNLOCKED ), +DRM_IOCTL_DEF (DRM_RADEON_GEM_CREATE , radeon_gem_create_ioctl,DRM_AUTH |DRM_UNLOCKED ), +DRM_IOCTL_DEF (DRM_RADEON_GEM_MMAP , radeon_gem_mmap_ioctl,DRM_AUTH |DRM_UNLOCKED ), +DRM_IOCTL_DEF (DRM_RADEON_GEM_SET_DOMAIN , radeon_gem_set_domain_ioctl,DRM_AUTH |DRM_UNLOCKED ), +DRM_IOCTL_DEF (DRM_RADEON_GEM_PREAD , radeon_gem_pread_ioctl,DRM_AUTH |DRM_UNLOCKED ), +DRM_IOCTL_DEF (DRM_RADEON_GEM_PWRITE , radeon_gem_pwrite_ioctl,DRM_AUTH |DRM_UNLOCKED ), +DRM_IOCTL_DEF (DRM_RADEON_GEM_WAIT_IDLE , radeon_gem_wait_idle_ioctl,DRM_AUTH |DRM_UNLOCKED ), +DRM_IOCTL_DEF (DRM_RADEON_CS , radeon_cs_ioctl,DRM_AUTH |DRM_UNLOCKED ), +DRM_IOCTL_DEF (DRM_RADEON_INFO , radeon_info_ioctl,DRM_AUTH |DRM_UNLOCKED ), +DRM_IOCTL_DEF (DRM_RADEON_GEM_SET_TILING , radeon_gem_set_tiling_ioctl,DRM_AUTH |DRM_UNLOCKED ), +DRM_IOCTL_DEF (DRM_RADEON_GEM_GET_TILING , radeon_gem_get_tiling_ioctl,DRM_AUTH |DRM_UNLOCKED ), + DRM_IOCTL_DEF(DRM_RADEON_GEM_BUSY, radeon_gem_busy_ioctl, DRM_AUTH|DRM_UNLOCKED), };int radeon_max_kms_ioctl =DRM_ARRAY_SIZE (radeon_ioctls_kms);
Signature · 10 lines
1.6.6 ------------------------------------------------------------------------------ The Planet: dedicated and managed hosting, cloud storage, colocation Stay online with enterprise data centers and the best network in the business Choose flexible plans and management services without long-term contracts Personal 24x7 support from experience hosting pros just a phone call away. http://p.sf.net/sfu/theplanet-com --
Quoted 4 lines · Dave Airlie
From: Dave Airlie <[email protected]>
These ioctls are all protected by their own locking mechanisms so should be fine to not bother locking around.
Seems good to me. At some point we should just push it down and not have the flag.
------------------------------------------------------------------------------
The Planet: dedicated and managed hosting, cloud storage, colocation Stay online with enterprise data centers and the best network in the business Choose flexible plans and management services without long-term contracts Personal 24x7 support from experience hosting pros just a phone call away.
http://p.sf.net/sfu/theplanet-com
--
_______________________________________________
Dri-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/dri-devel