xf86-video-ati: Branch 'master' - 2 commits

[Alex Deucher]

 man/radeon.man      |    2 +-
 src/radeon_driver.c |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 0c99554c6fab1192f5e8595469c21b5f33e1eb4f
Author: David Miller <davem at davemloft.net>
Date:   Wed Dec 26 02:19:12 2007 -0500

    [RADEON]: Add missing break in SCLK calculation.

diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index f5167b7..6e10282 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -1173,7 +1173,7 @@ static Bool RADEONProbePLLParameters(ScrnInfoPtr pScrn)
     case 2: info->sclk = spll / 2.0; break;
     case 3: info->sclk = spll / 4.0; break;
     case 4: info->sclk = spll / 8.0; break;
-    case 7: info->sclk = mpll;
+    case 7: info->sclk = mpll; break;
     default:
            info->sclk = 200.00;
            xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Unsupported SCLK source"
commit 6e0d5cc1c62fbfc1962fa0d6333f0c0a8c6327bd
Author: David Miller <davem at davemloft.net>
Date:   Wed Dec 26 02:17:34 2007 -0500

    [RADEON]: Like powerpc, don't use VGA by default on sparc.

diff --git a/man/radeon.man b/man/radeon.man
index 2a561a6..141342e 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 7ce9236..f5167b7 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;