Aurelien
/
xf86-video-intel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Save/restore the output's SDVO reg. Note that we might be programming the other 

SDVO reg instead of the one assigned to the output.  When trying to fix that, I
ended up getting no output at all.
This commit is contained in:
Eric Anholt 2006-04-24 16:49:48 -07:00
parent b498d2b1d1
commit cc70e6b789
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/i830_sdvo.c
View File

@ -438,7 +438,7 @@ I830SDVOGetClockRateMult(I830SDVOPtr s)
I830SDVOWriteOutputs(s, 0);
I830SDVOReadInputRegs(s);
if (s->sdvo_regs[SDVO_CMD_GET_CLOCK_RATE_MULT] != SDVO_CMD_STATUS_SUCCESS) {
if (s->sdvo_regs[SDVO_I2C_CMD_STATUS] != SDVO_CMD_STATUS_SUCCESS) {
xf86DrvMsg(s->d.pI2CBus->scrnIndex, X_ERROR,
"Couldn't get SDVO clock rate multiplier\n");
return SDVO_CLOCK_RATE_MULT_1X;
@ -592,6 +592,8 @@ i830SDVOSave(ScrnInfoPtr pScrn, int output_index)
I830SDVOSetTargetOutput(sdvo, FALSE, TRUE);
I830SDVOGetTimings(sdvo, &sdvo->save_output_dtd_2,
SDVO_CMD_GET_OUTPUT_TIMINGS_PART1);
sdvo->save_SDVOX = INREG(sdvo->output_device);
}
void
@ -624,6 +626,9 @@ i830SDVOPostRestore(ScrnInfoPtr pScrn, int output_index)
SDVO_CMD_SET_OUTPUT_TIMINGS_PART1);
I830SDVOSetClockRateMult(sdvo, sdvo->save_sdvo_mult);
OUTREG(sdvo->output_device, sdvo->save_SDVOX);
I830SDVOSetActiveOutputs(sdvo, sdvo->save_sdvo_active_1,
sdvo->save_sdvo_active_2);
}