Merge refs/heads/drm-latest from master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6 (3cb904ca) · Commits · e / devices / android_kernel_teracube_2e

drivers/char/drm/Kconfig

+8 −8

Original line number	Diff line number	Diff line
		@@ -23,13 +23,6 @@ config DRM_TDFX
		Choose this option if you have a 3dfx Banshee or Voodoo3 (or later),
		graphics card. If M is selected, the module will be called tdfx.

		config DRM_GAMMA
		tristate "3dlabs GMX 2000"
		depends on DRM && BROKEN
		help
		This is the old gamma driver, please tell me if it might actually
		work.

		config DRM_R128
		tristate "ATI Rage 128"
		depends on DRM && PCI
		@@ -82,7 +75,7 @@ endchoice

		config DRM_MGA
		tristate "Matrox g200/g400"
		depends on DRM && AGP
		depends on DRM
		help
		Choose this option if you have a Matrox G200, G400 or G450 graphics
		card. If M is selected, the module will be called mga. AGP
		@@ -103,3 +96,10 @@ config DRM_VIA
		Choose this option if you have a Via unichrome or compatible video
		chipset. If M is selected the module will be called via.

		config DRM_SAVAGE
		tristate "Savage video cards"
		depends on DRM
		help
		Choose this option if you have a Savage3D/4/SuperSavage/Pro/Twister
		chipset. If M is selected the module will be called savage.

drivers/char/drm/Makefile

+4 −3

Original line number	Diff line number	Diff line
		@@ -8,16 +8,16 @@ drm-objs := drm_auth.o drm_bufs.o drm_context.o drm_dma.o drm_drawable.o \
		drm_agpsupport.o drm_scatter.o ati_pcigart.o drm_pci.o \
		drm_sysfs.o

		gamma-objs := gamma_drv.o gamma_dma.o
		tdfx-objs := tdfx_drv.o
		r128-objs := r128_drv.o r128_cce.o r128_state.o r128_irq.o
		mga-objs := mga_drv.o mga_dma.o mga_state.o mga_warp.o mga_irq.o
		i810-objs := i810_drv.o i810_dma.o
		i830-objs := i830_drv.o i830_dma.o i830_irq.o
		i915-objs := i915_drv.o i915_dma.o i915_irq.o i915_mem.o
		radeon-objs := radeon_drv.o radeon_cp.o radeon_state.o radeon_mem.o radeon_irq.o
		radeon-objs := radeon_drv.o radeon_cp.o radeon_state.o radeon_mem.o radeon_irq.o r300_cmdbuf.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

		ifeq ($(CONFIG_COMPAT),y)
		@@ -29,7 +29,6 @@ i915-objs += i915_ioc32.o
		endif

		obj-$(CONFIG_DRM) += drm.o
		obj-$(CONFIG_DRM_GAMMA) += gamma.o
		obj-$(CONFIG_DRM_TDFX) += tdfx.o
		obj-$(CONFIG_DRM_R128) += r128.o
		obj-$(CONFIG_DRM_RADEON)+= radeon.o
		@@ -39,5 +38,7 @@ obj-$(CONFIG_DRM_I830) += i830.o
		obj-$(CONFIG_DRM_I915) += i915.o
		obj-$(CONFIG_DRM_FFB) += ffb.o
		obj-$(CONFIG_DRM_SIS) += sis.o
		obj-$(CONFIG_DRM_SAVAGE)+= savage.o
		obj-$(CONFIG_DRM_VIA) +=via.o

drivers/char/drm/drm.h

+5 −3

Original line number	Diff line number	Diff line
		@@ -98,7 +98,7 @@
		#define _DRM_LOCKING_CONTEXT(lock) ((lock) & ~(_DRM_LOCK_HELD\|_DRM_LOCK_CONT))


		typedef unsigned long drm_handle_t;
		typedef unsigned int drm_handle_t;
		typedef unsigned int drm_context_t;
		typedef unsigned int drm_drawable_t;
		typedef unsigned int drm_magic_t;
		@@ -209,7 +209,8 @@ typedef enum drm_map_type {
		_DRM_REGISTERS = 1, /*< no caching, no core dump /
		_DRM_SHM = 2, /*< shared, cached /
		_DRM_AGP = 3, /*< AGP/GART /
		_DRM_SCATTER_GATHER = 4 /*< Scatter/gather memory for PCI DMA /
		_DRM_SCATTER_GATHER = 4, /*< Scatter/gather memory for PCI DMA /
		_DRM_CONSISTENT = 5, /*< Consistent memory for PCI DMA /
		} drm_map_type_t;


		@@ -368,7 +369,8 @@ typedef struct drm_buf_desc {
		enum {
		_DRM_PAGE_ALIGN = 0x01, /*< Align on page boundaries for DMA /
		_DRM_AGP_BUFFER = 0x02, /*< Buffer is in AGP space /
		_DRM_SG_BUFFER = 0x04 /*< Scatter/gather memory buffer /
		_DRM_SG_BUFFER = 0x04, /*< Scatter/gather memory buffer /
		_DRM_FB_BUFFER = 0x08 /*< Buffer is in frame buffer /
		} flags;
		unsigned long agp_start; /**<
		* Start address of where the AGP buffers are

drivers/char/drm/drmP.h

+75 −62

Original line number	Diff line number	Diff line
		@@ -53,7 +53,6 @@
		#include <linux/init.h>
		#include <linux/file.h>
		#include <linux/pci.h>
		#include <linux/version.h>
		#include <linux/jiffies.h>
		#include <linux/smp_lock.h> /* For (un)lock_kernel */
		#include <linux/mm.h>
		@@ -96,6 +95,7 @@
		#define DRIVER_IRQ_SHARED 0x80
		#define DRIVER_IRQ_VBL 0x100
		#define DRIVER_DMA_QUEUE 0x200
		#define DRIVER_FB_DMA 0x400

		/***********************************************************************/
		/** \name Begin the DRM... */
		@@ -160,36 +160,7 @@
		#define pte_unmap(pte)
		#endif

		#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,19)
		static inline struct page * vmalloc_to_page(void * vmalloc_addr)
		{
		unsigned long addr = (unsigned long) vmalloc_addr;
		struct page *page = NULL;
		pgd_t *pgd = pgd_offset_k(addr);
		pmd_t *pmd;
		pte_t *ptep, pte;

		if (!pgd_none(*pgd)) {
		pmd = pmd_offset(pgd, addr);
		if (!pmd_none(*pmd)) {
		preempt_disable();
		ptep = pte_offset_map(pmd, addr);
		pte = *ptep;
		if (pte_present(pte))
		page = pte_page(pte);
		pte_unmap(ptep);
		preempt_enable();
		}
		}
		return page;
		}
		#endif

		#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
		#define DRM_RPR_ARG(vma)
		#else
		#define DRM_RPR_ARG(vma) vma,
		#endif

		#define VM_OFFSET(vma) ((vma)->vm_pgoff << PAGE_SHIFT)

		@@ -474,7 +445,8 @@ typedef struct drm_device_dma {
		unsigned long byte_count;
		enum {
		_DRM_DMA_USE_AGP = 0x01,
		_DRM_DMA_USE_SG = 0x02
		_DRM_DMA_USE_SG = 0x02,
		_DRM_DMA_USE_FB = 0x04
		} flags;

		} drm_device_dma_t;
		@@ -525,12 +497,19 @@ typedef struct drm_sigdata {
		drm_hw_lock_t *lock;
		} drm_sigdata_t;

		typedef struct drm_dma_handle {
		dma_addr_t busaddr;
		void *vaddr;
		size_t size;
		} drm_dma_handle_t;

		/**
		* Mappings list
		*/
		typedef struct drm_map_list {
		struct list_head head; /*< list head /
		drm_map_t map; /< mapping /
		unsigned int user_token;
		} drm_map_list_t;

		typedef drm_map_t drm_local_map_t;
		@@ -578,7 +557,22 @@ struct drm_driver {
		int (kernel_context_switch)(struct drm_device dev, int old, int new);
		void (kernel_context_switch_unlock)(struct drm_device dev, drm_lock_t *lock);
		int (vblank_wait)(struct drm_device dev, unsigned int *sequence);

		/**
		* Called by \c drm_device_is_agp. Typically used to determine if a
		* card is really attached to AGP or not.
		*
		* \param dev DRM device handle
		*
		* \returns
		* One of three values is returned depending on whether or not the
		* card is absolutely \b not AGP (return of 0), absolutely \b is AGP
		* (return of 1), or may or may not be AGP (return of 2).
		*/
		int (device_is_agp) (struct drm_device dev);

		/* 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);
		@@ -722,11 +716,7 @@ typedef struct drm_device {
		int pci_slot; /*< PCI slot number /
		int pci_func; /*< PCI function number /
		#ifdef __alpha__
		#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,3)
		struct pci_controler *hose;
		#else
		struct pci_controller *hose;
		#endif
		#endif
		drm_sg_mem_t sg; /< Scatter gather memory /
		unsigned long ctx_bitmap; /< context bitmap /
		@@ -736,6 +726,7 @@ typedef struct drm_device {

		struct drm_driver *driver;
		drm_local_map_t *agp_buffer_map;
		unsigned int agp_buffer_token;
		drm_head_t primary; /*< primary screen head /
		} drm_device_t;

		@@ -806,7 +797,7 @@ extern void *drm_ioremap_nocache(unsigned long offset, unsigned long size,
		drm_device_t *dev);
		extern void drm_ioremapfree(void pt, unsigned long size, drm_device_t dev);

		extern DRM_AGP_MEM drm_alloc_agp(struct agp_bridge_data bridge, int pages, u32 type);
		extern DRM_AGP_MEM drm_alloc_agp(drm_device_t dev, int pages, u32 type);
		extern int drm_free_agp(DRM_AGP_MEM *handle, int pages);
		extern int drm_bind_agp(DRM_AGP_MEM *handle, unsigned int start);
		extern int drm_unbind_agp(DRM_AGP_MEM *handle);
		@@ -881,11 +872,19 @@ extern int drm_lock_free(drm_device_t *dev,
		unsigned int context);

		/* Buffer management support (drm_bufs.h) */
		extern int drm_order( unsigned long size );
		extern int drm_addmap( struct inode inode, struct file filp,
		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_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);
		extern int drm_addmap_ioctl(struct inode inode, struct file filp,
		unsigned int cmd, unsigned long arg);
		extern int drm_rmmap( struct inode inode, struct file filp,
		extern int drm_rmmap(drm_device_t dev, drm_local_map_t map);
		extern int drm_rmmap_locked(drm_device_t 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_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,
		@@ -896,6 +895,10 @@ 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(drm_device_t *dev,
		unsigned int resource);
		extern unsigned long drm_get_resource_len(drm_device_t *dev,
		unsigned int resource);

		/* DMA support (drm_dma.h) */
		extern int drm_dma_setup(drm_device_t *dev);
		@@ -919,14 +922,17 @@ extern void drm_vbl_send_signals( drm_device_t *dev );

		/* AGP/GART support (drm_agpsupport.h) */
		extern drm_agp_head_t drm_agp_init(drm_device_t dev);
		extern int drm_agp_acquire(struct inode inode, struct file filp,
		extern int drm_agp_acquire(drm_device_t * dev);
		extern int drm_agp_acquire_ioctl(struct inode inode, struct file filp,
		unsigned int cmd, unsigned long arg);
		extern void drm_agp_do_release(drm_device_t *dev);
		extern int drm_agp_release(struct inode inode, struct file filp,
		extern int drm_agp_release(drm_device_t *dev);
		extern int drm_agp_release_ioctl(struct inode inode, struct file filp,
		unsigned int cmd, unsigned long arg);
		extern int drm_agp_enable(struct inode inode, struct file filp,
		extern int drm_agp_enable(drm_device_t *dev, drm_agp_mode_t mode);
		extern int drm_agp_enable_ioctl(struct inode inode, struct file filp,
		unsigned int cmd, unsigned long arg);
		extern int drm_agp_info(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,
		unsigned int cmd, unsigned long arg);
		@@ -976,12 +982,10 @@ extern int drm_ati_pcigart_cleanup(drm_device_t *dev,
		unsigned long addr,
		dma_addr_t bus_addr);

		extern void drm_pci_alloc(drm_device_t dev, size_t size,
		size_t align, dma_addr_t maxaddr,
		dma_addr_t * busaddr);

		extern void drm_pci_free(drm_device_t * dev, size_t size,
		void *vaddr, dma_addr_t busaddr);
		extern drm_dma_handle_t drm_pci_alloc(drm_device_t dev, size_t size,
		size_t align, dma_addr_t maxaddr);
		extern void __drm_pci_free(drm_device_t dev, drm_dma_handle_t dmah);
		extern void drm_pci_free(drm_device_t dev, drm_dma_handle_t dmah);

		/* sysfs support (drm_sysfs.c) */
		struct drm_sysfs_class;
		@@ -1012,17 +1016,26 @@ static __inline__ void drm_core_ioremapfree(struct drm_map *map, struct drm_devi
		drm_ioremapfree( map->handle, map->size, dev );
		}

		static __inline__ struct drm_map drm_core_findmap(struct drm_device dev, unsigned long offset)
		static __inline__ struct drm_map drm_core_findmap(struct drm_device dev, unsigned int token)
		{
		struct list_head *_list;
		list_for_each( _list, &dev->maplist->head ) {
		drm_map_list_t *_entry = list_entry( _list, drm_map_list_t, head );
		if ( _entry->map &&
		_entry->map->offset == offset ) {
		drm_map_list_t *_entry;
		list_for_each_entry(_entry, &dev->maplist->head, head)
		if (_entry->user_token == token)
		return _entry->map;
		return NULL;
		}

		static __inline__ int drm_device_is_agp(drm_device_t *dev)
		{
		if ( dev->driver->device_is_agp != NULL ) {
		int err = (*dev->driver->device_is_agp)( dev );

		if (err != 2) {
		return err;
		}
		return NULL;
		}

		return pci_find_capability(dev->pdev, PCI_CAP_ID_AGP);
		}

		static __inline__ void drm_core_dropmap(struct drm_map *map)

drivers/char/drm/drm_agpsupport.c

+81 −62

Original line number	Diff line number	Diff line
		@@ -37,7 +37,7 @@
		#if __OS_HAS_AGP

		/**
		* AGP information ioctl.
		* Get AGP information.
		*
		* \param inode device inode.
		* \param filp file pointer.
		@@ -48,27 +48,39 @@
		* Verifies the AGP device has been initialized and acquired and fills in the
		* drm_agp_info structure with the information in drm_agp_head::agp_info.
		*/
		int drm_agp_info(struct inode inode, struct file filp,
		unsigned int cmd, unsigned long arg)
		int drm_agp_info(drm_device_t dev, drm_agp_info_t info)
		{
		drm_file_t *priv = filp->private_data;
		drm_device_t *dev = priv->head->dev;
		DRM_AGP_KERN *kern;
		drm_agp_info_t info;

		if (!dev->agp \|\| !dev->agp->acquired)
		return -EINVAL;

		kern = &dev->agp->agp_info;
		info.agp_version_major = kern->version.major;
		info.agp_version_minor = kern->version.minor;
		info.mode = kern->mode;
		info.aperture_base = kern->aper_base;
		info.aperture_size = kern->aper_size * 1024 * 1024;
		info.memory_allowed = kern->max_memory << PAGE_SHIFT;
		info.memory_used = kern->current_memory << PAGE_SHIFT;
		info.id_vendor = kern->device->vendor;
		info.id_device = kern->device->device;
		info->agp_version_major = kern->version.major;
		info->agp_version_minor = kern->version.minor;
		info->mode = kern->mode;
		info->aperture_base = kern->aper_base;
		info->aperture_size = kern->aper_size * 1024 * 1024;
		info->memory_allowed = kern->max_memory << PAGE_SHIFT;
		info->memory_used = kern->current_memory << PAGE_SHIFT;
		info->id_vendor = kern->device->vendor;
		info->id_device = kern->device->device;

		return 0;
		}
		EXPORT_SYMBOL(drm_agp_info);

		int drm_agp_info_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_info_t info;
		int err;

		err = drm_agp_info(dev, &info);
		if (err)
		return err;

		if (copy_to_user((drm_agp_info_t __user *) arg, &info, sizeof(info)))
		return -EFAULT;
		@@ -76,23 +88,16 @@ int drm_agp_info(struct inode inode, struct file filp,
		}

		/**
		* Acquire the AGP device (ioctl).
		* Acquire the AGP device.
		*
		* \param inode device inode.
		* \param filp file pointer.
		* \param cmd command.
		* \param arg user argument.
		* \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
		* agp_acquire().
		* \c agp_backend_acquire.
		*/
		int drm_agp_acquire(struct inode inode, struct file filp,
		unsigned int cmd, unsigned long arg)
		int drm_agp_acquire(drm_device_t *dev)
		{
		drm_file_t *priv = filp->private_data;
		drm_device_t *dev = priv->head->dev;

		if (!dev->agp)
		return -ENODEV;
		if (dev->agp->acquired)
		@@ -102,9 +107,10 @@ int drm_agp_acquire(struct inode inode, struct file filp,
		dev->agp->acquired = 1;
		return 0;
		}
		EXPORT_SYMBOL(drm_agp_acquire);

		/**
		* Release the AGP device (ioctl).
		* Acquire the AGP device (ioctl).
		*
		* \param inode device inode.
		* \param filp file pointer.
		@@ -112,62 +118,79 @@ int drm_agp_acquire(struct inode inode, struct file filp,
		* \param arg user argument.
		* \return zero on success or a negative number on failure.
		*
		* Verifies the AGP device has been acquired and calls agp_backend_release().
		* Verifies the AGP device hasn't been acquired before and calls
		* \c agp_backend_acquire.
		*/
		int drm_agp_release(struct inode inode, struct file filp,
		int drm_agp_acquire_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;

		if (!dev->agp \|\| !dev->agp->acquired)
		return -EINVAL;
		agp_backend_release(dev->agp->bridge);
		dev->agp->acquired = 0;
		return 0;

		return drm_agp_acquire( (drm_device_t *) priv->head->dev );
		}

		/**
		* Release the AGP device.
		*
		* Calls agp_backend_release().
		* \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.
		*/
		void drm_agp_do_release(drm_device_t *dev)
		int drm_agp_release(drm_device_t *dev)
		{
		if (!dev->agp \|\| !dev->agp->acquired)
		return -EINVAL;
		agp_backend_release(dev->agp->bridge);
		dev->agp->acquired = 0;
		return 0;
		}
		EXPORT_SYMBOL(drm_agp_release);

		int drm_agp_release_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;

		return drm_agp_release(dev);
		}

		/**
		* Enable the AGP bus.
		*
		* \param inode device inode.
		* \param filp file pointer.
		* \param cmd command.
		* \param arg pointer to a drm_agp_mode structure.
		* \param dev DRM device that has previously acquired AGP.
		* \param mode Requested AGP mode.
		* \return zero on success or a negative number on failure.
		*
		* Verifies the AGP device has been acquired but not enabled, and calls
		* agp_enable().
		* \c agp_enable.
		*/
		int drm_agp_enable(struct inode inode, struct file filp,
		int drm_agp_enable(drm_device_t *dev, drm_agp_mode_t mode)
		{
		if (!dev->agp \|\| !dev->agp->acquired)
		return -EINVAL;

		dev->agp->mode = mode.mode;
		agp_enable(dev->agp->bridge, mode.mode);
		dev->agp->base = dev->agp->agp_info.aper_base;
		dev->agp->enabled = 1;
		return 0;
		}
		EXPORT_SYMBOL(drm_agp_enable);

		int drm_agp_enable_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_mode_t mode;

		if (!dev->agp \|\| !dev->agp->acquired)
		return -EINVAL;

		if (copy_from_user(&mode, (drm_agp_mode_t __user *) arg, sizeof(mode)))
		return -EFAULT;

		dev->agp->mode = mode.mode;
		agp_enable(dev->agp->bridge, mode.mode);
		dev->agp->base = dev->agp->agp_info.aper_base;
		dev->agp->enabled = 1;
		return 0;
		return drm_agp_enable(dev, mode);
		}

		/**
		@@ -206,7 +229,7 @@ int drm_agp_alloc(struct inode inode, struct file filp,
		pages = (request.size + PAGE_SIZE - 1) / PAGE_SIZE;
		type = (u32) request.type;

		if (!(memory = drm_alloc_agp(dev->agp->bridge, pages, type))) {
		if (!(memory = drm_alloc_agp(dev, pages, type))) {
		drm_free(entry, sizeof(*entry), DRM_MEM_AGPLISTS);
		return -ENOMEM;
		}
		@@ -403,13 +426,8 @@ drm_agp_head_t drm_agp_init(drm_device_t dev)
		return NULL;
		}
		head->memory = NULL;
		#if LINUX_VERSION_CODE <= 0x020408
		head->cant_use_aperture = 0;
		head->page_mask = ~(0xfff);
		#else
		head->cant_use_aperture = head->agp_info.cant_use_aperture;
		head->page_mask = head->agp_info.page_mask;
		#endif

		return head;
		}
		@@ -436,6 +454,7 @@ int drm_agp_bind_memory(DRM_AGP_MEM *handle, off_t start)
		return -EINVAL;
		return agp_bind_memory(handle, start);
		}
		EXPORT_SYMBOL(drm_agp_bind_memory);

		/** Calls agp_unbind_memory() */
		int drm_agp_unbind_memory(DRM_AGP_MEM *handle)