diff options
author | Kyle McMartin <kyle@parisc-linux.org> | 2006-08-24 21:33:40 -0400 |
---|---|---|
committer | Matthew Wilcox <willy@parisc-linux.org> | 2006-10-04 08:50:16 -0400 |
commit | 08a6436816f7a16113c73be767ee8d50440e494e (patch) | |
tree | 158c7aba479931fb8182905151fcd0258990b9bf /include/asm-parisc | |
parent | 983daeec99f07fca0a8a9180ba1ca65bbd40c820 (diff) |
[PARISC] Add support for Quicksilver AGPGART
Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
Diffstat (limited to 'include/asm-parisc')
-rw-r--r-- | include/asm-parisc/agp.h | 25 | ||||
-rw-r--r-- | include/asm-parisc/ropes.h | 12 |
2 files changed, 37 insertions, 0 deletions
diff --git a/include/asm-parisc/agp.h b/include/asm-parisc/agp.h new file mode 100644 index 000000000000..9f61d4eb6c01 --- /dev/null +++ b/include/asm-parisc/agp.h | |||
@@ -0,0 +1,25 @@ | |||
1 | #ifndef _ASM_PARISC_AGP_H | ||
2 | #define _ASM_PARISC_AGP_H | ||
3 | |||
4 | /* | ||
5 | * PARISC specific AGP definitions. | ||
6 | * Copyright (c) 2006 Kyle McMartin <kyle@parisc-linux.org> | ||
7 | * | ||
8 | */ | ||
9 | |||
10 | #define map_page_into_agp(page) /* nothing */ | ||
11 | #define unmap_page_from_agp(page) /* nothing */ | ||
12 | #define flush_agp_mappings() /* nothing */ | ||
13 | #define flush_agp_cache() mb() | ||
14 | |||
15 | /* Convert a physical address to an address suitable for the GART. */ | ||
16 | #define phys_to_gart(x) (x) | ||
17 | #define gart_to_phys(x) (x) | ||
18 | |||
19 | /* GATT allocation. Returns/accepts GATT kernel virtual address. */ | ||
20 | #define alloc_gatt_pages(order) \ | ||
21 | ((char *)__get_free_pages(GFP_KERNEL, (order))) | ||
22 | #define free_gatt_pages(table, order) \ | ||
23 | free_pages((unsigned long)(table), (order)) | ||
24 | |||
25 | #endif /* _ASM_PARISC_AGP_H */ | ||
diff --git a/include/asm-parisc/ropes.h b/include/asm-parisc/ropes.h index 2e3de0ae04d1..5542dd00472b 100644 --- a/include/asm-parisc/ropes.h +++ b/include/asm-parisc/ropes.h | |||
@@ -1,6 +1,8 @@ | |||
1 | #ifndef _ASM_PARISC_ROPES_H_ | 1 | #ifndef _ASM_PARISC_ROPES_H_ |
2 | #define _ASM_PARISC_ROPES_H_ | 2 | #define _ASM_PARISC_ROPES_H_ |
3 | 3 | ||
4 | #include <asm-parisc/parisc-device.h> | ||
5 | |||
4 | #ifdef CONFIG_64BIT | 6 | #ifdef CONFIG_64BIT |
5 | /* "low end" PA8800 machines use ZX1 chipset: PAT PDC and only run 64-bit */ | 7 | /* "low end" PA8800 machines use ZX1 chipset: PAT PDC and only run 64-bit */ |
6 | #define ZX1_SUPPORT | 8 | #define ZX1_SUPPORT |
@@ -231,6 +233,16 @@ static inline int IS_QUICKSILVER(struct parisc_device *d) { | |||
231 | return (d->id.hversion == QUICKSILVER_HVERS); | 233 | return (d->id.hversion == QUICKSILVER_HVERS); |
232 | } | 234 | } |
233 | 235 | ||
236 | static inline int agp_mode_mercury(void __iomem *hpa) { | ||
237 | u64 bus_mode; | ||
238 | |||
239 | bus_mode = readl(hpa + 0x0620); | ||
240 | if (bus_mode & 1) | ||
241 | return 1; | ||
242 | |||
243 | return 0; | ||
244 | } | ||
245 | |||
234 | /* | 246 | /* |
235 | ** I/O SAPIC init function | 247 | ** I/O SAPIC init function |
236 | ** Caller knows where an I/O SAPIC is. LBA has an integrated I/O SAPIC. | 248 | ** Caller knows where an I/O SAPIC is. LBA has an integrated I/O SAPIC. |