summaryrefslogtreecommitdiff
path: root/src/nvreg.h
diff options
context:
space:
mode:
authorStuart Bennett <sb476@cam.ac.uk>2009-01-19 01:51:21 +0000
committerStuart Bennett <sb476@cam.ac.uk>2009-01-19 16:37:46 +0000
commit767fcea420fc21c5b5ec6c9f2db56c1a667db306 (patch)
treefe3e70424ebe3ae2a07ffe7375050f291e41fe16 /src/nvreg.h
parent985ac728276633d14fa5577eacbc2095582b2587 (diff)
randr12: no mmiotrace indication that the blob ever clears these bits
some hardware drops them on readback, but I don't think that matters also make defined bits shifts comprehensible
Diffstat (limited to 'src/nvreg.h')
-rw-r--r--src/nvreg.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/nvreg.h b/src/nvreg.h
index 0a2e561..10a999f 100644
--- a/src/nvreg.h
+++ b/src/nvreg.h
@@ -290,9 +290,9 @@
#define NV_RAMDAC_PLL_SELECT 0x0068050c
/* Without this it will use vpll1 */
/* Maybe only for nv4x */
-# define NV_RAMDAC_PLL_SELECT_USE_VPLL2_FALSE (0<<2)
-# define NV_RAMDAC_PLL_SELECT_USE_VPLL2_TRUE (1<<2)
-# define NV_RAMDAC_PLL_SELECT_DLL_BYPASS (1<<4)
+# define NV_RAMDAC_PLL_SELECT_USE_VPLL2_FALSE (0<<0)
+# define NV_RAMDAC_PLL_SELECT_USE_VPLL2_TRUE (4<<0)
+# define NV_RAMDAC_PLL_SELECT_DLL_BYPASS_TRUE (1<<4)
# define NV_RAMDAC_PLL_SELECT_PLL_SOURCE_DEFAULT (0<<8)
# define NV_RAMDAC_PLL_SELECT_PLL_SOURCE_MPLL (1<<8)
# define NV_RAMDAC_PLL_SELECT_PLL_SOURCE_VPLL (2<<8)
@@ -311,8 +311,8 @@
# define NV_RAMDAC_PLL_SELECT_TVCLK_RATIO_DB2 (1<<24)
# define NV_RAMDAC_PLL_SELECT_VCLK_RATIO_DB1 (0<<28)
# define NV_RAMDAC_PLL_SELECT_VCLK_RATIO_DB2 (1<<28)
-# define NV_RAMDAC_PLL_SELECT_VCLK2_RATIO_DB1 (0<<29)
-# define NV_RAMDAC_PLL_SELECT_VCLK2_RATIO_DB2 (1<<29)
+# define NV_RAMDAC_PLL_SELECT_VCLK2_RATIO_DB1 (0<<28)
+# define NV_RAMDAC_PLL_SELECT_VCLK2_RATIO_DB2 (2<<28)
#define NV_RAMDAC_PLL_SETUP_CONTROL 0x00680510
#define NV_RAMDAC_PLL_TEST_COUNTER 0x00680514