From bbdc899cf77d2d2d90ac55929be67af0a520775f Mon Sep 17 00:00:00 2001 From: Narendra Muppalla Date: Mon, 12 Oct 2020 16:29:48 -0700 Subject: [PATCH] Revert "ANDROID: drivers: gpu: drm: add support for secure framebuffer" Necessary changes to support secure framebuffer have been made to vendor specific drivers. No need to retain support in DRM framework. This reverts commit 840c67f5c1c4f88c9cb1f20f39b6adde53415d30. Signed-off-by: Narendra Muppalla Change-Id: Ia745208ae1c2c49443659292d31cbfa6b0c4f7e8 --- drivers/gpu/drm/drm_framebuffer.c | 3 +-- include/uapi/drm/drm_mode.h | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/gpu/drm/drm_framebuffer.c b/drivers/gpu/drm/drm_framebuffer.c index 07318fda9c6c..df656366a530 100644 --- a/drivers/gpu/drm/drm_framebuffer.c +++ b/drivers/gpu/drm/drm_framebuffer.c @@ -296,8 +296,7 @@ drm_internal_framebuffer_create(struct drm_device *dev, struct drm_framebuffer *fb; int ret; - if (r->flags & ~(DRM_MODE_FB_INTERLACED | DRM_MODE_FB_MODIFIERS | - DRM_MODE_FB_SECURE)) { + if (r->flags & ~(DRM_MODE_FB_INTERLACED | DRM_MODE_FB_MODIFIERS)) { DRM_DEBUG_KMS("bad framebuffer flags 0x%08x\n", r->flags); return ERR_PTR(-EINVAL); } diff --git a/include/uapi/drm/drm_mode.h b/include/uapi/drm/drm_mode.h index 9163d2099125..deea447e5f22 100644 --- a/include/uapi/drm/drm_mode.h +++ b/include/uapi/drm/drm_mode.h @@ -485,7 +485,6 @@ struct drm_mode_fb_cmd { #define DRM_MODE_FB_INTERLACED (1<<0) /* for interlaced framebuffers */ #define DRM_MODE_FB_MODIFIERS (1<<1) /* enables ->modifer[] */ -#define DRM_MODE_FB_SECURE (1<<2) /* for secure framebuffers */ struct drm_mode_fb_cmd2 { __u32 fb_id;