Get bus_address of PCI buffers in DRM(addbufs_pci) for Linux and remove

    DRM_VTOPHYS() macro. For now this is done with virt_to_bus() until the
    consistent PCI interface is used. Add drm_pci.h to Makefile.linux,
    merge cleanup of unused vars in drm_proc.h from trunk.

13 files changed, 5 insertions, 33 deletions

diff --git a/bsd-core/drm_os_freebsd.h b/bsd-core/drm_os_freebsd.h
index b4d2ceeb..52f7aa2a 100644
--- a/bsd-core/drm_os_freebsd.h
+++ b/bsd-core/drm_os_freebsd.h
@@ -115,7 +115,6 @@
 #define DRM_DEVICE		drm_device_t	*dev	= kdev->si_drv1
 #define DRM_MALLOC(size)	malloc( size, DRM(M_DRM), M_NOWAIT )
 #define DRM_FREE(pt,size)		free( pt, DRM(M_DRM) )
-#define DRM_VTOPHYS(addr)	vtophys(addr)
 
 /* Read/write from bus space, with byteswapping to le if necessary */
 #define DRM_READ8(map, offset)		*(volatile u_int8_t *) (((unsigned long)(map)->handle) + (offset))
diff --git a/bsd-core/drm_os_netbsd.h b/bsd-core/drm_os_netbsd.h
index 779f43ba..6dfea613 100644
--- a/bsd-core/drm_os_netbsd.h
+++ b/bsd-core/drm_os_netbsd.h
@@ -95,7 +95,6 @@ extern const int DRM(M_DRM) = M_DEVBUF;
 #endif /* __NetBSD_Version__ */
 #define DRM_MALLOC(size)	malloc( size, DRM(M_DRM), M_NOWAIT )
 #define DRM_FREE(pt,size)		free( pt, DRM(M_DRM) )
-#define DRM_VTOPHYS(addr)	vtophys(addr)
 
 #define DRM_READ8(map, offset)		bus_space_read_1(  (map)->iot, (map)->ioh, (offset) )
 #define DRM_READ32(map, offset)		bus_space_read_4(  (map)->iot, (map)->ioh, (offset) )
diff --git a/bsd/drm_os_freebsd.h b/bsd/drm_os_freebsd.h
index b4d2ceeb..52f7aa2a 100644
--- a/bsd/drm_os_freebsd.h
+++ b/bsd/drm_os_freebsd.h
@@ -115,7 +115,6 @@
 #define DRM_DEVICE		drm_device_t	*dev	= kdev->si_drv1
 #define DRM_MALLOC(size)	malloc( size, DRM(M_DRM), M_NOWAIT )
 #define DRM_FREE(pt,size)		free( pt, DRM(M_DRM) )
-#define DRM_VTOPHYS(addr)	vtophys(addr)
 
 /* Read/write from bus space, with byteswapping to le if necessary */
 #define DRM_READ8(map, offset)		*(volatile u_int8_t *) (((unsigned long)(map)->handle) + (offset))
diff --git a/bsd/drm_os_netbsd.h b/bsd/drm_os_netbsd.h
index 779f43ba..6dfea613 100644
--- a/bsd/drm_os_netbsd.h
+++ b/bsd/drm_os_netbsd.h
@@ -95,7 +95,6 @@ extern const int DRM(M_DRM) = M_DEVBUF;
 #endif /* __NetBSD_Version__ */
 #define DRM_MALLOC(size)	malloc( size, DRM(M_DRM), M_NOWAIT )
 #define DRM_FREE(pt,size)		free( pt, DRM(M_DRM) )
-#define DRM_VTOPHYS(addr)	vtophys(addr)
 
 #define DRM_READ8(map, offset)		bus_space_read_1(  (map)->iot, (map)->ioh, (offset) )
 #define DRM_READ32(map, offset)		bus_space_read_4(  (map)->iot, (map)->ioh, (offset) )
diff --git a/linux-core/drm_bufs.c b/linux-core/drm_bufs.c
index 84a9a611..ed776be4 100644
--- a/linux-core/drm_bufs.c
+++ b/linux-core/drm_bufs.c
@@ -626,6 +626,7 @@ int DRM(addbufs_pci)( struct inode *inode, struct file *filp,
 			buf->used    = 0;
 			buf->offset  = (dma->byte_count + byte_count + offset);
 			buf->address = (void *)(page + offset);
+			buf->bus_address = virt_to_bus(buf->address);
 			buf->next    = NULL;
 			buf->waiting = 0;
 			buf->pending = 0;
diff --git a/linux-core/drm_os_linux.h b/linux-core/drm_os_linux.h
index 68446d47..e804399a 100644
--- a/linux-core/drm_os_linux.h
+++ b/linux-core/drm_os_linux.h
@@ -18,7 +18,6 @@
 #define DRM_DEVICE	drm_file_t	*priv	= filp->private_data; \
 			drm_device_t	*dev	= priv->dev
 
-#define DRM_VTOPHYS(x)	virt_to_bus(x)
 #define DRM_IRQ_ARGS	        int irq, void *arg, struct pt_regs *regs
 #define DRM_TASKQUEUE_ARGS	void *arg
 
diff --git a/linux-core/drm_proc.c b/linux-core/drm_proc.c
index 9f4a7fae..f73b7ccd 100644
--- a/linux-core/drm_proc.c
+++ b/linux-core/drm_proc.c
@@ -379,8 +379,6 @@ static int DRM(clients_info)(char *buf, char **start, off_t offset,
 
 #if DRM_DEBUG_CODE
 
-#define DRM_VMA_VERBOSE 0
-
 static int DRM(_vma_info)(char *buf, char **start, off_t offset, int request,
 			  int *eof, void *data)
 {
@@ -388,13 +386,6 @@ static int DRM(_vma_info)(char *buf, char **start, off_t offset, int request,
 	int                   len  = 0;
 	drm_vma_entry_t	      *pt;
 	struct vm_area_struct *vma;
-#if DRM_VMA_VERBOSE
-	unsigned long	      i;
-	unsigned long	      address;
-	pgd_t		      *pgd;
-	pmd_t		      *pmd;
-	pte_t		      *pte;
-#endif
 #if defined(__i386__)
 	unsigned int	      pgprot;
 #endif
diff --git a/linux/Makefile.linux b/linux/Makefile.linux
index 880cb90b..a21be848 100644
--- a/linux/Makefile.linux
+++ b/linux/Makefile.linux
@@ -59,7 +59,7 @@ DRM_MODULES ?= $(MODULE_LIST)
 
 DRMTEMPLATES =  drm_auth.h drm_bufs.h drm_context.h drm_dma.h drm_drawable.h \
                 drm_drv.h drm_fops.h drm_init.h drm_ioctl.h \
-                drm_lock.h drm_memory.h drm_proc.h drm_stub.h drm_vm.h
+                drm_lock.h drm_memory.h drm_pci.h drm_proc.h drm_stub.h drm_vm.h
 
 DRMSHARED =     drm_sarea.h
 DRMHEADERS =    drm.h drmP.h $(DRMSHARED)
diff --git a/linux/drm_bufs.h b/linux/drm_bufs.h
index 84a9a611..ed776be4 100644
--- a/linux/drm_bufs.h
+++ b/linux/drm_bufs.h
@@ -626,6 +626,7 @@ int DRM(addbufs_pci)( struct inode *inode, struct file *filp,
 			buf->used    = 0;
 			buf->offset  = (dma->byte_count + byte_count + offset);
 			buf->address = (void *)(page + offset);
+			buf->bus_address = virt_to_bus(buf->address);
 			buf->next    = NULL;
 			buf->waiting = 0;
 			buf->pending = 0;
diff --git a/linux/drm_os_linux.h b/linux/drm_os_linux.h
index 68446d47..e804399a 100644
--- a/linux/drm_os_linux.h
+++ b/linux/drm_os_linux.h
@@ -18,7 +18,6 @@
 #define DRM_DEVICE	drm_file_t	*priv	= filp->private_data; \
 			drm_device_t	*dev	= priv->dev
 
-#define DRM_VTOPHYS(x)	virt_to_bus(x)
 #define DRM_IRQ_ARGS	        int irq, void *arg, struct pt_regs *regs
 #define DRM_TASKQUEUE_ARGS	void *arg
 
diff --git a/linux/drm_proc.h b/linux/drm_proc.h
index 9f4a7fae..f73b7ccd 100644
--- a/linux/drm_proc.h
+++ b/linux/drm_proc.h
@@ -379,8 +379,6 @@ static int DRM(clients_info)(char *buf, char **start, off_t offset,
 
 #if DRM_DEBUG_CODE
 
-#define DRM_VMA_VERBOSE 0
-
 static int DRM(_vma_info)(char *buf, char **start, off_t offset, int request,
 			  int *eof, void *data)
 {
@@ -388,13 +386,6 @@ static int DRM(_vma_info)(char *buf, char **start, off_t offset, int request,
 	int                   len  = 0;
 	drm_vma_entry_t	      *pt;
 	struct vm_area_struct *vma;
-#if DRM_VMA_VERBOSE
-	unsigned long	      i;
-	unsigned long	      address;
-	pgd_t		      *pgd;
-	pmd_t		      *pmd;
-	pte_t		      *pte;
-#endif
 #if defined(__i386__)
 	unsigned int	      pgprot;
 #endif
diff --git a/shared-core/mach64_drv.h b/shared-core/mach64_drv.h
index 00349d01..b0f71c64 100644
--- a/shared-core/mach64_drv.h
+++ b/shared-core/mach64_drv.h
@@ -791,10 +791,7 @@ do {									\
 	((u32 *)(__buf)->address) : 					\
 	((u32 *)((char *)dev_priv->buffers->handle + (__buf)->offset)))
 
-#define GETBUFADDR( __buf )				\
-((dev_priv->is_pci) ? 					\
-	((u32)DRM_VTOPHYS((void *)(__buf)->address)) : 	\
-	((u32)(__buf)->bus_address))
+#define GETBUFADDR( __buf ) ((u32)(__buf)->bus_address)
 
 #define GETRINGOFFSET() (_entry->ring_ofs)
 
diff --git a/shared/mach64_drv.h b/shared/mach64_drv.h
index 00349d01..b0f71c64 100644
--- a/shared/mach64_drv.h
+++ b/shared/mach64_drv.h
@@ -791,10 +791,7 @@ do {									\
 	((u32 *)(__buf)->address) : 					\
 	((u32 *)((char *)dev_priv->buffers->handle + (__buf)->offset)))
 
-#define GETBUFADDR( __buf )				\
-((dev_priv->is_pci) ? 					\
-	((u32)DRM_VTOPHYS((void *)(__buf)->address)) : 	\
-	((u32)(__buf)->bus_address))
+#define GETBUFADDR( __buf ) ((u32)(__buf)->bus_address)
 
 #define GETRINGOFFSET() (_entry->ring_ofs)