diff options
| author | David Miller <davem@davemloft.net> | 2007-12-26 02:17:34 -0500 |
|---|---|---|
| committer | Alex Deucher <alex@botch2.(none)> | 2007-12-26 02:17:34 -0500 |
| commit | 6e0d5cc1c62fbfc1962fa0d6333f0c0a8c6327bd (patch) | |
| tree | 5577170402abb5447e2dd80378cc4dc4a1ae3b82 | |
| parent | 2b1fae668ddabbc72e5fc31365302ea722174df1 (diff) | |
[RADEON]: Like powerpc, don't use VGA by default on sparc.
| -rw-r--r-- | man/radeon.man | 2 | ||||
| -rw-r--r-- | src/radeon_driver.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/man/radeon.man b/man/radeon.man index 2a561a69..141342e6 100644 --- a/man/radeon.man +++ b/man/radeon.man @@ -362,7 +362,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. .TP diff --git a/src/radeon_driver.c b/src/radeon_driver.c index 7ce92361..f5167b76 100644 --- a/src/radeon_driver.c +++ b/src/radeon_driver.c @@ -2111,7 +2111,7 @@ static Bool RADEONPreInitAccel(ScrnInfoPtr pScrn) static Bool RADEONPreInitInt10(ScrnInfoPtr pScrn, xf86Int10InfoPtr *ppInt10) { -#if !defined(__powerpc__) +#if !defined(__powerpc__) && !defined(__sparc__) RADEONInfoPtr info = RADEONPTR(pScrn); unsigned char *RADEONMMIO = info->MMIO; CARD32 fp2_gen_ctl_save = 0; @@ -2826,8 +2826,8 @@ _X_EXPORT Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags) memcpy(info->Options, RADEONOptions, sizeof(RADEONOptions)); xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, info->Options); - /* By default, don't do VGA IOs on ppc */ -#if defined(__powerpc__) || !defined(WITH_VGAHW) + /* By default, don't do VGA IOs on ppc/sparc */ +#if defined(__powerpc__) || defined(__sparc__) || !defined(WITH_VGAHW) info->VGAAccess = FALSE; #else info->VGAAccess = TRUE; |