diff options
| author | Dave Airlie <airlied@linux.ie> | 2004-04-12 05:27:40 +0000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2004-04-12 05:27:40 +0000 |
| commit | 873e1c4d38c78e8b4a5df42d983f285cfb3ae4cc (patch) | |
| tree | c5659d6186bc4e3b6e8811ba6677389d09153ccb /linux-core | |
| parent | 7e39628577d7478644c51bba2ef1d5e2e029bbbb (diff) | |
Add mach64 to the trunk
Diffstat (limited to 'linux-core')
| -rw-r--r-- | linux-core/Kconfig | 12 | ||||
| -rw-r--r-- | linux-core/Makefile.kernel | 7 | ||||
| -rw-r--r-- | linux-core/drmP.h | 6 |
3 files changed, 24 insertions, 1 deletions
diff --git a/linux-core/Kconfig b/linux-core/Kconfig index e45e723b..0dd10b8d 100644 --- a/linux-core/Kconfig +++ b/linux-core/Kconfig @@ -88,3 +88,15 @@ config DRM_VIA Choose this option if you have a Via unichrome or compatible video chipset. If M is selected the module will be called via. +config DRM_MACH64 + tristate "ATI Rage Pro (Mach64)" + depends on DRM + help + Choose this option if you have an ATI Rage Pro (mach64 chipset) + graphics card. Example cards include: 3D Rage Pro, Xpert 98, + 3D Rage LT Pro, 3D Rage XL/XC, and 3D Rage Mobility (P/M, M1). + Cards earlier than ATI Rage Pro (e.g. Rage II) are not supported. + If M is selected, the module will be called mach64. AGP support for + this card is strongly suggested (unless you have a PCI version). + + diff --git a/linux-core/Makefile.kernel b/linux-core/Makefile.kernel index bcb0f92c..3f467384 100644 --- a/linux-core/Makefile.kernel +++ b/linux-core/Makefile.kernel @@ -18,6 +18,7 @@ sis-objs := sis_drv.o sis_ds.o sis_mm.o ffb-objs := ffb_drv.o ffb_context.o savage-objs := savage_drv.o savage_dma.o via-objs := via_irq.o via_drv.o via_ds.o via_map.o via_mm.o +mach64-objs := mach64_drv.o mach64_dma.o mach64_irq.o mach64_state.o # Kernel version checks @@ -33,7 +34,7 @@ endif ifeq ($(BELOW25),y) O_TARGET := drm.o list-multi := gamma.o tdfx.o r128.o mga.o i810.o i830.o ffb.o radeon.o \ - savage.o via.o + savage.o via.o mach64.o obj-m := obj-n := obj- := @@ -51,6 +52,7 @@ obj-$(CONFIG_DRM_SIS) += sis.o obj-$(CONFIG_DRM_FFB) += ffb.o obj-$(CONFIG_DRM_SAVAGE)+= savage.o obj-$(CONFIG_DRM_VIA) += via.o +obj-$(CONFIG_DRM_MACH64)+= mach64.o ifeq ($(BELOW2552),y) include $(TOPDIR)/Rules.make @@ -90,5 +92,8 @@ savage.o: $(savage-objs) $(lib) via.o: $(via-objs) $(lib) $(LD) -r -o $@ $(via-objs) $(lib) +mach64.o: $(mach64-objs) $(lib) + $(LD) -r -o $@ $(mach64-objs) $(lib) + endif diff --git a/linux-core/drmP.h b/linux-core/drmP.h index c61bac1d..09556b89 100644 --- a/linux-core/drmP.h +++ b/linux-core/drmP.h @@ -1057,6 +1057,12 @@ extern int DRM(ati_pcigart_cleanup)(drm_device_t *dev, unsigned long addr, dma_addr_t bus_addr); +extern void *DRM(pci_alloc)(drm_device_t *dev, size_t size, + size_t align, dma_addr_t maxaddr, + dma_addr_t *busaddr); +extern void DRM(pci_free)(drm_device_t *dev, size_t size, + void *vaddr, dma_addr_t busaddr); + /*@}*/ #endif /* __KERNEL__ */ |