summaryrefslogtreecommitdiff
path: root/src/nv_type.h
diff options
context:
space:
mode:
authorAlan Coopersmith <Alan.Coopersmith@sun.com>2004-12-10 03:56:42 +0000
committerAlan Coopersmith <Alan.Coopersmith@sun.com>2004-12-10 03:56:42 +0000
commit67c89797f62ea53b37927c64e0403e7e7c42de56 (patch)
tree21a3996f2f9a7e928860eb771335c0ad8b57ecf5 /src/nv_type.h
parent7c34d051168eba499beb20c40fd95703375f4c7b (diff)
Bugzilla #1985 <https://bugs.freedesktop.org/show_bug.cgi?id=1985> sync toxprint_packagertest_20041217_basexprint_packagertest_20041217
12/08/04 version of Nvidia driver from Mark Vojkovich, including these fixes since last sync: Fix some DAC/Graphics memory contention issues on newer NVIDIA chips (specifically, NV40). More PCI IDs. Also, I've had trouble getting some panels to work automagically so I expose an FPTweak option to let the user adjust a troublesome register.
Diffstat (limited to 'src/nv_type.h')
-rw-r--r--src/nv_type.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/nv_type.h b/src/nv_type.h
index 96ca4e4..690366e 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.48 2004/08/26 22:38:47 mvojkovi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_type.h,v 1.50 2004/12/09 00:21:05 mvojkovi Exp $ */
#ifndef __NV_STRUCT_H__
#define __NV_STRUCT_H__
@@ -44,6 +44,7 @@ typedef struct _riva_hw_state
U032 scale;
U032 dither;
U032 extra;
+ U032 fifo;
U032 pixel;
U032 horiz;
U032 arbitration0;
@@ -67,6 +68,7 @@ typedef struct _riva_hw_state
U032 timingH;
U032 timingV;
U032 displayV;
+ U032 crtcSync;
} RIVA_HW_STATE, *NVRegPtr;
@@ -157,6 +159,8 @@ typedef struct {
int fpWidth;
int fpHeight;
CARD32 fpSyncs;
+ Bool usePanelTweak;
+ int PanelTweak;
CARD32 dmaPut;
CARD32 dmaCurrent;