Since some people disapprove of white space cleanups mixed in regular commits

[coreboot.git] / src / drivers / ati / ragexl / mach64_ct.c

diff --git a/src/drivers/ati/ragexl/mach64_ct.c b/src/drivers/ati/ragexl/mach64_ct.c
index 4cc4969e8fac633f3eb67d8d063bf7465563634e..b34be821fbf0111e90a3c4b41d723b1acdaa1a2a 100644 (file)
--- a/src/drivers/ati/ragexl/mach64_ct.c
+++ b/src/drivers/ati/ragexl/mach64_ct.c
@@ -1,7 +1,12 @@
 #define DEBUG_PLL 0
+#define PLL_CRTC_DECODE 0
 
 /* FIXME: remove the FAIL definition */
-#define FAIL(x) do { printk_debug(x); return -EINVAL; } while (0)
+#if 0
+#define FAIL(x) do { printk(BIOS_DEBUG, x); return -EINVAL; } while (0)
+#else
+#define FAIL(x)
+#endif
 
 static int aty_valid_pll_ct(const struct fb_info_aty *info, u32 vclk_per,
                            struct pll_ct *pll);
@@ -9,7 +14,7 @@ static int aty_dsp_gt(const struct fb_info_aty *info, u32 bpp,
                      struct pll_ct *pll);
 static int aty_var_to_pll_ct(const struct fb_info_aty *info, u32 vclk_per,
                             u8 bpp, union aty_pll *pll);
-#if 0
+#if PLL_CRTC_DECODE==1
 static u32 aty_pll_ct_to_var(const struct fb_info_aty *info,
                             const union aty_pll *pll);
 #endif
@@ -27,9 +32,9 @@ static int aty_dsp_gt(const struct fb_info_aty *info, u32 bpp,
     u32 memcntl, n, t_pfc, t_rp, t_ras, t_rcd, t_crd, t_rcc, t_lat;
 
 #if DEBUG_PLL==1
-    printk_debug("aty_dsp_gt : mclk_fb_mult=%d\n", pll->mclk_fb_mult);
+    printk(BIOS_DEBUG, "aty_dsp_gt : mclk_fb_mult=%d\n", pll->mclk_fb_mult);
 #endif
-    
+
     /* (64*xclk/vclk/bpp)<<11 = xclocks_per_row<<11 */
     xclks_per_row = ((u32)pll->mclk_fb_mult * (u32)pll->mclk_fb_div *
                     (u32)pll->vclk_post_div_real * 64) << 11;
@@ -93,11 +98,11 @@ static int aty_dsp_gt(const struct fb_info_aty *info, u32 bpp,
     t_rp  = ((memcntl >>  8) & 0x03) + 1;
     t_ras = ((memcntl >> 16) & 0x07) + 1;
     t_lat =  (memcntl >>  4) & 0x03;
-    
+
     t_pfc = t_rp + t_rcd + t_crd;
 
     t_rcc = max(t_rp + t_ras, t_pfc + n);
-    
+
     /* fifo_on<<6 */
     fifo_on = (2 * t_rcc + t_pfc + n - 1) << 6;
 
@@ -119,12 +124,10 @@ static int aty_valid_pll_ct(const struct fb_info_aty *info, u32 vclk_per,
 #if DEBUG_PLL==1
     int pllmclk, pllsclk;
 #endif
+    u32 q;
 
-    u32 q, x;                  /* x is a workaround for sparc64-linux-gcc */
-    x = x;                     /* x is a workaround for sparc64-linux-gcc */
-    
     pll->pll_ref_div = info->pll_per*2*255/info->ref_clk_per;
-    
+
     /* FIXME: use the VTB/GTB /3 post divider if it's better suited */
 
     /* actually 8*q */
@@ -142,14 +145,14 @@ static int aty_valid_pll_ct(const struct fb_info_aty *info, u32 vclk_per,
        pll->mclk_post_div_real = 1;
     pll->sclk_fb_div = q*pll->mclk_post_div_real/8;
 
-#if DEBUG_PLL==1    
+#if DEBUG_PLL==1
     pllsclk = (1000000 * 2 * pll->sclk_fb_div) /
            (info->ref_clk_per * pll->pll_ref_div);
 
-    printk_debug("aty_valid_pll_ct: pllsclk=%d MHz, mclk=%d MHz\n",
+    printk(BIOS_DEBUG, "aty_valid_pll_ct: pllsclk=%d MHz, mclk=%d MHz\n",
           pllsclk, pllsclk / pll->mclk_post_div_real);
 #endif
-    
+
     pll->mclk_fb_mult = M64_HAS(MFB_TIMES_4) ? 4 : 2;
 
     /* actually 8*q */
@@ -171,10 +174,10 @@ static int aty_valid_pll_ct(const struct fb_info_aty *info, u32 vclk_per,
 #if DEBUG_PLL==1
     pllmclk = (1000000 * pll->mclk_fb_mult * pll->mclk_fb_div) /
            (info->ref_clk_per * pll->pll_ref_div);
-    printk_debug("aty_valid_pll_ct: pllmclk=%d MHz, xclk=%d MHz\n",
+    printk(BIOS_DEBUG, "aty_valid_pll_ct: pllmclk=%d MHz, xclk=%d MHz\n",
           pllmclk, pllmclk / pll->xclk_post_div_real);
 #endif
-    
+
     /* FIXME: use the VTB/GTB /{3,6,12} post dividers if they're better suited */
     q = info->ref_clk_per*pll->pll_ref_div*4/vclk_per; /* actually 8*q */
     if (q < 16*8 || q > 255*8)
@@ -196,7 +199,7 @@ static void aty_calc_pll_ct(const struct fb_info_aty *info, struct pll_ct *pll)
     u8 xpostdiv = 0;
     u8 mpostdiv = 0;
     u8 vpostdiv = 0;
-    
+
     if (M64_HAS(SDRAM_MAGIC_PLL) && (info->ram_type >= SDRAM))
            pll->pll_gen_cntl = 0x64; /* mclk = sclk */
     else
@@ -218,7 +221,7 @@ static void aty_calc_pll_ct(const struct fb_info_aty *info, struct pll_ct *pll)
     }
 
     pll->spll_cntl2 = mpostdiv << 4; /* sclk == pllsclk / mpostdiv */
-    
+
     switch (pll->xclk_post_div_real) {
        case 1:
            xpostdiv = 0;
@@ -270,7 +273,7 @@ static void aty_calc_pll_ct(const struct fb_info_aty *info, struct pll_ct *pll)
     pll->vclk_post_div = vpostdiv;
 }
 
-static int aty_var_to_pll_ct(const struct fb_info_aty *info, u32 vclk_per,
+int aty_var_to_pll_ct(const struct fb_info_aty *info, u32 vclk_per,
                             u8 bpp, union aty_pll *pll)
 {
     int err;
@@ -281,8 +284,9 @@ static int aty_var_to_pll_ct(const struct fb_info_aty *info, u32 vclk_per,
     aty_calc_pll_ct(info, &pll->ct);
     return 0;
 }
-#if 0
-static u32 aty_pll_ct_to_var(const struct fb_info_aty *info,
+#if CONFIG_CONSOLE_BTEXT==1
+#if PLL_CRTC_DECODE==1
+u32 aty_pll_ct_to_var(const struct fb_info_aty *info,
                             const union aty_pll *pll)
 {
     u32 ref_clk_per = info->ref_clk_per;
@@ -292,11 +296,11 @@ static u32 aty_pll_ct_to_var(const struct fb_info_aty *info,
 
     return ref_clk_per*pll_ref_div*vclk_post_div/vclk_fb_div/2;
 }
-
+#endif
 void aty_set_pll_ct(const struct fb_info_aty *info, const union aty_pll *pll)
 {
-#ifdef DEBUG
-    printk_debug("aty_set_pll_ct: about to program:\n"
+#if DEBUG_PLL==1
+    printk(BIOS_DEBUG, "aty_set_pll_ct: about to program:\n"
           "refdiv=%d, extcntl=0x%02x, mfbdiv=%d\n"
           "spllcntl2=0x%02x, sfbdiv=%d, gencntl=0x%02x\n"
           "vclkcntl=0x%02x, vpostdiv=0x%02x, vfbdiv=%d\n"
@@ -312,12 +316,12 @@ void aty_set_pll_ct(const struct fb_info_aty *info, const union aty_pll *pll)
 
     aty_st_pll(PLL_EXT_CNTL, pll->ct.pll_ext_cntl, info);
     aty_st_pll(MCLK_FB_DIV, pll->ct.mclk_fb_div, info); // for XCLK
-    
+
     aty_st_pll(SPLL_CNTL2, pll->ct.spll_cntl2, info);
     aty_st_pll(SCLK_FB_DIV, pll->ct.sclk_fb_div, info); // for MCLK
 
     aty_st_pll(PLL_GEN_CNTL, pll->ct.pll_gen_cntl, info);
-    
+
     aty_st_pll(EXT_VPLL_CNTL, 0, info);
     aty_st_pll(PLL_VCLK_CNTL, pll->ct.pll_vclk_cntl, info);
     aty_st_pll(VCLK_POST_DIV, pll->ct.vclk_post_div, info);
@@ -345,6 +349,7 @@ void aty_set_pll_ct(const struct fb_info_aty *info, const union aty_pll *pll)
        aty_st_pll(DLL_CNTL, dll_cntl & ~0x40, info);
     }
 }
+#if 0
 static int dummy(void)
 {
     return 0;
@@ -361,3 +366,5 @@ static struct aty_pll_ops aty_pll_ct = {
 #endif
 };
 #endif
+
+#endif /* CONFIG_CONSOLE_BTEXT */