diff options
| author | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2004-11-14 18:13:27 +0000 |
|---|---|---|
| committer | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2004-11-14 18:13:27 +0000 |
| commit | 2b3cb71eb2cdd71bda3e3e0072fc3df9f111e0a4 (patch) | |
| tree | aa18cc2d85832737cedd3a1f08f9e996cb9cfd33 /src/nv_type.h | |
| parent | bbafc6d2fcb21671de3cfb4ff973409405162e7a (diff) | |
(Bugzilla #1777) Import Mark Vojkovich's changes to NV driver since last
sync with XFree86, including: Support for new NVIDIA chips. Egbert has
a laptop that needs some DPMS ordering reversed. New chip support and
workaround for Toshiba M30 laptop issue. PCI-Xpress chip support. DPMS
support for DVI. Cursor changes for NV11 so that alpha blended cursors
will work in conjunction with dithering (laptop panels). It previously
did not. HW support for alpha blended stretch blits on NV5 and higher,
though nothing is using them at this point. Add support for VBlank
syncing the Xv Blit adaptor on hardware that supports it (NV11 and
higher). Make console restoration a little more robust. We were making
an assumption that failed on a newer laptop. Workaround for some NV31
DVI artifacts.
Also add nVidia license statement to nv man page to comply with requirement
that it appear in "user documentation"
Diffstat (limited to 'src/nv_type.h')
| -rw-r--r-- | src/nv_type.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/nv_type.h b/src/nv_type.h index 5730cb5..96ca4e4 100644 --- a/src/nv_type.h +++ b/src/nv_type.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_type.h,v 1.44 2003/09/08 20:00:27 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_type.h,v 1.48 2004/08/26 22:38:47 mvojkovi Exp $ */ #ifndef __NV_STRUCT_H__ #define __NV_STRUCT_H__ @@ -13,6 +13,7 @@ #define NV_ARCH_10 0x10 #define NV_ARCH_20 0x20 #define NV_ARCH_30 0x30 +#define NV_ARCH_40 0x40 #define BITMASK(t,b) (((unsigned)(1U << (((t)-(b)+1)))-1) << (b)) @@ -63,6 +64,9 @@ typedef struct _riva_hw_state U032 cursor0; U032 cursor1; U032 cursor2; + U032 timingH; + U032 timingV; + U032 displayV; } RIVA_HW_STATE, *NVRegPtr; @@ -88,6 +92,7 @@ typedef struct { CARD32 ScratchBufferStart; Bool NoAccel; Bool HWCursor; + Bool FpScale; Bool ShadowFB; unsigned char * ShadowPtr; int ShadowPitch; @@ -151,6 +156,7 @@ typedef struct { Bool fpScaler; int fpWidth; int fpHeight; + CARD32 fpSyncs; CARD32 dmaPut; CARD32 dmaCurrent; @@ -159,6 +165,8 @@ typedef struct { CARD32 *dmaBase; CARD32 currentRop; + Bool WaitVSyncPossible; + Bool BlendingPossible; } NVRec, *NVPtr; #define NVPTR(p) ((NVPtr)((p)->driverPrivate)) |