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

Commit 13626cb9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'drm-patches' of ssh://master.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 

* 'drm-patches' of ssh://master.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  via invalid device ids removal
  radeon: Commit the ring after each partial texture upload blit.
  i915: fix vbl swap allocation size.
  drm: Replace DRM_IOCTL_ARGS with (dev, data, file_priv) and remove DRM_DEVICE.
  drm: remove XFREE86_VERSION macros.
  drm: Replace filp in ioctl arguments with drm_file *file_priv.
  drm: Remove DRM_ERR OS macro.
parents 37ca506a ace3dff5

drivers/char/drm/drm.h

+1 −19
Original line number Diff line number Diff line
@@ -63,27 +63,9 @@ 
#define DRM_IOC(dir, group, nr, size) _IOC(dir, group, nr, size)

#endif



#define XFREE86_VERSION(major,minor,patch,snap) \

		((major << 16) | (minor << 8) | patch)



#ifndef CONFIG_XFREE86_VERSION

#define CONFIG_XFREE86_VERSION XFREE86_VERSION(4,1,0,0)

#endif



#if CONFIG_XFREE86_VERSION < XFREE86_VERSION(4,1,0,0)

#define DRM_PROC_DEVICES "/proc/devices"

#define DRM_PROC_MISC	 "/proc/misc"

#define DRM_PROC_DRM	 "/proc/drm"

#define DRM_DEV_DRM	 "/dev/drm"

#define DRM_DEV_MODE	 (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP)

#define DRM_DEV_UID	 0

#define DRM_DEV_GID	 0

#endif



#if CONFIG_XFREE86_VERSION >= XFREE86_VERSION(4,1,0,0)

#define DRM_MAJOR       226

#define DRM_MAX_MINOR   15

#endif



#define DRM_NAME	"drm"	  /**< Name in kernel, /dev, and /proc */

#define DRM_MIN_ORDER	5	  /**< At least 2^5 bytes = 32 bytes */

#define DRM_MAX_ORDER	22	  /**< Up to 2^22 bytes = 4MB */

drivers/char/drm/drmP.h

+125 −112
Original line number Diff line number Diff line
@@ -80,6 +80,9 @@ 
#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"
@@ -231,12 +234,13 @@ 
 * \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)
@@ -257,12 +261,12 @@ do { \ 
 * Ioctl function type.

 *

 * \param inode device inode.

 * \param filp file pointer.

 * \param file_priv DRM file private pointer.

 * \param cmd command.

 * \param arg argument.

 */

typedef int drm_ioctl_t(struct inode *inode, struct file *filp,

			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);
@@ -271,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;
@@ -304,7 +316,7 @@ struct drm_buf { 
	__volatile__ int waiting;      /**< On kernel DMA queue */

	__volatile__ int pending;      /**< On hardware DMA queue */

	wait_queue_head_t dma_wait;    /**< Processes waiting */

	struct file *filp;	       /**< Pointer to holding file descr */

	struct drm_file *file_priv;    /**< Private of holding file descr */

	int context;		       /**< Kernel queue for this buffer */

	int while_locked;	       /**< Dispatch this buffer while locked */

	enum {
@@ -377,6 +389,7 @@ struct drm_file { 
	int remove_auth_on_close;

	unsigned long lock_count;

	void *driver_priv;

	struct file *filp;

};



/** Wait queue */
@@ -403,7 +416,7 @@ struct drm_queue { 
 */

struct drm_lock_data {

	struct drm_hw_lock *hw_lock;	/**< Hardware lock */

	struct file *filp;		/**< File descr of lock holder (0=kernel) */

	struct drm_file *file_priv;	/**< File descr of lock holder (0=kernel) */

	wait_queue_head_t lock_queue;	/**< Queue of blocked processes */

	unsigned long lock_time;	/**< Time of last lock in jiffies */

	spinlock_t spinlock;
@@ -552,11 +565,11 @@ struct drm_driver { 
	int (*load) (struct drm_device *, unsigned long flags);

	int (*firstopen) (struct drm_device *);

	int (*open) (struct drm_device *, struct drm_file *);

	void (*preclose) (struct drm_device *, struct file * filp);

	void (*preclose) (struct drm_device *, struct drm_file *file_priv);

	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);
@@ -587,11 +600,12 @@ struct drm_driver { 
	void (*irq_preinstall) (struct drm_device *dev);

	void (*irq_postinstall) (struct drm_device *dev);

	void (*irq_uninstall) (struct drm_device *dev);

	void (*reclaim_buffers) (struct drm_device *dev, struct file * filp);

	void (*reclaim_buffers) (struct drm_device *dev,

				 struct drm_file * file_priv);

	void (*reclaim_buffers_locked) (struct drm_device *dev,

					struct file *filp);

					struct drm_file *file_priv);

	void (*reclaim_buffers_idlelocked) (struct drm_device *dev,

					struct file * filp);

					    struct drm_file *file_priv);

	unsigned long (*get_map_ofs) (struct drm_map * map);

	unsigned long (*get_reg_ofs) (struct drm_device *dev);

	void (*set_version) (struct drm_device *dev,
@@ -606,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;
@@ -850,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 file *filp,

			    unsigned int cmd, unsigned long arg);

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

			 unsigned int cmd, unsigned long arg);

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

			 unsigned int cmd, unsigned long arg);

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

		      unsigned int cmd, unsigned long arg);

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

			 unsigned int cmd, unsigned long arg);

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

			unsigned int cmd, unsigned long arg);

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

			  unsigned int cmd, unsigned long arg);

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

		    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 file *filp,

		      unsigned int cmd, unsigned long arg);

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

		      unsigned int cmd, unsigned long arg);

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

		      unsigned int cmd, unsigned long arg);

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

		      unsigned int cmd, unsigned long arg);

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

			 unsigned int cmd, unsigned long arg);

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

		      unsigned int cmd, unsigned long arg);

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

		     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 file *filp,

			   unsigned int cmd, unsigned long arg);

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

			   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 file *filp,

		       unsigned int cmd, unsigned long arg);

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

		      unsigned int cmd, unsigned long arg);

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

		       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 file *filp,

			unsigned int cmd, unsigned long arg);

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

			 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 file *filp,

		    unsigned int cmd, unsigned long arg);

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

		      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);
@@ -924,8 +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 file *filp);

extern int drm_kernel_take_hw_lock(struct file *filp);

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);
@@ -933,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 file *filp,

			    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 file *filp,

			   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 file *filp,

		       unsigned int cmd, unsigned long arg);

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

			unsigned int cmd, unsigned long arg);

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

			unsigned int cmd, unsigned long arg);

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

			unsigned int cmd, unsigned long arg);

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

		       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,
@@ -960,19 +972,20 @@ extern unsigned long drm_get_resource_len(struct drm_device *dev, 
extern int drm_dma_setup(struct drm_device *dev);

extern void drm_dma_takedown(struct drm_device *dev);

extern void drm_free_buffer(struct drm_device *dev, struct drm_buf * buf);

extern void drm_core_reclaim_buffers(struct drm_device *dev, struct file *filp);

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 file *filp,

		       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 file *filp,

			   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*));
@@ -980,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 file *filp,

				 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 file *filp,

				 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 file *filp,

				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 file *filp,

			      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 file *filp,

			 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 file *filp,

			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 file *filp,

			  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 file *filp,

			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);
@@ -1033,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 file *filp,

			unsigned int cmd, unsigned long arg);

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

		       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

+40 −90
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
 * Get AGP information.

 *

 * \param inode device inode.

 * \param filp file pointer.

 * \param file_priv DRM file private.

 * \param cmd command.

 * \param arg pointer to a (output) drm_agp_info structure.

 * \return zero on success or a negative number on failure.
@@ -71,20 +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 file *filp,

		       unsigned int cmd, unsigned long arg)

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

		       struct drm_file *file_priv)

{

	struct drm_file *priv = filp->private_data;

	struct drm_device *dev = 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;

}
@@ -115,7 +111,7 @@ EXPORT_SYMBOL(drm_agp_acquire); 
 * Acquire the AGP device (ioctl).

 *

 * \param inode device inode.

 * \param filp file pointer.

 * \param file_priv DRM file private.

 * \param cmd command.

 * \param arg user argument.

 * \return zero on success or a negative number on failure.
@@ -123,12 +119,10 @@ 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 file *filp,

			  unsigned int cmd, unsigned long arg)

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

			  struct drm_file *file_priv)

{

	struct drm_file *priv = filp->private_data;



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

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

}



/**
@@ -149,12 +143,9 @@ int drm_agp_release(struct drm_device * dev) 
}

EXPORT_SYMBOL(drm_agp_release);



int drm_agp_release_ioctl(struct inode *inode, struct file *filp,

			  unsigned int cmd, unsigned long arg)

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

			  struct drm_file *file_priv)

{

	struct drm_file *priv = filp->private_data;

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



	return drm_agp_release(dev);

}
@@ -182,24 +173,19 @@ 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 file *filp,

			 unsigned int cmd, unsigned long arg)

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

			 struct drm_file *file_priv)

{

	struct drm_file *priv = filp->private_data;

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

	struct drm_agp_mode mode;

	struct drm_agp_mode *mode = data;



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

		return -EFAULT;



	return drm_agp_enable(dev, mode);

	return drm_agp_enable(dev, *mode);

}



/**

 * Allocate AGP memory.

 *

 * \param inode device inode.

 * \param filp file pointer.

 * \param file_priv file private pointer.

 * \param cmd command.

 * \param arg pointer to a drm_agp_buffer structure.

 * \return zero on success or a negative number on failure.
@@ -241,35 +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 file *filp,

			unsigned int cmd, unsigned long arg)

{

	struct drm_file *priv = filp->private_data;

	struct drm_device *dev = 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);

}



/**
@@ -297,7 +261,7 @@ static struct drm_agp_mem *drm_agp_lookup_entry(struct drm_device * dev, 
 * Unbind AGP memory from the GATT (ioctl).

 *

 * \param inode device inode.

 * \param filp file pointer.

 * \param file_priv DRM file private.

 * \param cmd command.

 * \param arg pointer to a drm_agp_binding structure.

 * \return zero on success or a negative number on failure.
@@ -323,25 +287,20 @@ 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 file *filp,

			 unsigned int cmd, unsigned long arg)

{

	struct drm_file *priv = filp->private_data;

	struct drm_device *dev = 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);

}



/**

 * Bind AGP memory into the GATT (ioctl)

 *

 * \param inode device inode.

 * \param filp file pointer.

 * \param file_priv DRM file private.

 * \param cmd command.

 * \param arg pointer to a drm_agp_binding structure.

 * \return zero on success or a negative number on failure.
@@ -372,25 +331,20 @@ 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 file *filp,

		       unsigned int cmd, unsigned long arg)

{

	struct drm_file *priv = filp->private_data;

	struct drm_device *dev = 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);

}



/**

 * Free AGP memory (ioctl).

 *

 * \param inode device inode.

 * \param filp file pointer.

 * \param file_priv DRM file private.

 * \param cmd command.

 * \param arg pointer to a drm_agp_buffer structure.

 * \return zero on success or a negative number on failure.
@@ -419,18 +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 file *filp,

		       unsigned int cmd, unsigned long arg)

{

	struct drm_file *priv = filp->private_data;

	struct drm_device *dev = 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

+20 −28

File changed.

Preview size limit exceeded, changes collapsed.

drivers/char/drm/drm_bufs.c

+71 −132

File changed.

Preview size limit exceeded, changes collapsed.