diff options
| author | Alex Deucher <alex@botch2.(none)> | 2008-01-05 12:00:55 -0500 |
|---|---|---|
| committer | Alex Deucher <alex@botch2.(none)> | 2008-01-05 12:00:55 -0500 |
| commit | 45656b9d5a426053da2a094de39c2690c0c6f799 (patch) | |
| tree | 9f4dd3300b60cad1eedf5199411f984e7a24f9ef | |
| parent | b8e8db4675d07e45782de0d7c67ee0fd85eaedb3 (diff) | |
R128: Like powerpc, don't use VGA by default on sparc
| -rw-r--r-- | man/r128.man | 2 | ||||
| -rw-r--r-- | src/r128_driver.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/man/r128.man b/man/r128.man index 32bbaae7..709c2fe8 100644 --- a/man/r128.man +++ b/man/r128.man @@ -136,7 +136,7 @@ shouldn't be if the console is using radeonfb or some other graphic mode driver. Some platforms like PowerPC have issues with those, and they aren't necessary unless you have a real text mode in console. The default is .B off -on PowerPC and +on PowerPC and SPARC and .B on on other architectures. diff --git a/src/r128_driver.c b/src/r128_driver.c index 6e26a6ef..9c41b7bc 100644 --- a/src/r128_driver.c +++ b/src/r128_driver.c @@ -1376,7 +1376,7 @@ static Bool R128PreInitConfig(ScrnInfoPtr pScrn) static Bool R128PreInitDDC(ScrnInfoPtr pScrn, xf86Int10InfoPtr pInt10) { -#if !defined(__powerpc__) && !defined(__alpha__) +#if !defined(__powerpc__) && !defined(__alpha__) && !defined(__sparc__) R128InfoPtr info = R128PTR(pScrn); vbeInfoPtr pVbe; #endif @@ -1384,7 +1384,7 @@ static Bool R128PreInitDDC(ScrnInfoPtr pScrn, xf86Int10InfoPtr pInt10) if (!xf86LoadSubModule(pScrn, "ddc")) return FALSE; xf86LoaderReqSymLists(ddcSymbols, NULL); -#if defined(__powerpc__) || defined(__alpha__) +#if defined(__powerpc__) || defined(__alpha__) || defined(__sparc__) /* Int10 is broken on PPC and some Alphas */ return TRUE; #else @@ -2127,7 +2127,7 @@ Bool R128PreInit(ScrnInfoPtr pScrn, int flags) xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, info->Options); /* By default, don't do VGA IOs on ppc */ -#if defined(__powerpc__) || !defined(WITH_VGAHW) +#if defined(__powerpc__) || defined(__sparc__) || !defined(WITH_VGAHW) info->VGAAccess = FALSE; #else info->VGAAccess = TRUE; |