qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

OpenBSD modification: IBookHack option.

Browse Source
This commit is contained in:
matthieu 2006-12-03 17:58:02 +00:00
parent d27091245a
commit a98f016822
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
driver/xf86-video-ati/src/radeon.h
View File

@ -144,7 +144,10 @@ typedef enum {
OPTION_REVERSE_DDC,
OPTION_LVDS_PROBE_PLL,
OPTION_ACCELMETHOD,
OPTION_CONSTANTDPI
OPTION_CONSTANTDPI,
#ifdef __powerpc__
OPTION_IBOOKHACKS
#endif
} RADEONOpts;
/* ------- mergedfb support ------------- */

22
driver/xf86-video-ati/src/radeon_driver.c
View File

@ -211,6 +211,9 @@ static const OptionInfoRec RADEONOptions[] = {
{ OPTION_LVDS_PROBE_PLL, "LVDSProbePLL", OPTV_BOOLEAN, {0}, FALSE },
{ OPTION_ACCELMETHOD, "AccelMethod", OPTV_STRING, {0}, FALSE },
{ OPTION_CONSTANTDPI, "ConstantDPI", OPTV_BOOLEAN, {0}, FALSE },
#ifdef __powerpc__
{ OPTION_IBOOKHACKS, "iBookHacks", OPTV_BOOLEAN, {0}, FALSE },
#endif
{ -1, NULL, OPTV_NONE, {0}, FALSE }
};
@ -6688,6 +6691,14 @@ static void RADEONRestorePLLRegisters(ScrnInfoPtr pScrn,
RADEONInfoPtr info = RADEONPTR(pScrn);
unsigned char *RADEONMMIO = info->MMIO;
/*
* Never do it on Apple iBook to avoid a blank screen.
*/
#ifdef __powerpc__
if (xf86ReturnOptValBool(info->Options, OPTION_IBOOKHACKS, FALSE))
return;
#endif
if (info->IsMobility) {
/* A temporal workaround for the occational blanking on certain laptop panels.
This appears to related to the PLL divider registers (fail to lock?).
@ -8533,7 +8544,16 @@ static void RADEONInitPLLRegisters(ScrnInfoPtr pScrn, RADEONInfoPtr info,
save->post_div));
save->ppll_ref_div = pll->reference_div;
save->ppll_div_3 = (save->feedback_div | (post_div->bitvalue << 16));
/*
* on iBooks the LCD pannel needs tweaked PLL timings
*/
#ifdef __powerpc__
if (xf86ReturnOptValBool(info->Options, OPTION_IBOOKHACKS, FALSE))
save->ppll_div_3 = 0x000600ad;
else
#endif
save->ppll_div_3 = (save->feedback_div | (post_div->bitvalue << 16));
save->htotal_cntl = 0;
}