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

Commit 37ef4399 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

parents bf785ee0 9c7d462e

drivers/char/drm/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.



drm-objs    :=	drm_auth.o drm_bufs.o drm_context.o drm_dma.o drm_drawable.o \

		drm_drv.o drm_fops.o drm_init.o drm_ioctl.o drm_irq.o \

		drm_drv.o drm_fops.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 \

		drm_sysfs.o
@@ -18,7 +18,7 @@ radeon-objs := radeon_drv.o radeon_cp.o radeon_state.o radeon_mem.o radeon_irq.o 
ffb-objs    := ffb_drv.o ffb_context.o

sis-objs    := sis_drv.o sis_ds.o sis_mm.o

savage-objs := savage_drv.o savage_bci.o savage_state.o

via-objs    := via_irq.o via_drv.o via_ds.o via_map.o via_mm.o via_dma.o via_verifier.o via_video.o

via-objs    := via_irq.o via_drv.o via_ds.o via_map.o via_mm.o via_dma.o via_verifier.o via_video.o via_dmablit.o



ifeq ($(CONFIG_COMPAT),y)

drm-objs    += drm_ioc32.o

drivers/char/drm/ati_pcigart.c

+11 −12
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ 
# define ATI_MAX_PCIGART_PAGES		8192	/**< 32 MB aperture, 4K pages */

# define ATI_PCIGART_PAGE_SIZE		4096	/**< PCI GART page size */



static unsigned long drm_ati_alloc_pcigart_table(void)

static void *drm_ati_alloc_pcigart_table(void)

{

	unsigned long address;

	struct page *page;
@@ -72,27 +72,26 @@ static unsigned long drm_ati_alloc_pcigart_table(void) 
	}



	DRM_DEBUG("%s: returning 0x%08lx\n", __FUNCTION__, address);

	return address;

	return (void *)address;

}



static void drm_ati_free_pcigart_table(unsigned long address)

static void drm_ati_free_pcigart_table(void *address)

{

	struct page *page;

	int i;

	DRM_DEBUG("%s\n", __FUNCTION__);



	page = virt_to_page(address);

	page = virt_to_page((unsigned long)address);



	for (i = 0; i < ATI_PCIGART_TABLE_PAGES; i++, page++) {

		__put_page(page);

		ClearPageReserved(page);

	}



	free_pages(address, ATI_PCIGART_TABLE_ORDER);

	free_pages((unsigned long)address, ATI_PCIGART_TABLE_ORDER);

}



int drm_ati_pcigart_cleanup(drm_device_t * dev,

			    drm_ati_pcigart_info * gart_info)

int drm_ati_pcigart_cleanup(drm_device_t *dev, drm_ati_pcigart_info *gart_info)

{

	drm_sg_mem_t *entry = dev->sg;

	unsigned long pages;
@@ -139,7 +138,7 @@ EXPORT_SYMBOL(drm_ati_pcigart_cleanup); 
int drm_ati_pcigart_init(drm_device_t *dev, drm_ati_pcigart_info *gart_info)

{

	drm_sg_mem_t *entry = dev->sg;

	unsigned long address = 0;

	void *address = NULL;

	unsigned long pages;

	u32 *pci_gart, page_base, bus_address = 0;

	int i, j, ret = 0;
@@ -163,7 +162,7 @@ int drm_ati_pcigart_init(drm_device_t * dev, drm_ati_pcigart_info * gart_info) 
			goto done;

		}



		bus_address = pci_map_single(dev->pdev, (void *)address,

		bus_address = pci_map_single(dev->pdev, address,

					     ATI_PCIGART_TABLE_PAGES *

					     PAGE_SIZE, PCI_DMA_TODEVICE);

		if (bus_address == 0) {
@@ -176,7 +175,7 @@ int drm_ati_pcigart_init(drm_device_t * dev, drm_ati_pcigart_info * gart_info) 
		address = gart_info->addr;

		bus_address = gart_info->bus_addr;

		DRM_DEBUG("PCI: Gart Table: VRAM %08X mapped at %08lX\n",

			  bus_address, address);

			  bus_address, (unsigned long)address);

	}



	pci_gart = (u32 *) address;
@@ -195,7 +194,7 @@ int drm_ati_pcigart_init(drm_device_t * dev, drm_ati_pcigart_info * gart_info) 
		if (entry->busaddr[i] == 0) {

			DRM_ERROR("unable to map PCIGART pages!\n");

			drm_ati_pcigart_cleanup(dev, gart_info);

			address = 0;

			address = NULL;

			bus_address = 0;

			goto done;

		}

drivers/char/drm/drm.h

+2 −2
Original line number Diff line number Diff line
@@ -90,8 +90,8 @@ 
#define DRM_MAX_ORDER	22	  /**< Up to 2^22 bytes = 4MB */

#define DRM_RAM_PERCENT 10	  /**< How much system ram can we lock? */



#define _DRM_LOCK_HELD	0x80000000 /**< Hardware lock is held */

#define _DRM_LOCK_CONT	0x40000000 /**< Hardware lock is contended */

#define _DRM_LOCK_HELD	0x80000000U /**< Hardware lock is held */

#define _DRM_LOCK_CONT	0x40000000U /**< Hardware lock is contended */

#define _DRM_LOCK_IS_HELD(lock)	   ((lock) & _DRM_LOCK_HELD)

#define _DRM_LOCK_IS_CONT(lock)	   ((lock) & _DRM_LOCK_CONT)

#define _DRM_LOCKING_CONTEXT(lock) ((lock) & ~(_DRM_LOCK_HELD|_DRM_LOCK_CONT))

drivers/char/drm/drmP.h

+72 −50
Original line number Diff line number Diff line
@@ -144,20 +144,6 @@ 
/** \name Backward compatibility section */

/*@{*/



#ifndef MODULE_LICENSE

#define MODULE_LICENSE(x)

#endif



#ifndef preempt_disable

#define preempt_disable()

#define preempt_enable()

#endif



#ifndef pte_offset_map

#define pte_offset_map pte_offset

#define pte_unmap(pte)

#endif



#define DRM_RPR_ARG(vma) vma,



#define VM_OFFSET(vma) ((vma)->vm_pgoff << PAGE_SHIFT)
@@ -286,10 +272,13 @@ typedef int drm_ioctl_t(struct inode *inode, struct file *filp, 
typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,

			       unsigned long arg);



#define DRM_AUTH	0x1

#define	DRM_MASTER	0x2

#define DRM_ROOT_ONLY	0x4



typedef struct drm_ioctl_desc {

	drm_ioctl_t *func;

	int auth_needed;

	int root_only;

	int flags;

} drm_ioctl_desc_t;



typedef struct drm_devstate {
@@ -384,6 +373,7 @@ typedef struct drm_buf_entry { 
/** File private data */

typedef struct drm_file {

	int authenticated;

	int master;

	int minor;

	pid_t pid;

	uid_t uid;
@@ -532,8 +522,9 @@ typedef struct drm_vbl_sig { 
typedef struct ati_pcigart_info {

	int gart_table_location;

	int is_pcie;

	unsigned long addr;

	void *addr;

	dma_addr_t bus_addr;

	drm_local_map_t mapping;

} drm_ati_pcigart_info;



/**
@@ -544,16 +535,14 @@ typedef struct ati_pcigart_info { 
struct drm_device;



struct drm_driver {

	int (*preinit) (struct drm_device *, unsigned long flags);

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

	void (*pretakedown) (struct drm_device *);

	int (*postcleanup) (struct drm_device *);

	int (*presetup) (struct drm_device *);

	int (*postsetup) (struct drm_device *);

	int (*load) (struct drm_device *, unsigned long flags);

	int (*firstopen) (struct drm_device *);

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

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

	void (*postclose) (struct drm_device *, drm_file_t *);

	void (*lastclose) (struct drm_device *);

	int (*unload) (struct drm_device *);

	int (*dma_ioctl) (DRM_IOCTL_ARGS);

	int (*open_helper) (struct drm_device *, drm_file_t *);

	void (*free_filp_priv) (struct drm_device *, drm_file_t *);

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

	void (*dma_ready) (struct drm_device *);

	int (*dma_quiescent) (struct drm_device *);

	int (*context_ctor) (struct drm_device * dev, int context);
@@ -563,6 +552,7 @@ struct drm_driver { 
	void (*kernel_context_switch_unlock) (struct drm_device * dev,

					      drm_lock_t *lock);

	int (*vblank_wait) (struct drm_device * dev, unsigned int *sequence);

	int (*dri_library_name) (struct drm_device *dev, char *buf);



	/**

	 * Called by \c drm_device_is_agp.  Typically used to determine if a
@@ -579,16 +569,24 @@ struct drm_driver { 


	/* these have to be filled in */



	int (*postinit) (struct drm_device *, unsigned long flags);

	irqreturn_t(*irq_handler) (DRM_IRQ_ARGS);

	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_locked) (struct drm_device *dev,

					struct file *filp);

	unsigned long (*get_map_ofs) (drm_map_t * map);

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

	void (*set_version) (struct drm_device * dev, drm_set_version_t * sv);

	int (*version) (drm_version_t * version);



	int major;

	int minor;

	int patchlevel;

	char *name;

	char *desc;

	char *date;



	u32 driver_features;

	int dev_priv_size;

	drm_ioctl_desc_t *ioctls;
@@ -752,19 +750,43 @@ static inline int drm_core_has_MTRR(struct drm_device *dev) 
{

	return drm_core_check_feature(dev, DRIVER_USE_MTRR);

}



#define DRM_MTRR_WC		MTRR_TYPE_WRCOMB



static inline int drm_mtrr_add(unsigned long offset, unsigned long size,

			       unsigned int flags)

{

	return mtrr_add(offset, size, flags, 1);

}



static inline int drm_mtrr_del(int handle, unsigned long offset,

			       unsigned long size, unsigned int flags)

{

	return mtrr_del(handle, offset, size);

}



#else

#define drm_core_has_MTRR(dev) (0)



#define DRM_MTRR_WC		0



static inline int drm_mtrr_add(unsigned long offset, unsigned long size,

			       unsigned int flags)

{

	return 0;

}



static inline int drm_mtrr_del(int handle, unsigned long offset,

			       unsigned long size, unsigned int flags)

{

	return 0;

}

#endif



/******************************************************************/

/** \name Internal function definitions */

/*@{*/



				/* Misc. support (drm_init.h) */

extern int drm_flags;

extern void drm_parse_options(char *s);

extern int drm_cpu_valid(void);



				/* Driver support (drm_drv.h) */

extern int drm_init(struct drm_driver *driver);

extern void drm_exit(struct drm_driver *driver);
@@ -772,12 +794,11 @@ extern int drm_ioctl(struct inode *inode, struct file *filp, 
		     unsigned int cmd, unsigned long arg);

extern long drm_compat_ioctl(struct file *filp,

			     unsigned int cmd, unsigned long arg);

extern int drm_takedown(drm_device_t * dev);

extern int drm_lastclose(drm_device_t *dev);



				/* Device support (drm_fops.h) */

extern int drm_open(struct inode *inode, struct file *filp);

extern int drm_stub_open(struct inode *inode, struct file *filp);

extern int drm_flush(struct file *filp);

extern int drm_fasync(int fd, struct file *filp, int on);

extern int drm_release(struct inode *inode, struct file *filp);
@@ -819,6 +840,8 @@ 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);



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

extern int drm_resctx(struct inode *inode, struct file *filp,
@@ -855,10 +878,6 @@ extern int drm_rmdraw(struct inode *inode, struct file *filp, 
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);



				/* Placeholder for ioctls past */

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

			 unsigned int cmd, unsigned long arg);



				/* Locking IOCTL support (drm_lock.h) */
@@ -873,6 +892,7 @@ extern int drm_lock_free(drm_device_t * dev, 
				/* Buffer management support (drm_bufs.h) */

extern int drm_addbufs_agp(drm_device_t * dev, drm_buf_desc_t * request);

extern int drm_addbufs_pci(drm_device_t * dev, drm_buf_desc_t * request);

extern int drm_addbufs_fb(drm_device_t *dev, drm_buf_desc_t *request);

extern int drm_addmap(drm_device_t * dev, unsigned int offset,

		      unsigned int size, drm_map_type_t type,

		      drm_map_flags_t flags, drm_local_map_t ** map_ptr);
@@ -908,8 +928,8 @@ extern void drm_core_reclaim_buffers(drm_device_t * dev, struct 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_irq_uninstall(drm_device_t * dev);

extern irqreturn_t drm_irq_handler(DRM_IRQ_ARGS);

extern int drm_irq_uninstall(drm_device_t * dev);

extern void drm_driver_irq_preinstall(drm_device_t * dev);

extern void drm_driver_irq_postinstall(drm_device_t * dev);

extern void drm_driver_irq_uninstall(drm_device_t * dev);
@@ -933,13 +953,17 @@ extern int drm_agp_enable_ioctl(struct inode *inode, struct file *filp, 
extern int drm_agp_info(drm_device_t * dev, drm_agp_info_t * info);

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

			      unsigned int cmd, unsigned long arg);

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

extern int drm_agp_alloc(drm_device_t *dev, drm_agp_buffer_t *request);

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

			 unsigned int cmd, unsigned long arg);

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

extern int drm_agp_free(drm_device_t *dev, drm_agp_buffer_t *request);

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

			unsigned int cmd, unsigned long arg);

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

extern int drm_agp_unbind(drm_device_t *dev, drm_agp_binding_t *request);

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

			  unsigned int cmd, unsigned long arg);

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

extern int drm_agp_bind(drm_device_t *dev, drm_agp_binding_t *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);
@@ -991,10 +1015,8 @@ extern struct drm_sysfs_class *drm_sysfs_create(struct module *owner, 
						char *name);

extern void drm_sysfs_destroy(struct drm_sysfs_class *cs);

extern struct class_device *drm_sysfs_device_add(struct drm_sysfs_class *cs,

						 dev_t dev,

						 struct device *device,

						 const char *fmt, ...);

extern void drm_sysfs_device_remove(dev_t dev);

						 drm_head_t *head);

extern void drm_sysfs_device_remove(struct class_device *class_dev);



/* Inline replacements for DRM_IOREMAP macros */

static __inline__ void drm_core_ioremap(struct drm_map *map,

drivers/char/drm/drm_agpsupport.c

+87 −46
Original line number Diff line number Diff line 
/**

 * \file drm_agpsupport.h

 * \file drm_agpsupport.c

 * DRM support for AGP/GART backend

 *

 * \author Rickard E. (Rik) Faith <faith@valinux.com>
@@ -91,7 +91,7 @@ int drm_agp_info_ioctl(struct inode *inode, struct file *filp, 
/**

 * Acquire the AGP device.

 *

 * \param dev DRM device that is to acquire AGP

 * \param dev DRM device that is to acquire AGP.

 * \return zero on success or a negative number on failure.

 *

 * Verifies the AGP device hasn't been acquired before and calls
@@ -134,7 +134,7 @@ int drm_agp_acquire_ioctl(struct inode *inode, struct file *filp, 
/**

 * Release the AGP device.

 *

 * \param dev DRM device that is to release AGP

 * \param dev DRM device that is to release AGP.

 * \return zero on success or a negative number on failure.

 *

 * Verifies the AGP device has been acquired and calls \c agp_backend_release.
@@ -147,7 +147,6 @@ int drm_agp_release(drm_device_t * dev) 
	dev->agp->acquired = 0;

	return 0;

}



EXPORT_SYMBOL(drm_agp_release);



int drm_agp_release_ioctl(struct inode *inode, struct file *filp,
@@ -208,30 +207,22 @@ int drm_agp_enable_ioctl(struct inode *inode, struct file *filp, 
 * Verifies the AGP device is present and has been acquired, allocates the

 * memory via alloc_agp() and creates a drm_agp_mem entry for it.

 */

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

		  unsigned int cmd, unsigned long arg)

int drm_agp_alloc(drm_device_t *dev, drm_agp_buffer_t *request)

{

	drm_file_t *priv = filp->private_data;

	drm_device_t *dev = priv->head->dev;

	drm_agp_buffer_t request;

	drm_agp_mem_t *entry;

	DRM_AGP_MEM *memory;

	unsigned long pages;

	u32 type;

	drm_agp_buffer_t __user *argp = (void __user *)arg;



	if (!dev->agp || !dev->agp->acquired)

		return -EINVAL;

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

		return -EFAULT;

	if (!(entry = drm_alloc(sizeof(*entry), DRM_MEM_AGPLISTS)))

		return -ENOMEM;



	memset(entry, 0, sizeof(*entry));



	pages = (request.size + PAGE_SIZE - 1) / PAGE_SIZE;

	type = (u32) request.type;



	pages = (request->size + PAGE_SIZE - 1) / PAGE_SIZE;

	type = (u32) request->type;

	if (!(memory = drm_alloc_agp(dev, pages, type))) {

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

		return -ENOMEM;
@@ -247,16 +238,39 @@ int drm_agp_alloc(struct inode *inode, struct file *filp, 
		dev->agp->memory->prev = entry;

	dev->agp->memory = entry;



	request.handle = entry->handle;

	request.physical = memory->physical;

	request->handle = entry->handle;

	request->physical = memory->physical;



	return 0;

}

EXPORT_SYMBOL(drm_agp_alloc);



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

			unsigned int cmd, unsigned long arg)

{

	drm_file_t *priv = filp->private_data;

	drm_device_t *dev = priv->head->dev;

	drm_agp_buffer_t request;

	drm_agp_buffer_t __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))) {

		drm_agp_mem_t *entry = dev->agp->memory;



		dev->agp->memory = entry->next;

		dev->agp->memory->prev = NULL;

		drm_free_agp(memory, pages);

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

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

		return -EFAULT;

	}



	return 0;

}
@@ -293,21 +307,14 @@ static drm_agp_mem_t *drm_agp_lookup_entry(drm_device_t * dev, 
 * Verifies the AGP device is present and acquired, looks-up the AGP memory

 * entry and passes it to the unbind_agp() function.

 */

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

		   unsigned int cmd, unsigned long arg)

int drm_agp_unbind(drm_device_t *dev, drm_agp_binding_t *request)

{

	drm_file_t *priv = filp->private_data;

	drm_device_t *dev = priv->head->dev;

	drm_agp_binding_t request;

	drm_agp_mem_t *entry;

	int ret;



	if (!dev->agp || !dev->agp->acquired)

		return -EINVAL;

	if (copy_from_user

	    (&request, (drm_agp_binding_t __user *) arg, sizeof(request)))

		return -EFAULT;

	if (!(entry = drm_agp_lookup_entry(dev, request.handle)))

	if (!(entry = drm_agp_lookup_entry(dev, request->handle)))

		return -EINVAL;

	if (!entry->bound)

		return -EINVAL;
@@ -316,6 +323,21 @@ int drm_agp_unbind(struct inode *inode, struct file *filp, 
		entry->bound = 0;

	return ret;

}

EXPORT_SYMBOL(drm_agp_unbind);



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

			 unsigned int cmd, unsigned long arg)

{

	drm_file_t *priv = filp->private_data;

	drm_device_t *dev = priv->head->dev;

	drm_agp_binding_t request;



	if (copy_from_user

	    (&request, (drm_agp_binding_t __user *) arg, sizeof(request)))

		return -EFAULT;



	return drm_agp_unbind(dev, &request);

}



/**

 * Bind AGP memory into the GATT (ioctl)
@@ -330,26 +352,19 @@ int drm_agp_unbind(struct inode *inode, struct file *filp, 
 * is currently bound into the GATT. Looks-up the AGP memory entry and passes

 * it to bind_agp() function.

 */

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

		 unsigned int cmd, unsigned long arg)

int drm_agp_bind(drm_device_t *dev, drm_agp_binding_t *request)

{

	drm_file_t *priv = filp->private_data;

	drm_device_t *dev = priv->head->dev;

	drm_agp_binding_t request;

	drm_agp_mem_t *entry;

	int retcode;

	int page;



	if (!dev->agp || !dev->agp->acquired)

		return -EINVAL;

	if (copy_from_user

	    (&request, (drm_agp_binding_t __user *) arg, sizeof(request)))

		return -EFAULT;

	if (!(entry = drm_agp_lookup_entry(dev, request.handle)))

	if (!(entry = drm_agp_lookup_entry(dev, request->handle)))

		return -EINVAL;

	if (entry->bound)

		return -EINVAL;

	page = (request.offset + PAGE_SIZE - 1) / PAGE_SIZE;

	page = (request->offset + PAGE_SIZE - 1) / PAGE_SIZE;

	if ((retcode = drm_bind_agp(entry->memory, page)))

		return retcode;

	entry->bound = dev->agp->base + (page << PAGE_SHIFT);
@@ -357,6 +372,21 @@ int drm_agp_bind(struct inode *inode, struct file *filp, 
		  dev->agp->base, entry->bound);

	return 0;

}

EXPORT_SYMBOL(drm_agp_bind);



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

		       unsigned int cmd, unsigned long arg)

{

	drm_file_t *priv = filp->private_data;

	drm_device_t *dev = priv->head->dev;

	drm_agp_binding_t request;



	if (copy_from_user

	    (&request, (drm_agp_binding_t __user *) arg, sizeof(request)))

		return -EFAULT;



	return drm_agp_bind(dev, &request);

}



/**

 * Free AGP memory (ioctl).
@@ -372,20 +402,13 @@ int drm_agp_bind(struct inode *inode, struct file *filp, 
 * unbind_agp(). Frees it via free_agp() as well as the entry itself

 * and unlinks from the doubly linked list it's inserted in.

 */

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

		 unsigned int cmd, unsigned long arg)

int drm_agp_free(drm_device_t *dev, drm_agp_buffer_t *request)

{

	drm_file_t *priv = filp->private_data;

	drm_device_t *dev = priv->head->dev;

	drm_agp_buffer_t request;

	drm_agp_mem_t *entry;



	if (!dev->agp || !dev->agp->acquired)

		return -EINVAL;

	if (copy_from_user

	    (&request, (drm_agp_buffer_t __user *) arg, sizeof(request)))

		return -EFAULT;

	if (!(entry = drm_agp_lookup_entry(dev, request.handle)))

	if (!(entry = drm_agp_lookup_entry(dev, request->handle)))

		return -EINVAL;

	if (entry->bound)

		drm_unbind_agp(entry->memory);
@@ -402,12 +425,30 @@ int drm_agp_free(struct inode *inode, struct file *filp, 
	drm_free(entry, sizeof(*entry), DRM_MEM_AGPLISTS);

	return 0;

}

EXPORT_SYMBOL(drm_agp_free);



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

		       unsigned int cmd, unsigned long arg)

{

	drm_file_t *priv = filp->private_data;

	drm_device_t *dev = priv->head->dev;

	drm_agp_buffer_t request;



	if (copy_from_user

	    (&request, (drm_agp_buffer_t __user *) arg, sizeof(request)))

		return -EFAULT;



	return drm_agp_free(dev, &request);

}



/**

 * Initialize the AGP resources.

 *

 * \return pointer to a drm_agp_head structure.

 *

 * Gets the drm_agp_t structure which is made available by the agpgart module

 * via the inter_module_* functions. Creates and initializes a drm_agp_head

 * structure.

 */

drm_agp_head_t *drm_agp_init(drm_device_t * dev)

{