summaryrefslogtreecommitdiff
path: root/src/atiregs.h
diff options
context:
space:
mode:
authorKaleb Keithley <kaleb@freedesktop.org>2003-11-25 19:28:36 +0000
committerKaleb Keithley <kaleb@freedesktop.org>2003-11-25 19:28:36 +0000
commit73105e438e90f950249cb265ba99001d4db3dc60 (patch)
treeadd0e49232de50548191a4243ed0d32cc91d1ec5 /src/atiregs.h
parent0a53864f9581196604d04fd28b4e94a9b0b73d18 (diff)
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folksxf86-4_3_99_16
Diffstat (limited to 'src/atiregs.h')
-rw-r--r--src/atiregs.h14
1 files changed, 12 insertions, 2 deletions
diff --git a/src/atiregs.h b/src/atiregs.h
index 6ef71601..943dbadd 100644
--- a/src/atiregs.h
+++ b/src/atiregs.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atiregs.h,v 1.23 2003/01/10 17:43:40 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atiregs.h,v 1.24 2003/04/23 21:51:30 tsi Exp $ */
/*
* Copyright 1994 through 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
*
@@ -2308,7 +2308,7 @@
#define FORCE_DAC_DATA_X 0xff000000ul
#define LCD_TMDS_CNTL 0x15u /* XC/XL */
#define LCD_SCRATCH_PAD_4M 0x15u /* Mobility */
-#define LCD_TMDS_SYNC_CHAR_SETA 0x16u /* XC/XL */
+#define LCD_TMDS_SYNC_CHAR_SETA 0x16u /* XC/XL */
#define LCD_SCRATCH_PAD_5M 0x16u /* Mobility */
#define LCD_TMDS_SYNC_CHAR_SETB 0x17u /* XC/XL */
#define LCD_SCRATCH_PAD_6M 0x17u /* Mobility */
@@ -2715,4 +2715,14 @@
#define MIX_AVERAGE_SAT 0x001fu
#define MIX_FN_PAINT MIX_SRC
+/* Video/Graphics mix functions for overlay */
+#define OVERLAY_MIX_FALSE 0x00u
+#define OVERLAY_MIX_TRUE 0x01u
+/* ? 0x02u */
+/* ? 0x03u */
+#define OVERLAY_MIX_NOT_EQUAL 0x04u
+#define OVERLAY_MIX_EQUAL 0x05u
+/* ? 0x06u */
+/* ? 0x07u */
+
#endif /* ___ATIREGS_H___ */