All of lore.kernel.org
 help / color / mirror / Atom feed
From: Daniel Vetter <daniel.vetter@ffwll.ch>
To: DRI Development <dri-devel@lists.freedesktop.org>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>,
	Daniel Vetter <daniel.vetter@intel.com>
Subject: [PATCH 2/3] drm: Mark authmagic ioctls as unlocked
Date: Tue, 14 Jun 2016 11:03:33 +0200	[thread overview]
Message-ID: <1465895014-3839-2-git-send-email-daniel.vetter@ffwll.ch> (raw)
In-Reply-To: <1465895014-3839-1-git-send-email-daniel.vetter@ffwll.ch>

All protected by dev->master_mutex. And there's no driver callbacks,
which means no need to sync with old dri1 horror show drivers at all.
Hence safe to drop the drm legacy BKL from these paths.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
 drivers/gpu/drm/drm_ioctl.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c
index 6cc78d648393..288b047b2de5 100644
--- a/drivers/gpu/drm/drm_ioctl.c
+++ b/drivers/gpu/drm/drm_ioctl.c
@@ -467,7 +467,7 @@ static const struct drm_ioctl_desc drm_ioctls[] = {
 	DRM_IOCTL_DEF(DRM_IOCTL_VERSION, drm_version,
 		      DRM_UNLOCKED|DRM_RENDER_ALLOW|DRM_CONTROL_ALLOW),
 	DRM_IOCTL_DEF(DRM_IOCTL_GET_UNIQUE, drm_getunique, 0),
-	DRM_IOCTL_DEF(DRM_IOCTL_GET_MAGIC, drm_getmagic, 0),
+	DRM_IOCTL_DEF(DRM_IOCTL_GET_MAGIC, drm_getmagic, DRM_UNLOCKED),
 	DRM_IOCTL_DEF(DRM_IOCTL_IRQ_BUSID, drm_irq_by_busid, DRM_MASTER|DRM_ROOT_ONLY),
 	DRM_IOCTL_DEF(DRM_IOCTL_GET_MAP, drm_legacy_getmap_ioctl, DRM_UNLOCKED),
 	DRM_IOCTL_DEF(DRM_IOCTL_GET_CLIENT, drm_getclient, DRM_UNLOCKED),
@@ -479,7 +479,7 @@ static const struct drm_ioctl_desc drm_ioctls[] = {
 	DRM_IOCTL_DEF(DRM_IOCTL_SET_UNIQUE, drm_invalid_op, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
 	DRM_IOCTL_DEF(DRM_IOCTL_BLOCK, drm_noop, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
 	DRM_IOCTL_DEF(DRM_IOCTL_UNBLOCK, drm_noop, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
-	DRM_IOCTL_DEF(DRM_IOCTL_AUTH_MAGIC, drm_authmagic, DRM_AUTH|DRM_MASTER),
+	DRM_IOCTL_DEF(DRM_IOCTL_AUTH_MAGIC, drm_authmagic, DRM_AUTH|DRM_UNLOCKED|DRM_MASTER),
 
 	DRM_IOCTL_DEF(DRM_IOCTL_ADD_MAP, drm_legacy_addmap_ioctl, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
 	DRM_IOCTL_DEF(DRM_IOCTL_RM_MAP, drm_legacy_rmmap_ioctl, DRM_AUTH),
-- 
2.8.1

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

  reply	other threads:[~2016-06-14  9:03 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-14  9:03 [PATCH 1/3] RFC: drm: Restrict vblank ioctl to master Daniel Vetter
2016-06-14  9:03 ` Daniel Vetter [this message]
2016-06-14  9:03 ` [PATCH 3/3] drm: Mark set/drop master ioctl as unlocked Daniel Vetter
2016-06-14 16:10   ` Daniel Vetter
2016-06-14  9:09 ` [PATCH 1/3] RFC: drm: Restrict vblank ioctl to master Michel Dänzer
2016-06-14  9:35   ` Daniel Vetter
2016-06-15  7:29     ` Michel Dänzer
2016-06-15  8:57       ` Daniel Vetter
2016-06-16 13:02         ` Rainer Hochecker
2016-06-16 16:17           ` Daniel Vetter
2016-06-17 12:00             ` Rainer Hochecker
2016-06-20 14:46               ` Daniel Stone
2016-06-20 18:24                 ` Rainer Hochecker
2016-06-20 23:27                   ` Daniel Stone
2016-06-21  4:57                     ` Rainer Hochecker
2016-06-21  5:01                       ` Daniel Stone
2016-06-21  5:15                         ` Rainer Hochecker
2016-06-23 19:54                           ` Rainer Hochecker
2016-06-23 20:55                             ` Daniel Stone
2016-07-12 10:29                               ` Daniel Vetter
2016-07-13  6:50                                 ` Rainer Hochecker
2016-07-13  9:43                                   ` Michel Dänzer
2016-07-13  9:48                                     ` Daniel Vetter
     [not found]                                       ` <CAH0Sn6G3RqaKWF8CiNC65ZNGm0m=ROBjwk8j_KBZwbokS+kS-g@mail.gmail.com>
2016-07-13  9:54                                         ` Rainer Hochecker
     [not found]                                     ` <CAH0Sn6EAtoVDZUwYyYVLT3dsdN52T1VQtA0hBUbjNvzbMwJLgQ@mail.gmail.com>
2016-07-13  9:49                                       ` Rainer Hochecker
2016-07-25  7:38                                         ` Michel Dänzer
2016-07-25 11:15                                           ` Rainer Hochecker
2017-05-05 19:35                                             ` Daniel Vetter
2017-05-05 21:41                                               ` Mario Kleiner
2017-05-06  5:43                                                 ` Rainer Hochecker
  -- strict thread matches above, loose matches on Subject: below --
2016-06-14  9:02 Daniel Vetter
2016-06-14  9:02 ` [PATCH 2/3] drm: Mark authmagic ioctls as unlocked Daniel Vetter

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1465895014-3839-2-git-send-email-daniel.vetter@ffwll.ch \
    --to=daniel.vetter@ffwll.ch \
    --cc=daniel.vetter@intel.com \
    --cc=dri-devel@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.