Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4cda878b authored by Daniel Vetter's avatar Daniel Vetter Committed by Dave Airlie
Browse files

drm: Kill DRM_SUSER 



Checking directly for the right capability is simpler. Also this rids
us of a few places that use DRM_CURRENTPID.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 85b2331b

drivers/gpu/drm/ttm/ttm_bo_util.c

+1 −1
Original line number Diff line number Diff line
@@ -593,7 +593,7 @@ int ttm_bo_kmap(struct ttm_buffer_object *bo, 
	if (start_page > bo->num_pages)

		return -EINVAL;

#if 0

	if (num_pages > 1 && !DRM_SUSER(DRM_CURPROC))

	if (num_pages > 1 && !capable(CAP_SYS_ADMIN))

		return -EPERM;

#endif

	(void) ttm_mem_io_lock(man, false);

drivers/gpu/drm/via/via_dma.c

+2 −2
Original line number Diff line number Diff line
@@ -234,13 +234,13 @@ static int via_dma_init(struct drm_device *dev, void *data, struct drm_file *fil 


	switch (init->func) {

	case VIA_INIT_DMA:

		if (!DRM_SUSER(DRM_CURPROC))

		if (!capable(CAP_SYS_ADMIN))

			retcode = -EPERM;

		else

			retcode = via_initialize(dev, dev_priv, init);

		break;

	case VIA_CLEANUP_DMA:

		if (!DRM_SUSER(DRM_CURPROC))

		if (!capable(CAP_SYS_ADMIN))

			retcode = -EPERM;

		else

			retcode = via_dma_cleanup(dev);

include/drm/drm_os_linux.h

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ static inline void writeq(u64 val, void __iomem *reg) 


/** Current process ID */

#define DRM_CURRENTPID			task_pid_nr(current)

#define DRM_SUSER(p)			capable(CAP_SYS_ADMIN)

#define DRM_UDELAY(d)			udelay(d)

/** Read a byte from a MMIO region */

#define DRM_READ8(map, offset)		readb(((void __iomem *)(map)->handle) + (offset))