Commit d4e2cbe9 authored by Dave Airlie's avatar Dave Airlie
Browse files

drm: convert drawable code to using idr 



This converts the code for allocating drawables to the Linux idr,

Fixes from: Michel Dänzer <michel@tungstengraphics.com>, Kristian Høgsberg <krh@redhat.com>

Signed-off-by: default avatarDave Airlie <airlied@linux.ie>
parent 62968144

drivers/char/drm/drmP.h

+2 −4
Original line number Original line Diff line number Diff line
@@ -751,10 +751,7 @@ struct drm_device { 
	/** \name Drawable information */

	/** \name Drawable information */

	/*@{ */

	/*@{ */

	spinlock_t drw_lock;

	spinlock_t drw_lock;

	unsigned int drw_bitfield_length;

	struct idr drw_idr;

	u32 *drw_bitfield;

	unsigned int drw_info_length;

	struct drm_drawable_info **drw_info;

	/*@} */

	/*@} */

};

};
@@ -904,6 +901,7 @@ extern int drm_update_drawable_info(struct inode *inode, struct file *filp, 
		       unsigned int cmd, unsigned long arg);

		       unsigned int cmd, unsigned long arg);

extern struct drm_drawable_info *drm_get_drawable_info(struct drm_device *dev,

extern struct drm_drawable_info *drm_get_drawable_info(struct drm_device *dev,

						  drm_drawable_t id);

						  drm_drawable_t id);

extern void drm_drawable_free_all(struct drm_device *dev);





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

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

extern int drm_getmagic(struct inode *inode, struct file *filp,

extern int drm_getmagic(struct inode *inode, struct file *filp,

drivers/char/drm/drm_drawable.c

+55 −193
Original line number Original line Diff line number Diff line
@@ -44,82 +44,29 @@ int drm_adddraw(DRM_IOCTL_ARGS) 
{

{

	DRM_DEVICE;

	DRM_DEVICE;

	unsigned long irqflags;

	unsigned long irqflags;

	int i, j;

	u32 *bitfield = dev->drw_bitfield;

	unsigned int bitfield_length = dev->drw_bitfield_length;

	struct drm_drawable_info **info = dev->drw_info;

	unsigned int info_length = dev->drw_info_length;

	struct drm_draw draw;

	struct drm_draw draw;

	int new_id = 0;

	int ret;





	for (i = 0, j = 0; i < bitfield_length; i++) {

again:

		if (bitfield[i] == ~0)

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

			continue;

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



		return -ENOMEM;

		for (; j < 8 * sizeof(*bitfield); j++)

			if (!(bitfield[i] & (1 << j)))

				goto done;

	}

	}

done:



	if (i == bitfield_length) {

		bitfield_length++;



		bitfield = drm_alloc(bitfield_length * sizeof(*bitfield),

				     DRM_MEM_BUFS);





		if (!bitfield) {

	spin_lock_irqsave(&dev->drw_lock, irqflags);

			DRM_ERROR("Failed to allocate new drawable bitfield\n");

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

			return DRM_ERR(ENOMEM);

	if (ret == -EAGAIN) {

		spin_unlock_irqrestore(&dev->drw_lock, irqflags);

		goto again;

	}

	}





		if (8 * sizeof(*bitfield) * bitfield_length > info_length) {

	spin_unlock_irqrestore(&dev->drw_lock, irqflags);

			info_length += 8 * sizeof(*bitfield);



			info = drm_alloc(info_length * sizeof(*info),

					 DRM_MEM_BUFS);



			if (!info) {

				DRM_ERROR("Failed to allocate new drawable info"

					  " array\n");



				drm_free(bitfield,

					 bitfield_length * sizeof(*bitfield),

					 DRM_MEM_BUFS);

				return DRM_ERR(ENOMEM);

			}

		}





		bitfield[i] = 0;

	draw.handle = new_id;

	}





	draw.handle = i * 8 * sizeof(*bitfield) + j + 1;

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

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





	spin_lock_irqsave(&dev->drw_lock, irqflags);



	bitfield[i] |= 1 << j;

	info[draw.handle - 1] = NULL;



	if (bitfield != dev->drw_bitfield) {

		memcpy(bitfield, dev->drw_bitfield, dev->drw_bitfield_length *

		       sizeof(*bitfield));

		drm_free(dev->drw_bitfield, sizeof(*bitfield) *

			 dev->drw_bitfield_length, DRM_MEM_BUFS);

		dev->drw_bitfield = bitfield;

		dev->drw_bitfield_length = bitfield_length;

	}



	if (info != dev->drw_info) {

		memcpy(info, dev->drw_info, dev->drw_info_length *

		       sizeof(*info));

		drm_free(dev->drw_info, sizeof(*info) * dev->drw_info_length,

			 DRM_MEM_BUFS);

		dev->drw_info = info;

		dev->drw_info_length = info_length;

	}



	spin_unlock_irqrestore(&dev->drw_lock, irqflags);



	DRM_COPY_TO_USER_IOCTL((struct drm_draw __user *)data, draw, sizeof(draw));

	DRM_COPY_TO_USER_IOCTL((struct drm_draw __user *)data, draw, sizeof(draw));





	return 0;

	return 0;
@@ -132,133 +79,44 @@ int drm_rmdraw(DRM_IOCTL_ARGS) 
{

{

	DRM_DEVICE;

	DRM_DEVICE;

	struct drm_draw draw;

	struct drm_draw draw;

 	int id, idx;

 	unsigned int shift;

	unsigned long irqflags;

	unsigned long irqflags;

	u32 *bitfield = dev->drw_bitfield;

	unsigned int bitfield_length = dev->drw_bitfield_length;

	struct drm_drawable_info **info = dev->drw_info;

	unsigned int info_length = dev->drw_info_length;





	DRM_COPY_FROM_USER_IOCTL(draw, (struct drm_draw __user *) data,

	DRM_COPY_FROM_USER_IOCTL(draw, (struct drm_draw __user *) data,

				 sizeof(draw));

				 sizeof(draw));





	id = draw.handle - 1;

	idx = id / (8 * sizeof(*bitfield));

	shift = id % (8 * sizeof(*bitfield));



	if (idx < 0 || idx >= bitfield_length ||

	    !(bitfield[idx] & (1 << shift))) {

		DRM_DEBUG("No such drawable %d\n", draw.handle);

		return 0;

	}



	spin_lock_irqsave(&dev->drw_lock, irqflags);

	spin_lock_irqsave(&dev->drw_lock, irqflags);





	bitfield[idx] &= ~(1 << shift);

	drm_free(drm_get_drawable_info(dev, draw.handle),



		 sizeof(struct drm_drawable_info), DRM_MEM_BUFS);

	spin_unlock_irqrestore(&dev->drw_lock, irqflags);



	if (info[id]) {

		drm_free(info[id]->rects, info[id]->num_rects *

			 sizeof(struct drm_clip_rect), DRM_MEM_BUFS);

		drm_free(info[id], sizeof(**info), DRM_MEM_BUFS);

	}



	/* Can we shrink the arrays? */

	if (idx == bitfield_length - 1) {

		while (idx >= 0 && !bitfield[idx])

			--idx;



		bitfield_length = idx + 1;



		bitfield = NULL;



		if (bitfield_length) {

			if (bitfield_length != dev->drw_bitfield_length)

				bitfield = drm_alloc(bitfield_length *

						     sizeof(*bitfield),

						     DRM_MEM_BUFS);



			if (!bitfield) {

				bitfield = dev->drw_bitfield;

				bitfield_length = dev->drw_bitfield_length;

			}

		}

	}





	if (bitfield != dev->drw_bitfield) {

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

		info_length = 8 * sizeof(*bitfield) * bitfield_length;



		if (info_length) {

			info = drm_alloc(info_length * sizeof(*info),

					 DRM_MEM_BUFS);



			if (!info) {

				info = dev->drw_info;

				info_length = dev->drw_info_length;

			}

		} else

			info = NULL;



		spin_lock_irqsave(&dev->drw_lock, irqflags);



		if (bitfield)

			memcpy(bitfield, dev->drw_bitfield, bitfield_length *

			       sizeof(*bitfield));

		drm_free(dev->drw_bitfield, sizeof(*bitfield) *

			 dev->drw_bitfield_length, DRM_MEM_BUFS);

		dev->drw_bitfield = bitfield;

		dev->drw_bitfield_length = bitfield_length;



		if (info != dev->drw_info) {

			if (info)

				memcpy(info, dev->drw_info, info_length *

				       sizeof(*info));

			drm_free(dev->drw_info, sizeof(*info) *

				 dev->drw_info_length, DRM_MEM_BUFS);

			dev->drw_info = info;

			dev->drw_info_length = info_length;

		}





	spin_unlock_irqrestore(&dev->drw_lock, irqflags);

	spin_unlock_irqrestore(&dev->drw_lock, irqflags);

	}



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

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

	return 0;

	return 0;

}

}





int drm_update_drawable_info(DRM_IOCTL_ARGS) {

int drm_update_drawable_info(DRM_IOCTL_ARGS)

{

	DRM_DEVICE;

	DRM_DEVICE;

	struct drm_update_draw update;

	struct drm_update_draw update;

	unsigned int id, idx, shift;

	unsigned long irqflags;

	u32 *bitfield = dev->drw_bitfield;

	unsigned long irqflags, bitfield_length = dev->drw_bitfield_length;

	struct drm_drawable_info *info;

	struct drm_clip_rect *rects;

	struct drm_clip_rect *rects;

	struct drm_drawable_info *info;

	int err;

	int err;





	DRM_COPY_FROM_USER_IOCTL(update, (struct drm_update_draw __user *) data,

	DRM_COPY_FROM_USER_IOCTL(update, (struct drm_update_draw __user *) data,

				 sizeof(update));

				 sizeof(update));





	id = update.handle - 1;

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

	idx = id / (8 * sizeof(*bitfield));

	shift = id % (8 * sizeof(*bitfield));



	if (idx < 0 || idx >= bitfield_length ||

	    !(bitfield[idx] & (1 << shift))) {

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

		return DRM_ERR(EINVAL);

	}



	info = dev->drw_info[id];



	if (!info) {

	if (!info) {

		info = drm_calloc(1, sizeof(struct drm_drawable_info), DRM_MEM_BUFS);

		info = drm_calloc(1, sizeof(*info), DRM_MEM_BUFS);



		if (!info)

		if (!info) {

			return -ENOMEM;

			DRM_ERROR("Failed to allocate drawable info memory\n");

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

			return DRM_ERR(ENOMEM);

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

			drm_free(info, sizeof(*info), DRM_MEM_BUFS);

			return -EINVAL;

		}

		}

	}

	}
@@ -295,12 +153,11 @@ int drm_update_drawable_info(DRM_IOCTL_ARGS) { 




		info->rects = rects;

		info->rects = rects;

		info->num_rects = update.num;

		info->num_rects = update.num;

		dev->drw_info[id] = info;





		spin_unlock_irqrestore(&dev->drw_lock, irqflags);

		spin_unlock_irqrestore(&dev->drw_lock, irqflags);





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

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

			  info->num_rects, id);

			  info->num_rects, update.handle);

		break;

		break;

	default:

	default:

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

		DRM_ERROR("Invalid update type %d\n", update.type);
@@ -310,11 +167,9 @@ int drm_update_drawable_info(DRM_IOCTL_ARGS) { 
	return 0;

	return 0;





error:

error:

	if (!dev->drw_info[id])

	if (rects != info->rects)

		drm_free(info, sizeof(*info), DRM_MEM_BUFS);

		drm_free(rects, update.num * sizeof(struct drm_clip_rect),

	else if (rects != dev->drw_info[id]->rects)

			 DRM_MEM_BUFS);

		drm_free(rects, update.num *

			 sizeof(struct drm_clip_rect), DRM_MEM_BUFS);





	return err;

	return err;

}

}
@@ -322,20 +177,27 @@ int drm_update_drawable_info(DRM_IOCTL_ARGS) { 
/**

/**

 * Caller must hold the drawable spinlock!

 * Caller must hold the drawable spinlock!

 */

 */

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

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

	u32 *bitfield = dev->drw_bitfield;

{

	unsigned int idx, shift;

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



	id--;

	idx = id / (8 * sizeof(*bitfield));

	shift = id % (8 * sizeof(*bitfield));



	if (idx < 0 || idx >= dev->drw_bitfield_length ||

	    !(bitfield[idx] & (1 << shift))) {

		DRM_DEBUG("No such drawable %d\n", id);

		return NULL;

}

}

EXPORT_SYMBOL(drm_get_drawable_info);



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

{

	struct drm_drawable_info *info = p;





	return dev->drw_info[id];

	if (info) {

		drm_free(info->rects, info->num_rects *

			 sizeof(struct drm_clip_rect), DRM_MEM_BUFS);

		drm_free(info, sizeof(*info), DRM_MEM_BUFS);

	}



	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);

}
 
}
 
EXPORT_SYMBOL(drm_get_drawable_info);

drivers/char/drm/drm_drv.c

+3 −12
Original line number Original line Diff line number Diff line
@@ -151,19 +151,10 @@ int drm_lastclose(struct drm_device * dev) 
	if (dev->irq_enabled)

	if (dev->irq_enabled)

		drm_irq_uninstall(dev);

		drm_irq_uninstall(dev);





	/* Free drawable information memory */

	for (i = 0; i < dev->drw_bitfield_length / sizeof(*dev->drw_bitfield);

	     i++) {

		struct drm_drawable_info *info = drm_get_drawable_info(dev, i);



		if (info) {

			drm_free(info->rects, info->num_rects *

				 sizeof(struct drm_clip_rect), DRM_MEM_BUFS);

			drm_free(info, sizeof(*info), DRM_MEM_BUFS);

		}

	}



	mutex_lock(&dev->struct_mutex);

	mutex_lock(&dev->struct_mutex);



	/* Free drawable information memory */

	drm_drawable_free_all(dev);

	del_timer(&dev->timer);

	del_timer(&dev->timer);





	/* Clear pid list */

	/* Clear pid list */