diff options
| author | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2004-11-10 02:53:44 +0000 |
|---|---|---|
| committer | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2004-11-10 02:53:44 +0000 |
| commit | 7c34d051168eba499beb20c40fd95703375f4c7b (patch) | |
| tree | 4a2367c446ef7a9852ff80ad750bf5bd3ed264eb /src/nv_dma.h | |
| parent | fcd6d7b57edb4e396189a0a2683bcf08974f3b59 (diff) | |
(Bugzilla #1777) Import Mark Vojkovich's changes to NV driver since lastxprint_packagertest_20041125_basexprint_packagertest_20041125
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_dma.h')
| -rw-r--r-- | src/nv_dma.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/nv_dma.h b/src/nv_dma.h index 15b222f..ca0bf1b 100644 --- a/src/nv_dma.h +++ b/src/nv_dma.h @@ -38,7 +38,7 @@ |* *| \***************************************************************************/ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_dma.h,v 1.1 2003/07/31 20:24:29 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_dma.h,v 1.4 2004/03/20 01:52:16 mvojkovi Exp $ */ #define SURFACE_FORMAT 0x00000300 #define SURFACE_FORMAT_DEPTH8 0x00000001 @@ -145,9 +145,15 @@ #define STRETCH_BLIT_FORMAT_DEPTH8 0x00000004 #define STRETCH_BLIT_FORMAT_DEPTH16 0x00000007 #define STRETCH_BLIT_FORMAT_DEPTH24 0x00000004 +#define STRETCH_BLIT_FORMAT_A8R8G8B8 0x00000003 #define STRETCH_BLIT_FORMAT_X8R8G8B8 0x00000004 #define STRETCH_BLIT_FORMAT_YUYV 0x00000005 #define STRETCH_BLIT_FORMAT_UYVY 0x00000006 +/* STRETCH_BLIT_OPERATION is only supported on TNT2 and newer */ +#define STRETCH_BLIT_OPERATION 0x0000E304 +#define STRETCH_BLIT_OPERATION_ROP 0x00000001 +#define STRETCH_BLIT_OPERATION_COPY 0x00000003 +#define STRETCH_BLIT_OPERATION_BLEND 0x00000002 #define STRETCH_BLIT_CLIP_POINT 0x0000E308 #define STRETCH_BLIT_CLIP_POINT_X 15:0 #define STRETCH_BLIT_CLIP_POINT_Y 31:16 |