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_local.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_local.h')
| -rw-r--r-- | src/nv_local.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/nv_local.h b/src/nv_local.h index dc29a6f..ed58ef4 100644 --- a/src/nv_local.h +++ b/src/nv_local.h @@ -36,7 +36,7 @@ |* those rights set forth herein. *| |* *| \***************************************************************************/ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_local.h,v 1.8 2003/07/31 20:24:29 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_local.h,v 1.8tsi Exp $ */ #ifndef __NV_LOCAL_H__ #define __NV_LOCAL_H__ @@ -60,12 +60,12 @@ typedef unsigned int U032; /* * HW access macros. These assume memory-mapped I/O, and not normal I/O space. */ -#define NV_WR08(p,i,d) MMIO_OUT8((volatile pointer)(p), (i), (d)) -#define NV_RD08(p,i) MMIO_IN8((volatile pointer)(p), (i)) -#define NV_WR16(p,i,d) MMIO_OUT16((volatile pointer)(p), (i), (d)) -#define NV_RD16(p,i) MMIO_IN16((volatile pointer)(p), (i)) -#define NV_WR32(p,i,d) MMIO_OUT32((volatile pointer)(p), (i), (d)) -#define NV_RD32(p,i) MMIO_IN32((volatile pointer)(p), (i)) +#define NV_WR08(p,i,d) MMIO_OUT8((pointer)(p), (i), (d)) +#define NV_RD08(p,i) MMIO_IN8((pointer)(p), (i)) +#define NV_WR16(p,i,d) MMIO_OUT16((pointer)(p), (i), (d)) +#define NV_RD16(p,i) MMIO_IN16((pointer)(p), (i)) +#define NV_WR32(p,i,d) MMIO_OUT32((pointer)(p), (i), (d)) +#define NV_RD32(p,i) MMIO_IN32((pointer)(p), (i)) /* VGA I/O is now always done through MMIO */ #define VGA_WR08(p,i,d) NV_WR08(p,i,d) |