diff options
| author | David Dawes <dawes@xfree86.org> | 2002-09-11 00:57:49 +0000 |
|---|---|---|
| committer | David Dawes <dawes@xfree86.org> | 2002-09-11 00:57:49 +0000 |
| commit | c4318a5c642d15ad3847a0b7a3185abf0c1ca219 (patch) | |
| tree | 815e6cb0a77942fa13b0c3b2796c1ff7d970a75e /linux/drmP.h | |
| parent | 9797f0fd172c7d87e009dbfe7603c9df48509394 (diff) | |
- Fix various bugs in the DRI support for the i830 and i845G (Keith
Whitwell).
- Major rework of the 2D i830/i845G support, including:
- Improve VESA mode selection, and fix refresh rate selection.
- Don't duplicate functions provided in the vbe modules.
- Don't duplicate functions provided in the vgahw module.
- Rewrite memory allocation.
- Rewrite initialisation and save/restore state handling.
- Decouple the i810 support from i830 and later.
- Remove various unnecessary hacks and workarounds.
- Fix an 845G problem with the ring buffer not in pre-allocated memory.
- Fix screen blanking.
- Fix some HW cursor glitches, and turn HW cursor off at VT switch and
exit.
- Don't attempt to use the i830's function 1 entity.
- Fix problems with option handling. (David Dawes).
- Add mode VBE-aware mode handling functions to the vbe module (David
Dawes).
Diffstat (limited to 'linux/drmP.h')
| -rw-r--r-- | linux/drmP.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/linux/drmP.h b/linux/drmP.h index 799251c44..7d82fce33 100644 --- a/linux/drmP.h +++ b/linux/drmP.h @@ -53,6 +53,7 @@ #include <linux/sched.h> #include <linux/smp_lock.h> /* For (un)lock_kernel */ #include <linux/mm.h> +#include <linux/pagemap.h> #if defined(__alpha__) || defined(__powerpc__) #include <asm/pgtable.h> /* For pte_wrprotect */ #endif @@ -165,7 +166,7 @@ #define pte_unmap(pte) #endif -#if LINUX_VERSION_CODE < 0x020413 /* KERNEL_VERSION(2,4,19) */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,19) static inline struct page * vmalloc_to_page(void * vmalloc_addr) { unsigned long addr = (unsigned long) vmalloc_addr; @@ -190,7 +191,7 @@ static inline struct page * vmalloc_to_page(void * vmalloc_addr) } #endif -#if LINUX_VERSION_CODE < 0x020500 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0) #define DRM_RPR_ARG(vma) #else #define DRM_RPR_ARG(vma) vma, @@ -597,7 +598,7 @@ typedef struct drm_device { #endif struct pci_dev *pdev; #ifdef __alpha__ -#if LINUX_VERSION_CODE < 0x020403 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,3) struct pci_controler *hose; #else struct pci_controller *hose; |