diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-26 22:48:59 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-26 22:48:59 +0000 |
| commit | 46bac6d7ad1c5be6b98f8646bcb4eed5aa93e469 (patch) | |
| tree | 44777a8a902d417599c3e9abb0c70200e2aa274c /src/i830.h | |
| parent | 3ad0d9a73bc0a4f3edb858d5f3a7c36827b7a429 (diff) | |
merge latest (4.3.99.16) from XFree86 (vendor) branch
Diffstat (limited to 'src/i830.h')
| -rw-r--r-- | src/i830.h | 14 |
1 files changed, 12 insertions, 2 deletions
@@ -27,12 +27,12 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. **************************************************************************/ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i830.h,v 1.7 2003/01/28 22:47:09 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i830.h,v 1.11 2003/10/21 04:13:40 dawes Exp $ */ /* * Authors: * Keith Whitwell <keith@tungstengraphics.com> - * David Dawes <dawes@tungstengraphics.com> + * David Dawes <dawes@xfree86.org> * */ @@ -147,6 +147,7 @@ typedef struct _I830Rec { unsigned long TotalVideoRam; I830MemRange StolenMemory; /* pre-allocated memory */ unsigned long BIOSMemorySize; /* min stolen pool size */ + int BIOSMemSizeLoc; /* These change according to what has been allocated. */ long FreeMemory; @@ -182,6 +183,7 @@ typedef struct _I830Rec { Bool NeedRingBufferLow; Bool allowPageFlip; + Bool disableTiling; int auxPitch; int auxPitchBits; @@ -295,6 +297,11 @@ typedef struct _I830Rec { Bool closing; Bool suspended; + /* fbOffset converted to (x, y). */ + int xoffset; + int yoffset; + + int SaveGeneration; } I830Rec; #define I830PTR(p) ((I830Ptr)((p)->driverPrivate)) @@ -391,5 +398,8 @@ extern void I830ChangeFrontbuffer(ScrnInfoPtr pScrn,int buffer); #define ALLOCATE_DRY_RUN 0x80000000 +/* Chipset registers for VIDEO BIOS memory RW access */ +#define DRAM_RW_CONTROL 0x58 +#define DRAM_WRITE 0x33330000 #endif /* _I830_H_ */ |