diff options
| -rw-r--r-- | src/nv_bios.c | 4 | ||||
| -rw-r--r-- | src/nvreg.h | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/nv_bios.c b/src/nv_bios.c index a4549ea..16a1a66 100644 --- a/src/nv_bios.c +++ b/src/nv_bios.c @@ -1361,8 +1361,8 @@ static uint32_t get_tmds_index_reg(ScrnInfoPtr pScrn, uint8_t mlv) */ NVPtr pNv = NVPTR(pScrn); - int pramdac_offset[13] = {0, 0, 0x8, 0, 0x2000, 0, 0, 0, 0x2008, 0, 0, 0, 0x2000}; - uint32_t pramdac_table[4] = {0x6808b0, 0x6808b8, 0x6828b0, 0x6828b8}; + const int pramdac_offset[13] = {0, 0, 0x8, 0, 0x2000, 0, 0, 0, 0x2008, 0, 0, 0, 0x2000}; + const uint32_t pramdac_table[4] = {0x6808b0, 0x6808b8, 0x6828b0, 0x6828b8}; if (mlv >= 0x80) { /* here we assume that the DCB table has already been parsed */ diff --git a/src/nvreg.h b/src/nvreg.h index 957d947..e0e867d 100644 --- a/src/nvreg.h +++ b/src/nvreg.h @@ -252,8 +252,7 @@ # define NV_RAMDAC_PLL_SELECT_PLL_SOURCE_VPLL (2<<8) # define NV_RAMDAC_PLL_SELECT_PLL_SOURCE_NVPLL (4<<8) # define NV_RAMDAC_PLL_SELECT_PLL_SOURCE_ALL (7<<8) -/* Does this name make sense? */ -# define NV_RAMDAC_PLL_SELECT_PLL_SOURCE_VPLL2 (1<<11) +# define NV_RAMDAC_PLL_SELECT_PLL_SOURCE_VPLL2 (8<<8) # define NV_RAMDAC_PLL_SELECT_MPLL_BYPASS_FALSE (0<<12) # define NV_RAMDAC_PLL_SELECT_MPLL_BYPASS_TRUE (1<<12) # define NV_RAMDAC_PLL_SELECT_VS_PCLK_TV_NONE (0<<16) |