diff mbox series

[v2,2/2] drm: error out with EBUSY when device has existing master

Message ID 20200319172930.230583-2-emil.l.velikov@gmail.com (mailing list archive)
State New, archived
Headers show
Series [v2,1/2] drm: rework SET_MASTER and DROP_MASTER perm handling | expand

Commit Message

Emil Velikov March 19, 2020, 5:29 p.m. UTC
From: Emil Velikov <emil.velikov@collabora.com>

As requested by Adam, provide different error message for when the
device has an existing master. An audit of the following projects, shows
that the errno is used only for printf() purposes.

xorg/xserver
xorg/drivers/xf86-video-ati
xorg/drivers/xf86-video-amdgpu
xorg/drivers/xf86-video-intel
xorg/drivers/xf86-video-tegra
xorg/drivers/xf86-video-freedreno
xorg/drivers/xf86-video-nouveau
xorg/drivers/xf86-video-vmwgfx

qt/kwin/plasma
gtk/mutter/gnomeshell
efl/enlightment

Cc: Adam Jackson <ajax@redhat.com>
Suggested-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
---
 drivers/gpu/drm/drm_auth.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Adam Jackson March 19, 2020, 5:35 p.m. UTC | #1
On Thu, 2020-03-19 at 17:29 +0000, Emil Velikov wrote:
> From: Emil Velikov <emil.velikov@collabora.com>
> 
> As requested by Adam, provide different error message for when the
> device has an existing master. An audit of the following projects, shows
> that the errno is used only for printf() purposes.
> 
> xorg/xserver
> xorg/drivers/xf86-video-ati
> xorg/drivers/xf86-video-amdgpu
> xorg/drivers/xf86-video-intel
> xorg/drivers/xf86-video-tegra
> xorg/drivers/xf86-video-freedreno
> xorg/drivers/xf86-video-nouveau
> xorg/drivers/xf86-video-vmwgfx
> 
> qt/kwin/plasma
> gtk/mutter/gnomeshell
> efl/enlightment
> 
> Cc: Adam Jackson <ajax@redhat.com>
> Suggested-by: Adam Jackson <ajax@redhat.com>
> Signed-off-by: Emil Velikov <emil.velikov@collabora.com>

Delightful! Series is:

Reviewed-by: Adam Jackson <ajax@redhat.com>

- ajax
diff mbox series

Patch

diff --git a/drivers/gpu/drm/drm_auth.c b/drivers/gpu/drm/drm_auth.c
index 37cac0a221ff..a312fe1be50c 100644
--- a/drivers/gpu/drm/drm_auth.c
+++ b/drivers/gpu/drm/drm_auth.c
@@ -250,7 +250,7 @@  int drm_setmaster_ioctl(struct drm_device *dev, void *data,
 		goto out_unlock;
 
 	if (dev->master) {
-		ret = -EINVAL;
+		ret = -EBUSY;
 		goto out_unlock;
 	}