Revert "MUST_REVERT: gfx: drm: explicitly authenticate for Android"
authorSean V. Kelley <sean.v.kelley@intel.com>
Tue, 13 Mar 2012 22:10:45 +0000 (15:10 -0700)
committerMarkus Lehtonen <markus.lehtonen@linux.intel.com>
Tue, 3 Jul 2012 09:30:33 +0000 (12:30 +0300)
This reverts commit 0e56daf3638ba5fd598ed621e0fcd3159c975e91.

Now handled in HAL and SurfaceFlinger using DRM_AUTH API.

Issue: ANDROID-1031
Signed-off-by: Sean V Kelley <sean.v.kelley@intel.com>
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
drivers/gpu/drm/drm_fops.c

index 9d80128..2ec7d48 100644 (file)
@@ -255,11 +255,6 @@ static int drm_open_helper(struct inode *inode, struct file *filp,
        priv->authenticated = capable(CAP_SYS_ADMIN);
        priv->lock_count = 0;
 
-       /* Authenticating Android userspace with DRM */
-#ifdef CONFIG_ANDROID
-       DRM_DEBUG("setting as authenticated\n");
-       priv->authenticated = 1;
-#endif
        INIT_LIST_HEAD(&priv->lhead);
        INIT_LIST_HEAD(&priv->fbs);
        INIT_LIST_HEAD(&priv->event_list);