Merge head 'drm-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6 (0109fd37) · Commits · e / devices / android_kernel_teracube_2e

drivers/char/drm/ati_pcigart.c

+1 −1

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 /

		unsigned long drm_ati_alloc_pcigart_table( void )
		static unsigned long drm_ati_alloc_pcigart_table( void )
		{
		unsigned long address;
		struct page *page;

drivers/char/drm/drm.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -38,7 +38,9 @@
		#define _DRM_H_

		#if defined(__linux__)
		#if defined(__KERNEL__)
		#include <linux/config.h>
		#endif
		#include <asm/ioctl.h> /* For _IO* macros */
		#define DRM_IOCTL_NR(n) _IOC_NR(n)
		#define DRM_IOC_VOID _IOC_NONE

drivers/char/drm/drmP.h

+7 −23

Original line number	Diff line number	Diff line
		@@ -774,8 +774,6 @@ 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);
		extern int drm_version(struct inode inode, struct file filp,
		unsigned int cmd, unsigned long arg);
		extern int drm_ioctl(struct inode inode, struct file filp,
		unsigned int cmd, unsigned long arg);
		extern long drm_compat_ioctl(struct file *filp,
		@@ -785,28 +783,19 @@ extern int drm_takedown(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_open_helper(struct inode inode, struct file filp,
		drm_device_t *dev);
		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);

		/* Mapping support (drm_vm.h) */
		extern void drm_vm_open(struct vm_area_struct *vma);
		extern void drm_vm_close(struct vm_area_struct *vma);
		extern void drm_vm_shm_close(struct vm_area_struct *vma);
		extern int drm_mmap_dma(struct file *filp,
		struct vm_area_struct *vma);
		extern int drm_mmap(struct file filp, struct vm_area_struct vma);
		extern unsigned int drm_poll(struct file filp, struct poll_table_struct wait);
		extern ssize_t drm_read(struct file filp, char __user buf, size_t count, loff_t *off);

		/* Memory management support (drm_memory.h) */
		#include "drm_memory.h"
		extern void drm_mem_init(void);
		extern int drm_mem_info(char buf, char *start, off_t offset,
		int request, int eof, void data);
		extern void *drm_calloc(size_t nmemb, size_t size, int area);
		extern void drm_realloc(void oldpt, size_t oldsize, size_t size,
		int area);
		extern unsigned long drm_alloc_pages(int order, int area);
		@@ -854,9 +843,6 @@ extern int drm_newctx( struct inode inode, struct file filp,
		extern int drm_rmctx( struct inode inode, struct file filp,
		unsigned int cmd, unsigned long arg );

		extern int drm_context_switch(drm_device_t *dev, int old, int new);
		extern int drm_context_switch_complete(drm_device_t *dev, int new);

		extern int drm_ctxbitmap_init( drm_device_t *dev );
		extern void drm_ctxbitmap_cleanup( drm_device_t *dev );
		extern void drm_ctxbitmap_free( drm_device_t *dev, int ctx_handle );
		@@ -874,9 +860,6 @@ extern int drm_rmdraw(struct inode inode, struct file filp,


		/* Authentication IOCTL support (drm_auth.h) */
		extern int drm_add_magic(drm_device_t dev, drm_file_t priv,
		drm_magic_t magic);
		extern int drm_remove_magic(drm_device_t *dev, drm_magic_t magic);
		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,
		@@ -893,13 +876,9 @@ extern int drm_unlock(struct inode inode, struct file filp,
		unsigned int cmd, unsigned long arg);
		extern int drm_lock_take(__volatile__ unsigned int *lock,
		unsigned int context);
		extern int drm_lock_transfer(drm_device_t *dev,
		__volatile__ unsigned int *lock,
		unsigned int context);
		extern int drm_lock_free(drm_device_t *dev,
		__volatile__ unsigned int *lock,
		unsigned int context);
		extern int drm_notifier(void *priv);

		/* Buffer management support (drm_bufs.h) */
		extern int drm_order( unsigned long size );
		@@ -927,7 +906,6 @@ 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_install( drm_device_t *dev );
		extern int drm_irq_uninstall( drm_device_t *dev );
		extern irqreturn_t drm_irq_handler( DRM_IRQ_ARGS );
		extern void drm_driver_irq_preinstall( drm_device_t *dev );
		@@ -967,7 +945,6 @@ extern int drm_agp_unbind_memory(DRM_AGP_MEM *handle);
		extern int drm_get_dev(struct pci_dev pdev, const struct pci_device_id ent,
		struct drm_driver *driver);
		extern int drm_put_dev(drm_device_t * dev);
		extern int drm_get_head(drm_device_t * dev, drm_head_t *head);
		extern int drm_put_head(drm_head_t * head);
		extern unsigned int drm_debug;
		extern unsigned int drm_cards_limit;
		@@ -1064,9 +1041,16 @@ static __inline__ void drm_free(void *pt, size_t size, int area)
		{
		kfree(pt);
		}

		/** Wrapper around kcalloc() */
		static __inline__ void *drm_calloc(size_t nmemb, size_t size, int area)
		{
		return kcalloc(nmemb, size, GFP_KERNEL);
		}
		#else
		extern void *drm_alloc(size_t size, int area);
		extern void drm_free(void *pt, size_t size, int area);
		extern void *drm_calloc(size_t nmemb, size_t size, int area);
		#endif

		/@}/

drivers/char/drm/drm_auth.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -87,7 +87,7 @@ static drm_file_t drm_find_file(drm_device_t dev, drm_magic_t magic)
		* associated the magic number hash key in drm_device::magiclist, while holding
		* the drm_device::struct_sem lock.
		*/
		int drm_add_magic(drm_device_t dev, drm_file_t priv, drm_magic_t magic)
		static int drm_add_magic(drm_device_t dev, drm_file_t priv, drm_magic_t magic)
		{
		int hash;
		drm_magic_entry_t *entry;
		@@ -124,7 +124,7 @@ int drm_add_magic(drm_device_t dev, drm_file_t priv, drm_magic_t magic)
		* Searches and unlinks the entry in drm_device::magiclist with the magic
		* number hash key, while holding the drm_device::struct_sem lock.
		*/
		int drm_remove_magic(drm_device_t *dev, drm_magic_t magic)
		static int drm_remove_magic(drm_device_t *dev, drm_magic_t magic)
		{
		drm_magic_entry_t *prev = NULL;
		drm_magic_entry_t *pt;

drivers/char/drm/drm_bufs.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -356,7 +356,7 @@ static void drm_cleanup_buf_error(drm_device_t dev, drm_buf_entry_t entry)
		* reallocates the buffer list of the same size order to accommodate the new
		* buffers.
		*/
		int drm_addbufs_agp( struct inode inode, struct file filp,
		static int drm_addbufs_agp( struct inode inode, struct file filp,
		unsigned int cmd, unsigned long arg )
		{
		drm_file_t *priv = filp->private_data;
		@@ -521,7 +521,7 @@ int drm_addbufs_agp( struct inode inode, struct file filp,
		}
		#endif /* __OS_HAS_AGP */

		int drm_addbufs_pci( struct inode inode, struct file filp,
		static int drm_addbufs_pci( struct inode inode, struct file filp,
		unsigned int cmd, unsigned long arg )
		{
		drm_file_t *priv = filp->private_data;
		@@ -751,7 +751,7 @@ int drm_addbufs_pci( struct inode inode, struct file filp,

		}

		int drm_addbufs_sg( struct inode inode, struct file filp,
		static int drm_addbufs_sg( struct inode inode, struct file filp,
		unsigned int cmd, unsigned long arg )
		{
		drm_file_t *priv = filp->private_data;