diff options
| author | Tormod Volden <debian.tormod@gmail.com> | 2013-10-25 20:31:05 +0200 |
|---|---|---|
| committer | Connor Behan <connor.behan@gmail.com> | 2013-10-27 18:46:36 -0700 |
| commit | d5da29d2ff94c80c8edefd6ccf5fd05fc6018870 (patch) | |
| tree | f77c953aad7e0ef4bb4e117350bbc9ff6baf9e6f | |
| parent | ccdfcf5c05ccade823c9734212dcb865d8958cbb (diff) | |
Do not use int10 or VBE on powerpc
VBE was already skipped in the normal path, but not when setting
the PROBE_DETECT flag.
Should avoid bus error seen in
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=622606 and
http://lists.x.org/archives/xorg/2012-February/053969.html
Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
| -rw-r--r-- | src/r128_driver.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/r128_driver.c b/src/r128_driver.c index 72d9e3c..6acdf2d 100644 --- a/src/r128_driver.c +++ b/src/r128_driver.c @@ -1758,8 +1758,8 @@ static Bool R128PreInitCursor(ScrnInfoPtr pScrn) static Bool R128PreInitInt10(ScrnInfoPtr pScrn, xf86Int10InfoPtr *ppInt10) { R128InfoPtr info = R128PTR(pScrn); -#if 1 && !defined(__alpha__) - /* int10 is broken on some Alphas */ +#if !defined(__powerpc__) && !defined(__alpha__) + /* int10 is broken on some Alphas and powerpc */ if (xf86LoadSubModule(pScrn, "int10")) { xf86DrvMsg(pScrn->scrnIndex,X_INFO,"initializing int10\n"); *ppInt10 = xf86InitInt10(info->pEnt->index); @@ -1890,11 +1890,14 @@ static void R128ProbeDDC(ScrnInfoPtr pScrn, int indx) { vbeInfoPtr pVbe; + +#if !defined(__powerpc__) && !defined(__alpha__) && !defined(__sparc__) if (xf86LoadSubModule(pScrn, "vbe")) { pVbe = VBEInit(NULL,indx); ConfiguredMonitor = vbeDoEDID(pVbe, NULL); vbeFree(pVbe); } +#endif } /* R128PreInit is called once at server startup. */ |