projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drm/rockchip: add rk3399 vop big csc support
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
gpu
/
drm
/
drm_ioctl.c
diff --git
a/drivers/gpu/drm/drm_ioctl.c
b/drivers/gpu/drm/drm_ioctl.c
index 8ce2a0c591165018c49392e7ad2b828a1fb3b94b..92f079556b98565d8fb4bad334da5cf74cabfe03 100644
(file)
--- a/
drivers/gpu/drm/drm_ioctl.c
+++ b/
drivers/gpu/drm/drm_ioctl.c
@@
-337,6
+337,11
@@
drm_setclientcap(struct drm_device *dev, void *data, struct drm_file *file_priv)
return -EINVAL;
file_priv->universal_planes = req->value;
break;
return -EINVAL;
file_priv->universal_planes = req->value;
break;
+ case DRM_CLIENT_CAP_SHARE_PLANES:
+ if (req->value > 1)
+ return -EINVAL;
+ file_priv->share_planes = req->value;
+ break;
case DRM_CLIENT_CAP_ATOMIC:
if (!drm_core_check_feature(dev, DRIVER_ATOMIC))
return -EINVAL;
case DRM_CLIENT_CAP_ATOMIC:
if (!drm_core_check_feature(dev, DRIVER_ATOMIC))
return -EINVAL;
@@
-515,6
+520,7
@@
static int drm_version(struct drm_device *dev, void *data,
*/
int drm_ioctl_permit(u32 flags, struct drm_file *file_priv)
{
*/
int drm_ioctl_permit(u32 flags, struct drm_file *file_priv)
{
+#ifndef CONFIG_DRM_IGNORE_IOTCL_PERMIT
/* ROOT_ONLY is only for CAP_SYS_ADMIN */
if (unlikely((flags & DRM_ROOT_ONLY) && !capable(CAP_SYS_ADMIN)))
return -EACCES;
/* ROOT_ONLY is only for CAP_SYS_ADMIN */
if (unlikely((flags & DRM_ROOT_ONLY) && !capable(CAP_SYS_ADMIN)))
return -EACCES;
@@
-538,6
+544,7
@@
int drm_ioctl_permit(u32 flags, struct drm_file *file_priv)
if (unlikely(!(flags & DRM_RENDER_ALLOW) &&
drm_is_render_client(file_priv)))
return -EACCES;
if (unlikely(!(flags & DRM_RENDER_ALLOW) &&
drm_is_render_client(file_priv)))
return -EACCES;
+#endif
return 0;
}
return 0;
}