diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 122c582..a4d4d3d 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -697,7 +697,10 @@ unsigned RADEONINPLL(ScrnInfoPtr pScrn, int addr)
     unsigned char *RADEONMMIO = info->MMIO;
     CARD32         data;
 
-    OUTREG8(RADEON_CLOCK_CNTL_INDEX, addr & 0x3f);
+    if (IS_R300_VARIANT)
+	OUTREG(RADEON_CLOCK_CNTL_INDEX, addr & 0x3f);
+    else
+	OUTREG8(RADEON_CLOCK_CNTL_INDEX, addr & 0x3f);
     RADEONPllErrataAfterIndex(info);
     data = INREG(RADEON_CLOCK_CNTL_DATA);
     RADEONPllErrataAfterData(info);
@@ -711,8 +714,12 @@ void RADEONOUTPLL(ScrnInfoPtr pScrn, int addr, CARD32 data)
     RADEONInfoPtr  info       = RADEONPTR(pScrn);
     unsigned char *RADEONMMIO = info->MMIO;
 
-    OUTREG8(RADEON_CLOCK_CNTL_INDEX, (((addr) & 0x3f) |
-				      RADEON_PLL_WR_EN));
+    if (IS_R300_VARIANT)
+	OUTREG(RADEON_CLOCK_CNTL_INDEX, (((addr) & 0x3f) |
+					 RADEON_PLL_WR_EN));
+    else
+	OUTREG8(RADEON_CLOCK_CNTL_INDEX, (((addr) & 0x3f) |
+					 RADEON_PLL_WR_EN));
     RADEONPllErrataAfterIndex(info);
     OUTREG(RADEON_CLOCK_CNTL_DATA, data);
     RADEONPllErrataAfterData(info);