Commit 8f879194 authored by Daniel Vetter's avatar Daniel Vetter Committed by Dave Airlie
Browse files

drm: replace drawable ioctl by noops 



The information supplied by userspace through these ioctls is only
accessible by dev->drw_idr. But there's no in-tree user of that.
Also userspace does not really care about return values of these ioctls,
either. Only hw/xfree86/dri/dri.c from the xserver actually checks the
return from adddraw and keeps on trying to create a kernel drawable
every time somebody creates a dri drawable. But since that's now a noop,
who cares.

Therefore it's safe to replace these three ioctls with noops and rip
out the implementation.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: default avatarKristian Høgsberg <krh@bitplanet.net>
Reviewed-by: default avatarMichel Dänzer <michel@daenzer.net>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 4ac5ec40

drivers/gpu/drm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
ccflags-y := -Iinclude/drm



drm-y       :=	drm_auth.o drm_buffer.o drm_bufs.o drm_cache.o \

		drm_context.o drm_dma.o drm_drawable.o \

		drm_context.o drm_dma.o \

		drm_drv.o drm_fops.o drm_gem.o drm_ioctl.o drm_irq.o \

		drm_lock.o drm_memory.o drm_proc.o drm_stub.o drm_vm.o \

		drm_agpsupport.o drm_scatter.o ati_pcigart.o drm_pci.o \

drivers/gpu/drm/drm_drawable.c

deleted100644 → 0
+0 −197
Original line number Diff line number Diff line 
/**

 * \file drm_drawable.c

 * IOCTLs for drawables

 *

 * \author Rickard E. (Rik) Faith <faith@valinux.com>

 * \author Gareth Hughes <gareth@valinux.com>

 * \author Michel Dänzer <michel@tungstengraphics.com>

 */



/*

 * Created: Tue Feb  2 08:37:54 1999 by faith@valinux.com

 *

 * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.

 * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.

 * Copyright 2006 Tungsten Graphics, Inc., Bismarck, North Dakota.

 * All Rights Reserved.

 *

 * Permission is hereby granted, free of charge, to any person obtaining a

 * copy of this software and associated documentation files (the "Software"),

 * to deal in the Software without restriction, including without limitation

 * the rights to use, copy, modify, merge, publish, distribute, sublicense,

 * and/or sell copies of the Software, and to permit persons to whom the

 * Software is furnished to do so, subject to the following conditions:

 *

 * The above copyright notice and this permission notice (including the next

 * paragraph) shall be included in all copies or substantial portions of the

 * Software.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

 * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR

 * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 * OTHER DEALINGS IN THE SOFTWARE.

 */



#include "drmP.h"



/**

 * Allocate drawable ID and memory to store information about it.

 */

int drm_adddraw(struct drm_device *dev, void *data, struct drm_file *file_priv)

{

	unsigned long irqflags;

	struct drm_draw *draw = data;

	int new_id = 0;

	int ret;



again:

	if (idr_pre_get(&dev->drw_idr, GFP_KERNEL) == 0) {

		DRM_ERROR("Out of memory expanding drawable idr\n");

		return -ENOMEM;

	}



	spin_lock_irqsave(&dev->drw_lock, irqflags);

	ret = idr_get_new_above(&dev->drw_idr, NULL, 1, &new_id);

	if (ret == -EAGAIN) {

		spin_unlock_irqrestore(&dev->drw_lock, irqflags);

		goto again;

	}



	spin_unlock_irqrestore(&dev->drw_lock, irqflags);



	draw->handle = new_id;



	DRM_DEBUG("%d\n", draw->handle);



	return 0;

}



/**

 * Free drawable ID and memory to store information about it.

 */

int drm_rmdraw(struct drm_device *dev, void *data, struct drm_file *file_priv)

{

	struct drm_draw *draw = data;

	unsigned long irqflags;

	struct drm_drawable_info *info;



	spin_lock_irqsave(&dev->drw_lock, irqflags);



	info = drm_get_drawable_info(dev, draw->handle);

	if (info == NULL) {

		spin_unlock_irqrestore(&dev->drw_lock, irqflags);

		return -EINVAL;

	}

	kfree(info->rects);

	kfree(info);



	idr_remove(&dev->drw_idr, draw->handle);



	spin_unlock_irqrestore(&dev->drw_lock, irqflags);

	DRM_DEBUG("%d\n", draw->handle);

	return 0;

}



int drm_update_drawable_info(struct drm_device *dev, void *data, struct drm_file *file_priv)

{

	struct drm_update_draw *update = data;

	unsigned long irqflags;

	struct drm_clip_rect *rects;

	struct drm_drawable_info *info;

	int err;



	info = idr_find(&dev->drw_idr, update->handle);

	if (!info) {

		info = kzalloc(sizeof(*info), GFP_KERNEL);

		if (!info)

			return -ENOMEM;

		if (IS_ERR(idr_replace(&dev->drw_idr, info, update->handle))) {

			DRM_ERROR("No such drawable %d\n", update->handle);

			kfree(info);

			return -EINVAL;

		}

	}



	switch (update->type) {

	case DRM_DRAWABLE_CLIPRECTS:

		if (update->num == 0)

			rects = NULL;

		else if (update->num != info->num_rects) {

			rects = kmalloc(update->num *

					sizeof(struct drm_clip_rect),

					GFP_KERNEL);

		} else

			rects = info->rects;



		if (update->num && !rects) {

			DRM_ERROR("Failed to allocate cliprect memory\n");

			err = -ENOMEM;

			goto error;

		}



		if (update->num && DRM_COPY_FROM_USER(rects,

						     (struct drm_clip_rect __user *)

						     (unsigned long)update->data,

						     update->num *

						     sizeof(*rects))) {

			DRM_ERROR("Failed to copy cliprects from userspace\n");

			err = -EFAULT;

			goto error;

		}



		spin_lock_irqsave(&dev->drw_lock, irqflags);



		if (rects != info->rects) {

			kfree(info->rects);

		}



		info->rects = rects;

		info->num_rects = update->num;



		spin_unlock_irqrestore(&dev->drw_lock, irqflags);



		DRM_DEBUG("Updated %d cliprects for drawable %d\n",

			  info->num_rects, update->handle);

		break;

	default:

		DRM_ERROR("Invalid update type %d\n", update->type);

		return -EINVAL;

	}



	return 0;



error:

	if (rects != info->rects)

		kfree(rects);



	return err;

}



/**

 * Caller must hold the drawable spinlock!

 */

static struct drm_drawable_info *drm_get_drawable_info(struct drm_device *dev, drm_drawable_t id)

{

	return idr_find(&dev->drw_idr, id);

}



static int drm_drawable_free(int idr, void *p, void *data)

{

	struct drm_drawable_info *info = p;



	if (info) {

		kfree(info->rects);

		kfree(info);

	}



	return 0;

}



void drm_drawable_free_all(struct drm_device *dev)

{

	idr_for_each(&dev->drw_idr, drm_drawable_free, NULL);

	idr_remove_all(&dev->drw_idr);

}

drivers/gpu/drm/drm_drv.c

+3 −5
Original line number Diff line number Diff line
@@ -91,8 +91,8 @@ static struct drm_ioctl_desc drm_ioctls[] = { 
	DRM_IOCTL_DEF(DRM_IOCTL_NEW_CTX, drm_newctx, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_IOCTL_DEF(DRM_IOCTL_RES_CTX, drm_resctx, DRM_AUTH),



	DRM_IOCTL_DEF(DRM_IOCTL_ADD_DRAW, drm_adddraw, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_IOCTL_DEF(DRM_IOCTL_RM_DRAW, drm_rmdraw, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_IOCTL_DEF(DRM_IOCTL_ADD_DRAW, drm_noop, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_IOCTL_DEF(DRM_IOCTL_RM_DRAW, drm_noop, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),



	DRM_IOCTL_DEF(DRM_IOCTL_LOCK, drm_lock, DRM_AUTH),

	DRM_IOCTL_DEF(DRM_IOCTL_UNLOCK, drm_unlock, DRM_AUTH),
@@ -127,7 +127,7 @@ static struct drm_ioctl_desc drm_ioctls[] = { 


	DRM_IOCTL_DEF(DRM_IOCTL_MODESET_CTL, drm_modeset_ctl, 0),



	DRM_IOCTL_DEF(DRM_IOCTL_UPDATE_DRAW, drm_update_drawable_info, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_IOCTL_DEF(DRM_IOCTL_UPDATE_DRAW, drm_noop, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),



	DRM_IOCTL_DEF(DRM_IOCTL_GEM_CLOSE, drm_gem_close_ioctl, DRM_UNLOCKED),

	DRM_IOCTL_DEF(DRM_IOCTL_GEM_FLINK, drm_gem_flink_ioctl, DRM_AUTH|DRM_UNLOCKED),
@@ -180,8 +180,6 @@ int drm_lastclose(struct drm_device * dev) 


	mutex_lock(&dev->struct_mutex);



	/* Free drawable information memory */

	drm_drawable_free_all(dev);

	del_timer(&dev->timer);



	/* Clear AGP information */

drivers/gpu/drm/drm_stub.c

+0 −3
Original line number Diff line number Diff line
@@ -240,14 +240,11 @@ int drm_fill_in_dev(struct drm_device *dev, 
	INIT_LIST_HEAD(&dev->vblank_event_list);



	spin_lock_init(&dev->count_lock);

	spin_lock_init(&dev->drw_lock);

	spin_lock_init(&dev->event_lock);

	init_timer(&dev->timer);

	mutex_init(&dev->struct_mutex);

	mutex_init(&dev->ctxlist_mutex);



	idr_init(&dev->drw_idr);



	if (drm_ht_create(&dev->map_hash, 12)) {

		return -ENOMEM;

	}

include/drm/drmP.h

+0 −15
Original line number Diff line number Diff line
@@ -1037,12 +1037,6 @@ struct drm_device { 
	struct drm_minor *control;		/**< Control node for card */

	struct drm_minor *primary;		/**< render type primary screen head */



	/** \name Drawable information */

	/*@{ */

	spinlock_t drw_lock;

	struct idr drw_idr;

	/*@} */



        struct drm_mode_config mode_config;	/**< Current mode config */



	/** \name GEM information */
@@ -1229,15 +1223,6 @@ extern int drm_setsareactx(struct drm_device *dev, void *data, 
extern int drm_getsareactx(struct drm_device *dev, void *data,

			   struct drm_file *file_priv);



				/* Drawable IOCTL support (drm_drawable.h) */

extern int drm_adddraw(struct drm_device *dev, void *data,

		       struct drm_file *file_priv);

extern int drm_rmdraw(struct drm_device *dev, void *data,

		      struct drm_file *file_priv);

extern int drm_update_drawable_info(struct drm_device *dev, void *data,

				    struct drm_file *file_priv);

extern void drm_drawable_free_all(struct drm_device *dev);



				/* Authentication IOCTL support (drm_auth.h) */

extern int drm_getmagic(struct drm_device *dev, void *data,

			struct drm_file *file_priv);

CRA Git | Maintained and supported by SUSTech CRA and CCSE