From 8aa6aa0bf2ea3b161f2e95c2764d0be50537182c Mon Sep 17 00:00:00 2001 From: Sandy Huang Date: Thu, 6 Jun 2019 15:53:04 +0800 Subject: [PATCH] drm: support ignore drm ioctl permission Change-Id: I269766a9f3f844933bd294ce681466f5a97b1d43 Signed-off-by: Mark Yao Signed-off-by: Sandy Huang --- drivers/gpu/drm/Kconfig | 4 ++++ drivers/gpu/drm/drm_ioctl.c | 2 ++ 2 files changed, 6 insertions(+) diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig index ca868271f4c4..2a9184156172 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig @@ -31,6 +31,10 @@ config DRM_MIPI_DBI tristate depends on DRM +config DRM_IGNORE_IOTCL_PERMIT + bool "Ignore drm ioctl permission" + depends on DRM && ANDROID && NO_GKI + config DRM_MIPI_DSI bool depends on DRM diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c index 9a2c76524c02..3668c649f530 100644 --- a/drivers/gpu/drm/drm_ioctl.c +++ b/drivers/gpu/drm/drm_ioctl.c @@ -536,6 +536,7 @@ int drm_version(struct drm_device *dev, void *data, */ 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; @@ -554,6 +555,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; +#endif return 0; }