Skip to content

L
linux-davinci-2.6.23
Commit f728377f authored by Dave Airlie's avatar Dave Airlie
Browse files
Options

sync modesetting code with X.org 

Signed-off-by: default avatarDave Airlie <airlied@linux.ie>
parent c9daa873
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 4 deletions
drivers/video/intelfb/intelfbhw.c
View file @ f728377f
...@@ -1359,6 +1359,10 @@ intelfbhw_program_mode(struct intelfb_info *dinfo, ...@@ -1359,6 +1359,10 @@ intelfbhw_program_mode(struct intelfb_info *dinfo,
/* Wait for vblank. For now, just wait for a 50Hz cycle (20ms)) */ /* Wait for vblank. For now, just wait for a 50Hz cycle (20ms)) */
mdelay(20); mdelay(20);
OUTREG(DVOB, INREG(DVOB) & ~PORT_ENABLE);
OUTREG(DVOC, INREG(DVOC) & ~PORT_ENABLE);
OUTREG(ADPA, INREG(ADPA) & ~ADPA_DAC_ENABLE);
/* Disable Sync */ /* Disable Sync */
tmp = INREG(ADPA); tmp = INREG(ADPA);
tmp &= ~ADPA_DPMS_CONTROL_MASK; tmp &= ~ADPA_DPMS_CONTROL_MASK;
...@@ -1374,14 +1378,11 @@ intelfbhw_program_mode(struct intelfb_info *dinfo, ...@@ -1374,14 +1378,11 @@ intelfbhw_program_mode(struct intelfb_info *dinfo,
OUTREG(dpll_reg, tmp); OUTREG(dpll_reg, tmp);
/* Set PLL parameters */ /* Set PLL parameters */
OUTREG(dpll_reg, *dpll & ~DPLL_VCO_ENABLE);
OUTREG(fp0_reg, *fp0); OUTREG(fp0_reg, *fp0);
OUTREG(fp1_reg, *fp1); OUTREG(fp1_reg, *fp1);
/* Enable PLL */ /* Enable PLL */
tmp = INREG(dpll_reg); OUTREG(dpll_reg, *dpll);
tmp |= DPLL_VCO_ENABLE;
OUTREG(dpll_reg, tmp);
/* Set DVOs B/C */ /* Set DVOs B/C */
OUTREG(DVOB, hw->dvob); OUTREG(DVOB, hw->dvob);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment