diff options
| -rw-r--r-- | src/nv_crtc.c | 10 | ||||
| -rw-r--r-- | src/nvreg.h | 10 |
2 files changed, 7 insertions, 13 deletions
diff --git a/src/nv_crtc.c b/src/nv_crtc.c index 9484196..b7a2d46 100644 --- a/src/nv_crtc.c +++ b/src/nv_crtc.c @@ -264,16 +264,10 @@ static void nv_crtc_calc_state_ext(xf86CrtcPtr crtc, DisplayModePtr mode, int do state->pllsel |= NV_RAMDAC_PLL_SELECT_USE_VPLL2_TRUE; if (nv_crtc->head == 1) { - if (!nv4x_single_stage_pll_mode) - state->pllsel |= NV_RAMDAC_PLL_SELECT_VCLK2_RATIO_DB2; - else - state->pllsel &= ~NV_RAMDAC_PLL_SELECT_VCLK2_RATIO_DB2; + state->pllsel |= NV_RAMDAC_PLL_SELECT_VCLK2_RATIO_DB2; state->pllsel |= NV_RAMDAC_PLL_SELECT_PLL_SOURCE_VPLL2; } else { - if (!nv4x_single_stage_pll_mode) - state->pllsel |= NV_RAMDAC_PLL_SELECT_VCLK_RATIO_DB2; - else - state->pllsel &= ~NV_RAMDAC_PLL_SELECT_VCLK_RATIO_DB2; + state->pllsel |= NV_RAMDAC_PLL_SELECT_VCLK_RATIO_DB2; state->pllsel |= NV_RAMDAC_PLL_SELECT_PLL_SOURCE_VPLL; } 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 |