Commit 888c4893 authored by Dave Airlie's avatar Dave Airlie

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: default avatarDave Airlie <airlied@linux.ie>
parent 982d0968
No related merge requests found
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
drm-objs := drm_auth.o drm_bufs.o drm_context.o drm_dma.o drm_drawable.o \ 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_init.o drm_ioctl.o drm_irq.o \
drm_lock.o drm_memory.o drm_proc.o drm_stub.o drm_vm.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 gamma-objs := gamma_drv.o gamma_dma.o
tdfx-objs := tdfx_drv.o tdfx-objs := tdfx_drv.o
......
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
# define ATI_MAX_PCIGART_PAGES 8192 /**< 32 MB aperture, 4K pages */ # define ATI_MAX_PCIGART_PAGES 8192 /**< 32 MB aperture, 4K pages */
# define ATI_PCIGART_PAGE_SIZE 4096 /**< PCI GART page size */ # 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; unsigned long address;
struct page *page; struct page *page;
...@@ -75,7 +75,7 @@ static inline unsigned long drm_ati_alloc_pcigart_table( void ) ...@@ -75,7 +75,7 @@ static inline unsigned long drm_ati_alloc_pcigart_table( void )
return address; 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; struct page *page;
int i; int i;
...@@ -91,7 +91,7 @@ static inline void drm_ati_free_pcigart_table( unsigned long address ) ...@@ -91,7 +91,7 @@ static inline void drm_ati_free_pcigart_table( unsigned long address )
free_pages( address, ATI_PCIGART_TABLE_ORDER ); 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, unsigned long addr,
dma_addr_t bus_addr) dma_addr_t bus_addr)
{ {
...@@ -126,8 +126,9 @@ static inline int drm_ati_pcigart_cleanup( drm_device_t *dev, ...@@ -126,8 +126,9 @@ static inline int drm_ati_pcigart_cleanup( drm_device_t *dev,
return 1; 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, unsigned long *addr,
dma_addr_t *bus_addr) dma_addr_t *bus_addr)
{ {
...@@ -204,4 +205,4 @@ static inline int drm_ati_pcigart_init( drm_device_t *dev, ...@@ -204,4 +205,4 @@ static inline int drm_ati_pcigart_init( drm_device_t *dev,
*bus_addr = bus_address; *bus_addr = bus_address;
return ret; return ret;
} }
EXPORT_SYMBOL(drm_ati_pcigart_init);
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
#include "drm.h" #include "drm.h"
#include "r128_drm.h" #include "r128_drm.h"
#include "r128_drv.h" #include "r128_drv.h"
#include "ati_pcigart.h"
#define R128_FIFO_DEBUG 0 #define R128_FIFO_DEBUG 0
......
...@@ -34,7 +34,6 @@ ...@@ -34,7 +34,6 @@
#include "drm.h" #include "drm.h"
#include "r128_drm.h" #include "r128_drm.h"
#include "r128_drv.h" #include "r128_drv.h"
#include "ati_pcigart.h"
#include "drm_pciids.h" #include "drm_pciids.h"
......
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
#include "drm.h" #include "drm.h"
#include "radeon_drm.h" #include "radeon_drm.h"
#include "radeon_drv.h" #include "radeon_drv.h"
#include "ati_pcigart.h"
#define RADEON_FIFO_DEBUG 0 #define RADEON_FIFO_DEBUG 0
......
...@@ -35,7 +35,6 @@ ...@@ -35,7 +35,6 @@
#include "drm.h" #include "drm.h"
#include "radeon_drm.h" #include "radeon_drm.h"
#include "radeon_drv.h" #include "radeon_drv.h"
#include "ati_pcigart.h"
#include "drm_pciids.h" #include "drm_pciids.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment