On Fri, Oct 25, 2013 at 7:35 PM, Connor Behan <[email protected]> wrote: > On 25/10/13 12:00 PM, [email protected] wrote: >> 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 <[email protected]> >> --- > Thanks. I see that the radeon UMS branch already makes sure the arch is > not PPC before loading int10. Oddly enough, it does not do this with vbe. > > I will push this in a few days if there are no objections :).
Looks good to me. Reviewed-by: Alex Deucher <[email protected]> >> >> src/r128_driver.c | 7 +++++-- >> 1 file 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. */ >> -- 1.7.10.4 > > > > _______________________________________________ > [email protected]: X.Org development > Archives: http://lists.x.org/archives/xorg-devel > Info: http://lists.x.org/mailman/listinfo/xorg-devel _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
