summaryrefslogtreecommitdiff
path: root/src/atistruct.h
diff options
context:
space:
mode:
authorDave Airlie <airlied@linux.ie>2005-03-26 00:53:01 +0000
committerDave Airlie <airlied@linux.ie>2005-03-26 00:53:01 +0000
commit04cbb8d174cc5e3c7ecdd4e171170213ecb3c7ed (patch)
treec10f24d28e53dba3db25540f774f3ae1c98f6ab0 /src/atistruct.h
parent5be4bf9000bdf58584a10a6b8e285d0f173304fa (diff)
bugzilla #2057 (https://bugs.freedesktop.org/show_bug.cgi?id=2057)
attachment #1516 (https://bugs.freedesktop.org/attachment.cgi?id=1516) Add TVOUT Support for Mach64 (Leif Delgass, fixed up for Xorg by me).
Diffstat (limited to 'src/atistruct.h')
-rw-r--r--src/atistruct.h20
1 files changed, 20 insertions, 0 deletions
diff --git a/src/atistruct.h b/src/atistruct.h
index 87ff0a1..edee9e3 100644
--- a/src/atistruct.h
+++ b/src/atistruct.h
@@ -46,6 +46,12 @@
#endif /* XF86DRI_DEVEL */
+#ifdef TV_OUT
+
+#include "vbe.h"
+
+#endif /* TV_OUT */
+
#include "xaa.h"
#include "xf86Cursor.h"
#include "xf86Pci.h"
@@ -436,6 +442,13 @@ typedef struct _ATIRec
CARD8 OptionLinear:1; /* Use linear fb aperture when available */
#endif /* AVOID_CPIO */
+
+#ifdef TV_OUT
+
+ CARD8 OptionTvOut; /* Enable TV out if TV is connected */
+ CARD8 OptionTvStd; /* Requested TV standard - see ATITVStandard enum in atioption.h */
+
+#endif /* TV_OUT */
CARD8 OptionMMIOCache:1; /* Cache MMIO writes */
CARD8 OptionTestMMIOCache:1;/* Test MMIO cache integrity */
@@ -485,6 +498,13 @@ typedef struct _ATIRec
#endif /* XF86DRI_DEVEL */
+#ifdef TV_OUT
+ /* TV out */
+ vbeInfoPtr pVBE;
+ xf86Int10InfoPtr pInt10;
+ int vbemode; /* saved text mode */
+ Bool tvActive;
+#endif /* TV_OUT */
} ATIRec;
#define ATIPTR(_p) ((ATIPtr)((_p)->driverPrivate))