From 39a23640b2de9e59e99d48e6de8c9edae0231856 Mon Sep 17 00:00:00 2001
From: Jon Smirl <jonsmirl@yahoo.com>
Date: Fri, 5 Nov 2004 17:29:14 +0000
Subject: Move ati_pcigart shared routines into drm-core module
---
linux-core/Makefile.kernel | 2 +-
linux-core/ati_pcigart.c | 7 +++++--
linux-core/r128_drv.c | 1 -
linux-core/radeon_drv.c | 1 -
4 files changed, 6 insertions(+), 5 deletions(-)
(limited to 'linux-core')
diff --git a/linux-core/Makefile.kernel b/linux-core/Makefile.kernel
index 5a21a73f..e90c8fcf 100644
--- a/linux-core/Makefile.kernel
+++ b/linux-core/Makefile.kernel
@@ -11,7 +11,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_ioctl.o drm_irq.o \
drm_lock.o drm_memory.o drm_proc.o drm_stub.o drm_vm.o \
drm_sysfs.o drm_pci.o drm_agpsupport.o drm_scatter.o \
- drm_sysfs.o drm_memory_debug.o
+ drm_sysfs.o drm_memory_debug.o ati_pcigart.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
diff --git a/linux-core/ati_pcigart.c b/linux-core/ati_pcigart.c
index 19d03592..66ca47c0 100644
--- a/linux-core/ati_pcigart.c
+++ b/linux-core/ati_pcigart.c
@@ -1,5 +1,5 @@
/**
- * \file ati_pcigart.h
+ * \file ati_pcigart.h
* ATI PCI GART support
*
* \author Gareth Hughes <gareth@valinux.com>
@@ -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 unsigned long drm_ati_alloc_pcigart_table(void)
+unsigned long drm_ati_alloc_pcigart_table(void)
{
unsigned long address;
struct page *page;
@@ -167,6 +167,7 @@ int drm_ati_pcigart_init(drm_device_t * dev,
*bus_addr = bus_address;
return ret;
}
+EXPORT_SYMBOL(drm_ati_pcigart_init);
int drm_ati_pcigart_cleanup(drm_device_t * dev,
unsigned long addr, dma_addr_t bus_addr)
@@ -203,3 +204,5 @@ int drm_ati_pcigart_cleanup(drm_device_t * dev,
return 1;
}
+EXPORT_SYMBOL(drm_ati_pcigart_cleanup);
+
diff --git a/linux-core/r128_drv.c b/linux-core/r128_drv.c
index 0a34625a..2da872b5 100644
--- a/linux-core/r128_drv.c
+++ b/linux-core/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"
diff --git a/linux-core/radeon_drv.c b/linux-core/radeon_drv.c
index fbf6b23a..ed051a5a 100644
--- a/linux-core/radeon_drv.c
+++ b/linux-core/radeon_drv.c
@@ -34,7 +34,6 @@
#include "drm.h"
#include "radeon_drm.h"
#include "radeon_drv.h"
-#include "ati_pcigart.h"
#include "drm_pciids.h"
--
cgit v1.2.3