drm: move ati_pcigart into drm core

This moves the ati_pcigart code into the drm core.

From: Jon Smirl <jonsmirl@gmail.com>
Signed-off-by: Dave Airlie <airlied@linux.ie>

drivers/char/drm/Makefile

@@ -5,7 +5,7 @@
 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_lock.o drm_memory.o drm_proc.o drm_stub.o drm_vm.o \
-		drm_agpsupport.o drm_scatter.o
+		drm_agpsupport.o drm_scatter.o ati_pcigart.o
 
 gamma-objs  := gamma_drv.o gamma_dma.o
 tdfx-objs   := tdfx_drv.o

drivers/char/drm/ati_pcigart.h → drivers/char/drm/ati_pcigart.c

@@ -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 inline unsigned long drm_ati_alloc_pcigart_table( void )
+unsigned long drm_ati_alloc_pcigart_table( void )
 {
 	unsigned long address;
 	struct page *page;
@@ -75,7 +75,7 @@ static inline unsigned long drm_ati_alloc_pcigart_table( void )
 	return address;
 }
 
-static inline void drm_ati_free_pcigart_table( unsigned long address )
+static void drm_ati_free_pcigart_table( unsigned long address )
 {
 	struct page *page;
 	int i;
@@ -91,7 +91,7 @@ static inline void drm_ati_free_pcigart_table( unsigned long address )
 	free_pages( address, ATI_PCIGART_TABLE_ORDER );
 }
 
-static inline int drm_ati_pcigart_cleanup( drm_device_t *dev,
+int drm_ati_pcigart_cleanup( drm_device_t *dev,
 			      unsigned long addr,
 			      dma_addr_t bus_addr)
 {
@@ -126,8 +126,9 @@ static inline int drm_ati_pcigart_cleanup( drm_device_t *dev,
 
 	return 1;
 }
+EXPORT_SYMBOL(drm_ati_pcigart_cleanup);
 
-static inline int drm_ati_pcigart_init( drm_device_t *dev,
+int drm_ati_pcigart_init( drm_device_t *dev,
 			   unsigned long *addr,
 			   dma_addr_t *bus_addr)
 {
@@ -204,4 +205,4 @@ static inline int drm_ati_pcigart_init( drm_device_t *dev,
 	*bus_addr = bus_address;
 	return ret;
 }
-
+EXPORT_SYMBOL(drm_ati_pcigart_init);

drivers/char/drm/r128_cce.c

@@ -32,7 +32,6 @@
 #include "drm.h"
 #include "r128_drm.h"
 #include "r128_drv.h"
-#include "ati_pcigart.h"
 
 #define R128_FIFO_DEBUG		0
 

drivers/char/drm/r128_drv.c

@@ -34,7 +34,6 @@
 #include "drm.h"
 #include "r128_drm.h"
 #include "r128_drv.h"
-#include "ati_pcigart.h"
 
 #include "drm_pciids.h"
 

drivers/char/drm/radeon_cp.c

@@ -32,7 +32,6 @@
 #include "drm.h"
 #include "radeon_drm.h"
 #include "radeon_drv.h"
-#include "ati_pcigart.h"
 
 #define RADEON_FIFO_DEBUG	0
 

drivers/char/drm/radeon_drv.c

@@ -35,7 +35,6 @@
 #include "drm.h"
 #include "radeon_drm.h"
 #include "radeon_drv.h"
-#include "ati_pcigart.h"
 
 #include "drm_pciids.h"