summaryrefslogtreecommitdiff
path: root/src/i830.h
diff options
context:
space:
mode:
authorKeith Packard <keithp@mandolin.keithp.com>2007-01-02 00:09:35 -0800
committerKeith Packard <keithp@mandolin.keithp.com>2007-01-02 00:09:35 -0800
commit237847007afb5a429a50b6aa0b1acc239326571b (patch)
treea3dc3d9ca0ec5dc1782df5a22c3ffdfdcab6f6e8 /src/i830.h
parent25d5a892319b02dc6eb81390dea29cd88a1e7da4 (diff)
Make driver build and run on Xorg 7.1. Delay DSP*BASE setting until last.
Autodetect libdrm version, disable new memory manager on older libraries. Move new M_T_ defines from i830.h to i830_xf86Crtc.h. Add many system headers to define functions. Use i830PipeSetBase at end of mode setting code to set DSP*BASE and flush changes. Don't duplicate PipeSetBase call from screen init function. Make initial RandR configuration code usable on older versions of extension so the server doesn't start in a panning mode. Use xfree instead of free in i830_tv.c.
Diffstat (limited to 'src/i830.h')
-rw-r--r--src/i830.h8
1 files changed, 0 insertions, 8 deletions
diff --git a/src/i830.h b/src/i830.h
index 06f68384..c2670cda 100644
--- a/src/i830.h
+++ b/src/i830.h
@@ -628,14 +628,6 @@ void i830_tv_init(ScrnInfoPtr pScrn);
#define _845_DRAM_RW_CONTROL 0x90
#define DRAM_WRITE 0x33330000
-/* Compat definitions for older X Servers. */
-#ifndef M_T_PREFERRED
-#define M_T_PREFERRED 0x08
-#endif
-#ifndef M_T_DRIVER
-#define M_T_DRIVER 0x40
-#endif
-
/*
* Xserver MM compatibility. Remove code guarded by this when the
* XServer contains the libdrm mm code