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

Commit c153f45f authored by Eric Anholt's avatar Eric Anholt Committed by Dave Airlie
Browse files

drm: Replace DRM_IOCTL_ARGS with (dev, data, file_priv) and remove DRM_DEVICE. 



The data is now in kernel space, copied in/out as appropriate according to t
This results in DRM_COPY_{TO,FROM}_USER going away, and error paths to deal
with those failures.  This also means that XFree86 4.2.0 support for i810 DR
is lost.

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

drivers/char/drm/drmP.h

+114 −105
Original line number Diff line number Diff line
@@ -34,8 +34,6 @@ 
#ifndef _DRM_P_H_

#define _DRM_P_H_



struct drm_file;



/* If you want the memory alloc debug functionality, change define below */

/* #define DEBUG_MEMORY */
@@ -82,6 +80,9 @@ struct drm_file; 
#define __OS_HAS_AGP (defined(CONFIG_AGP) || (defined(CONFIG_AGP_MODULE) && defined(MODULE)))

#define __OS_HAS_MTRR (defined(CONFIG_MTRR))



struct drm_file;

struct drm_device;



#include "drm_os_linux.h"

#include "drm_hashtab.h"
@@ -233,12 +234,13 @@ struct drm_file; 
 * \param dev DRM device.

 * \param filp file pointer of the caller.

 */

#define LOCK_TEST_WITH_RETURN( dev, filp )				\

#define LOCK_TEST_WITH_RETURN( dev, file_priv )				\

do {									\

	if ( !_DRM_LOCK_IS_HELD( dev->lock.hw_lock->lock ) ||		\

	     dev->lock.filp != filp ) {				\

		DRM_ERROR( "%s called without lock held\n",		\

			   __FUNCTION__ );				\

	     dev->lock.file_priv != file_priv )	{			\

		DRM_ERROR( "%s called without lock held, held  %d owner %p %p\n",\

			   __FUNCTION__, _DRM_LOCK_IS_HELD( dev->lock.hw_lock->lock ),\

			   dev->lock.file_priv, file_priv );		\

		return -EINVAL;						\

	}								\

} while (0)
@@ -263,8 +265,8 @@ do { \ 
 * \param cmd command.

 * \param arg argument.

 */

typedef int drm_ioctl_t(struct inode *inode, struct drm_file *file_priv,

			unsigned int cmd, unsigned long arg);

typedef int drm_ioctl_t(struct drm_device *dev, void *data,

			struct drm_file *file_priv);



typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,

			       unsigned long arg);
@@ -273,10 +275,18 @@ typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd, 
#define	DRM_MASTER	0x2

#define DRM_ROOT_ONLY	0x4



typedef struct drm_ioctl_desc {

struct drm_ioctl_desc {

	unsigned int cmd;

	drm_ioctl_t *func;

	int flags;

} drm_ioctl_desc_t;

};



/**

 * Creates a driver or general drm_ioctl_desc array entry for the given

 * ioctl, for use by drm_ioctl().

 */

#define DRM_IOCTL_DEF(ioctl, func, flags) \

	[DRM_IOCTL_NR(ioctl)] = {ioctl, func, flags}



struct drm_magic_entry {

	struct list_head head;
@@ -559,7 +569,7 @@ struct drm_driver { 
	void (*postclose) (struct drm_device *, struct drm_file *);

	void (*lastclose) (struct drm_device *);

	int (*unload) (struct drm_device *);

	int (*dma_ioctl) (DRM_IOCTL_ARGS);

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

	void (*dma_ready) (struct drm_device *);

	int (*dma_quiescent) (struct drm_device *);

	int (*context_ctor) (struct drm_device *dev, int context);
@@ -610,7 +620,7 @@ struct drm_driver { 


	u32 driver_features;

	int dev_priv_size;

	drm_ioctl_desc_t *ioctls;

	struct drm_ioctl_desc *ioctls;

	int num_ioctls;

	struct file_operations fops;

	struct pci_driver pci_driver;
@@ -854,70 +864,70 @@ extern int drm_bind_agp(DRM_AGP_MEM * handle, unsigned int start); 
extern int drm_unbind_agp(DRM_AGP_MEM * handle);



				/* Misc. IOCTL support (drm_ioctl.h) */

extern int drm_irq_by_busid(struct inode *inode, struct drm_file *file_priv,

			    unsigned int cmd, unsigned long arg);

extern int drm_getunique(struct inode *inode, struct drm_file *file_priv,

			 unsigned int cmd, unsigned long arg);

extern int drm_setunique(struct inode *inode, struct drm_file *file_priv,

			 unsigned int cmd, unsigned long arg);

extern int drm_getmap(struct inode *inode, struct drm_file *file_priv,

		      unsigned int cmd, unsigned long arg);

extern int drm_getclient(struct inode *inode, struct drm_file *file_priv,

			 unsigned int cmd, unsigned long arg);

extern int drm_getstats(struct inode *inode, struct drm_file *file_priv,

			unsigned int cmd, unsigned long arg);

extern int drm_setversion(struct inode *inode, struct drm_file *file_priv,

			  unsigned int cmd, unsigned long arg);

extern int drm_noop(struct inode *inode, struct drm_file *file_priv,

		    unsigned int cmd, unsigned long arg);

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

			    struct drm_file *file_priv);

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

			 struct drm_file *file_priv);

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

			 struct drm_file *file_priv);

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

		      struct drm_file *file_priv);

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

			 struct drm_file *file_priv);

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

			struct drm_file *file_priv);

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

			  struct drm_file *file_priv);

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

		    struct drm_file *file_priv);



				/* Context IOCTL support (drm_context.h) */

extern int drm_resctx(struct inode *inode, struct drm_file *file_priv,

		      unsigned int cmd, unsigned long arg);

extern int drm_addctx(struct inode *inode, struct drm_file *file_priv,

		      unsigned int cmd, unsigned long arg);

extern int drm_modctx(struct inode *inode, struct drm_file *file_priv,

		      unsigned int cmd, unsigned long arg);

extern int drm_getctx(struct inode *inode, struct drm_file *file_priv,

		      unsigned int cmd, unsigned long arg);

extern int drm_switchctx(struct inode *inode, struct drm_file *file_priv,

			 unsigned int cmd, unsigned long arg);

extern int drm_newctx(struct inode *inode, struct drm_file *file_priv,

		      unsigned int cmd, unsigned long arg);

extern int drm_rmctx(struct inode *inode, struct drm_file *file_priv,

		     unsigned int cmd, unsigned long arg);

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

		      struct drm_file *file_priv);

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

		      struct drm_file *file_priv);

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

		      struct drm_file *file_priv);

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

		      struct drm_file *file_priv);

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

			 struct drm_file *file_priv);

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

		      struct drm_file *file_priv);

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

		     struct drm_file *file_priv);



extern int drm_ctxbitmap_init(struct drm_device *dev);

extern void drm_ctxbitmap_cleanup(struct drm_device *dev);

extern void drm_ctxbitmap_free(struct drm_device *dev, int ctx_handle);



extern int drm_setsareactx(struct inode *inode, struct drm_file *file_priv,

			   unsigned int cmd, unsigned long arg);

extern int drm_getsareactx(struct inode *inode, struct drm_file *file_priv,

			   unsigned int cmd, unsigned long arg);

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

			   struct drm_file *file_priv);

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 inode *inode, struct drm_file *file_priv,

		       unsigned int cmd, unsigned long arg);

extern int drm_rmdraw(struct inode *inode, struct drm_file *file_priv,

		      unsigned int cmd, unsigned long arg);

extern int drm_update_drawable_info(struct inode *inode, struct drm_file *file_priv,

		       unsigned int cmd, unsigned long arg);

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 struct drm_drawable_info *drm_get_drawable_info(struct drm_device *dev,

						  drm_drawable_t id);

extern void drm_drawable_free_all(struct drm_device *dev);



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

extern int drm_getmagic(struct inode *inode, struct drm_file *file_priv,

			unsigned int cmd, unsigned long arg);

extern int drm_authmagic(struct inode *inode, struct drm_file *file_priv,

			 unsigned int cmd, unsigned long arg);

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

			struct drm_file *file_priv);

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

			 struct drm_file *file_priv);



				/* Locking IOCTL support (drm_lock.h) */

extern int drm_lock(struct inode *inode, struct drm_file *file_priv,

		    unsigned int cmd, unsigned long arg);

extern int drm_unlock(struct inode *inode, struct drm_file *file_priv,

		      unsigned int cmd, unsigned long arg);

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

		    struct drm_file *file_priv);

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

		      struct drm_file *file_priv);

extern int drm_lock_take(struct drm_lock_data *lock_data, unsigned int context);

extern int drm_lock_free(struct drm_lock_data *lock_data, unsigned int context);

extern void drm_idlelock_take(struct drm_lock_data *lock_data);
@@ -928,7 +938,7 @@ extern void drm_idlelock_release(struct drm_lock_data *lock_data); 
 * DMA quiscent + idle. DMA quiescent usually requires the hardware lock.

 */



extern int drm_i_have_hw_lock(struct drm_file *file_priv);

extern int drm_i_have_hw_lock(struct drm_device *dev, struct drm_file *file_priv);



				/* Buffer management support (drm_bufs.h) */

extern int drm_addbufs_agp(struct drm_device *dev, struct drm_buf_desc * request);
@@ -936,24 +946,23 @@ extern int drm_addbufs_pci(struct drm_device *dev, struct drm_buf_desc * request 
extern int drm_addmap(struct drm_device *dev, unsigned int offset,

		      unsigned int size, enum drm_map_type type,

		      enum drm_map_flags flags, drm_local_map_t ** map_ptr);

extern int drm_addmap_ioctl(struct inode *inode, struct drm_file *file_priv,

			    unsigned int cmd, unsigned long arg);

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

			    struct drm_file *file_priv);

extern int drm_rmmap(struct drm_device *dev, drm_local_map_t *map);

extern int drm_rmmap_locked(struct drm_device *dev, drm_local_map_t *map);

extern int drm_rmmap_ioctl(struct inode *inode, struct drm_file *file_priv,

			   unsigned int cmd, unsigned long arg);



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

			   struct drm_file *file_priv);

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

		       struct drm_file *file_priv);

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

			struct drm_file *file_priv);

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

			struct drm_file *file_priv);

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

			struct drm_file *file_priv);

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

		       struct drm_file *file_priv);

extern int drm_order(unsigned long size);

extern int drm_addbufs(struct inode *inode, struct drm_file *file_priv,

		       unsigned int cmd, unsigned long arg);

extern int drm_infobufs(struct inode *inode, struct drm_file *file_priv,

			unsigned int cmd, unsigned long arg);

extern int drm_markbufs(struct inode *inode, struct drm_file *file_priv,

			unsigned int cmd, unsigned long arg);

extern int drm_freebufs(struct inode *inode, struct drm_file *file_priv,

			unsigned int cmd, unsigned long arg);

extern int drm_mapbufs(struct inode *inode, struct drm_file *file_priv,

		       unsigned int cmd, unsigned long arg);

extern unsigned long drm_get_resource_start(struct drm_device *dev,

					    unsigned int resource);

extern unsigned long drm_get_resource_len(struct drm_device *dev,
@@ -967,16 +976,16 @@ extern void drm_core_reclaim_buffers(struct drm_device *dev, 
				     struct drm_file *filp);



				/* IRQ support (drm_irq.h) */

extern int drm_control(struct inode *inode, struct drm_file *file_priv,

		       unsigned int cmd, unsigned long arg);

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

		       struct drm_file *file_priv);

extern irqreturn_t drm_irq_handler(DRM_IRQ_ARGS);

extern int drm_irq_uninstall(struct drm_device *dev);

extern void drm_driver_irq_preinstall(struct drm_device *dev);

extern void drm_driver_irq_postinstall(struct drm_device *dev);

extern void drm_driver_irq_uninstall(struct drm_device *dev);



extern int drm_wait_vblank(struct inode *inode, struct drm_file *file_priv,

			   unsigned int cmd, unsigned long arg);

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

			   struct drm_file *file_priv);

extern int drm_vblank_wait(struct drm_device *dev, unsigned int *vbl_seq);

extern void drm_vbl_send_signals(struct drm_device *dev);

extern void drm_locked_tasklet(struct drm_device *dev, void(*func)(struct drm_device*));
@@ -984,31 +993,30 @@ extern void drm_locked_tasklet(struct drm_device *dev, void(*func)(struct drm_de 
				/* AGP/GART support (drm_agpsupport.h) */

extern struct drm_agp_head *drm_agp_init(struct drm_device *dev);

extern int drm_agp_acquire(struct drm_device *dev);

extern int drm_agp_acquire_ioctl(struct inode *inode, struct drm_file *file_priv,

				 unsigned int cmd, unsigned long arg);

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

				 struct drm_file *file_priv);

extern int drm_agp_release(struct drm_device *dev);

extern int drm_agp_release_ioctl(struct inode *inode, struct drm_file *file_priv,

				 unsigned int cmd, unsigned long arg);

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

				 struct drm_file *file_priv);

extern int drm_agp_enable(struct drm_device *dev, struct drm_agp_mode mode);

extern int drm_agp_enable_ioctl(struct inode *inode, struct drm_file *file_priv,

				unsigned int cmd, unsigned long arg);

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

				struct drm_file *file_priv);

extern int drm_agp_info(struct drm_device *dev, struct drm_agp_info *info);

extern int drm_agp_info_ioctl(struct inode *inode, struct drm_file *file_priv,

			      unsigned int cmd, unsigned long arg);

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

			struct drm_file *file_priv);

extern int drm_agp_alloc(struct drm_device *dev, struct drm_agp_buffer *request);

extern int drm_agp_alloc_ioctl(struct inode *inode, struct drm_file *file_priv,

			 unsigned int cmd, unsigned long arg);

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

			 struct drm_file *file_priv);

extern int drm_agp_free(struct drm_device *dev, struct drm_agp_buffer *request);

extern int drm_agp_free_ioctl(struct inode *inode, struct drm_file *file_priv,

			unsigned int cmd, unsigned long arg);

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

			struct drm_file *file_priv);

extern int drm_agp_unbind(struct drm_device *dev, struct drm_agp_binding *request);

extern int drm_agp_unbind_ioctl(struct inode *inode, struct drm_file *file_priv,

			  unsigned int cmd, unsigned long arg);

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

			  struct drm_file *file_priv);

extern int drm_agp_bind(struct drm_device *dev, struct drm_agp_binding *request);

extern int drm_agp_bind_ioctl(struct inode *inode, struct drm_file *file_priv,

			unsigned int cmd, unsigned long arg);

extern DRM_AGP_MEM *drm_agp_allocate_memory(struct agp_bridge_data *bridge,

					    size_t pages, u32 type);

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

			struct drm_file *file_priv);

extern DRM_AGP_MEM *drm_agp_allocate_memory(struct agp_bridge_data *bridge, size_t pages, u32 type);

extern int drm_agp_free_memory(DRM_AGP_MEM * handle);

extern int drm_agp_bind_memory(DRM_AGP_MEM * handle, off_t start);

extern int drm_agp_unbind_memory(DRM_AGP_MEM * handle);
@@ -1037,10 +1045,11 @@ extern int drm_proc_cleanup(int minor, 


				/* Scatter Gather Support (drm_scatter.h) */

extern void drm_sg_cleanup(struct drm_sg_mem * entry);

extern int drm_sg_alloc(struct inode *inode, struct drm_file *file_priv,

			unsigned int cmd, unsigned long arg);

extern int drm_sg_free(struct inode *inode, struct drm_file *file_priv,

		       unsigned int cmd, unsigned long arg);

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

			struct drm_file *file_priv);

extern int drm_sg_alloc(struct drm_device *dev, struct drm_scatter_gather * request);

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

		       struct drm_file *file_priv);



			       /* ATI PCIGART support (ati_pcigart.h) */

extern int drm_ati_pcigart_init(struct drm_device *dev,

drivers/char/drm/drm_agpsupport.c

+33 −74
Original line number Diff line number Diff line
@@ -71,19 +71,16 @@ int drm_agp_info(struct drm_device *dev, struct drm_agp_info *info) 


EXPORT_SYMBOL(drm_agp_info);



int drm_agp_info_ioctl(struct inode *inode, struct drm_file *file_priv,

		       unsigned int cmd, unsigned long arg)

int drm_agp_info_ioctl(struct drm_device *dev, void *data,

		       struct drm_file *file_priv)

{

	struct drm_device *dev = file_priv->head->dev;

	struct drm_agp_info info;

	struct drm_agp_info *info = data;

	int err;



	err = drm_agp_info(dev, &info);

	err = drm_agp_info(dev, info);

	if (err)

		return err;



	if (copy_to_user((struct drm_agp_info __user *) arg, &info, sizeof(info)))

		return -EFAULT;

	return 0;

}
@@ -122,8 +119,8 @@ EXPORT_SYMBOL(drm_agp_acquire); 
 * Verifies the AGP device hasn't been acquired before and calls

 * \c agp_backend_acquire.

 */

int drm_agp_acquire_ioctl(struct inode *inode, struct drm_file *file_priv,

			  unsigned int cmd, unsigned long arg)

int drm_agp_acquire_ioctl(struct drm_device *dev, void *data,

			  struct drm_file *file_priv)

{

	return drm_agp_acquire((struct drm_device *) file_priv->head->dev);

}
@@ -146,11 +143,9 @@ int drm_agp_release(struct drm_device * dev) 
}

EXPORT_SYMBOL(drm_agp_release);



int drm_agp_release_ioctl(struct inode *inode, struct drm_file *file_priv,

			  unsigned int cmd, unsigned long arg)

int drm_agp_release_ioctl(struct drm_device *dev, void *data,

			  struct drm_file *file_priv)

{

	struct drm_device *dev = file_priv->head->dev;



	return drm_agp_release(dev);

}
@@ -178,16 +173,12 @@ int drm_agp_enable(struct drm_device * dev, struct drm_agp_mode mode) 


EXPORT_SYMBOL(drm_agp_enable);



int drm_agp_enable_ioctl(struct inode *inode, struct drm_file *file_priv,

			 unsigned int cmd, unsigned long arg)

int drm_agp_enable_ioctl(struct drm_device *dev, void *data,

			 struct drm_file *file_priv)

{

	struct drm_device *dev = file_priv->head->dev;

	struct drm_agp_mode mode;



	if (copy_from_user(&mode, (struct drm_agp_mode __user *) arg, sizeof(mode)))

		return -EFAULT;

	struct drm_agp_mode *mode = data;



	return drm_agp_enable(dev, mode);

	return drm_agp_enable(dev, *mode);

}



/**
@@ -236,34 +227,13 @@ int drm_agp_alloc(struct drm_device *dev, struct drm_agp_buffer *request) 
}

EXPORT_SYMBOL(drm_agp_alloc);



int drm_agp_alloc_ioctl(struct inode *inode, struct drm_file *file_priv,

			unsigned int cmd, unsigned long arg)

{

	struct drm_device *dev = file_priv->head->dev;

	struct drm_agp_buffer request;

	struct drm_agp_buffer __user *argp = (void __user *)arg;

	int err;



	if (copy_from_user(&request, argp, sizeof(request)))

		return -EFAULT;



	err = drm_agp_alloc(dev, &request);

	if (err)

		return err;



	if (copy_to_user(argp, &request, sizeof(request))) {

		struct drm_agp_mem *entry;

		list_for_each_entry(entry, &dev->agp->memory, head) {

			if (entry->handle == request.handle)

				break;

		}

		list_del(&entry->head);

		drm_free_agp(entry->memory, entry->pages);

		drm_free(entry, sizeof(*entry), DRM_MEM_AGPLISTS);

		return -EFAULT;

	}

int drm_agp_alloc_ioctl(struct drm_device *dev, void *data,

			struct drm_file *file_priv)

{

	struct drm_agp_buffer *request = data;



	return 0;

	return drm_agp_alloc(dev, request);

}



/**
@@ -317,17 +287,13 @@ int drm_agp_unbind(struct drm_device *dev, struct drm_agp_binding *request) 
}

EXPORT_SYMBOL(drm_agp_unbind);



int drm_agp_unbind_ioctl(struct inode *inode, struct drm_file *file_priv,

			 unsigned int cmd, unsigned long arg)

{

	struct drm_device *dev = file_priv->head->dev;

	struct drm_agp_binding request;



	if (copy_from_user

	    (&request, (struct drm_agp_binding __user *) arg, sizeof(request)))

		return -EFAULT;

int drm_agp_unbind_ioctl(struct drm_device *dev, void *data,

			 struct drm_file *file_priv)

{

	struct drm_agp_binding *request = data;



	return drm_agp_unbind(dev, &request);

	return drm_agp_unbind(dev, request);

}



/**
@@ -365,17 +331,13 @@ int drm_agp_bind(struct drm_device *dev, struct drm_agp_binding *request) 
}

EXPORT_SYMBOL(drm_agp_bind);



int drm_agp_bind_ioctl(struct inode *inode, struct drm_file *file_priv,

		       unsigned int cmd, unsigned long arg)

{

	struct drm_device *dev = file_priv->head->dev;

	struct drm_agp_binding request;



	if (copy_from_user

	    (&request, (struct drm_agp_binding __user *) arg, sizeof(request)))

		return -EFAULT;

int drm_agp_bind_ioctl(struct drm_device *dev, void *data,

		       struct drm_file *file_priv)

{

	struct drm_agp_binding *request = data;



	return drm_agp_bind(dev, &request);

	return drm_agp_bind(dev, request);

}



/**
@@ -411,17 +373,14 @@ int drm_agp_free(struct drm_device *dev, struct drm_agp_buffer *request) 
}

EXPORT_SYMBOL(drm_agp_free);



int drm_agp_free_ioctl(struct inode *inode, struct drm_file *file_priv,

		       unsigned int cmd, unsigned long arg)

{

	struct drm_device *dev = file_priv->head->dev;

	struct drm_agp_buffer request;



	if (copy_from_user

	    (&request, (struct drm_agp_buffer __user *) arg, sizeof(request)))

		return -EFAULT;



	return drm_agp_free(dev, &request);

int drm_agp_free_ioctl(struct drm_device *dev, void *data,

		       struct drm_file *file_priv)

{

	struct drm_agp_buffer *request = data;



	return drm_agp_free(dev, request);

}



/**

drivers/char/drm/drm_auth.c

+15 −21
Original line number Diff line number Diff line
@@ -137,32 +137,29 @@ static int drm_remove_magic(struct drm_device * dev, drm_magic_t magic) 
 * searches an unique non-zero magic number and add it associating it with \p

 * file_priv.

 */

int drm_getmagic(struct inode *inode, struct drm_file *file_priv,

		 unsigned int cmd, unsigned long arg)

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

{

	static drm_magic_t sequence = 0;

	static DEFINE_SPINLOCK(lock);

	struct drm_device *dev = file_priv->head->dev;

	struct drm_auth auth;

	struct drm_auth *auth = data;



	/* Find unique magic */

	if (file_priv->magic) {

		auth.magic = file_priv->magic;

		auth->magic = file_priv->magic;

	} else {

		do {

			spin_lock(&lock);

			if (!sequence)

				++sequence;	/* reserve 0 */

			auth.magic = sequence++;

			auth->magic = sequence++;

			spin_unlock(&lock);

		} while (drm_find_file(dev, auth.magic));

		file_priv->magic = auth.magic;

		drm_add_magic(dev, file_priv, auth.magic);

		} while (drm_find_file(dev, auth->magic));

		file_priv->magic = auth->magic;

		drm_add_magic(dev, file_priv, auth->magic);

	}



	DRM_DEBUG("%u\n", auth.magic);

	if (copy_to_user((struct drm_auth __user *) arg, &auth, sizeof(auth)))

		return -EFAULT;

	DRM_DEBUG("%u\n", auth->magic);



	return 0;

}
@@ -177,19 +174,16 @@ int drm_getmagic(struct inode *inode, struct drm_file *file_priv, 
 *

 * Checks if \p file_priv is associated with the magic number passed in \arg.

 */

int drm_authmagic(struct inode *inode, struct drm_file *file_priv,

		  unsigned int cmd, unsigned long arg)

int drm_authmagic(struct drm_device *dev, void *data,

		  struct drm_file *file_priv)

{

	struct drm_device *dev = file_priv->head->dev;

	struct drm_auth auth;

	struct drm_auth *auth = data;

	struct drm_file *file;



	if (copy_from_user(&auth, (struct drm_auth __user *) arg, sizeof(auth)))

		return -EFAULT;

	DRM_DEBUG("%u\n", auth.magic);

	if ((file = drm_find_file(dev, auth.magic))) {

	DRM_DEBUG("%u\n", auth->magic);

	if ((file = drm_find_file(dev, auth->magic))) {

		file->authenticated = 1;

		drm_remove_magic(dev, auth.magic);

		drm_remove_magic(dev, auth->magic);

		return 0;

	}

	return -EINVAL;

drivers/char/drm/drm_bufs.c

+57 −108

File changed.

Preview size limit exceeded, changes collapsed.

drivers/char/drm/drm_context.c

+53 −98

File changed.

Preview size limit exceeded, changes collapsed.