<p>Elyes HAOUAS has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/25857">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">drivers/ati/ragexl: Add whitespace around '=='<br><br>Change-Id: Ia7920c334f6c5e0ed67a6899715cee3552227014<br>Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr><br>---<br>M src/drivers/ati/ragexl/atyfb.h<br>M src/drivers/ati/ragexl/mach64_ct.c<br>M src/drivers/ati/ragexl/xlinit.c<br>3 files changed, 28 insertions(+), 28 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/57/25857/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/drivers/ati/ragexl/atyfb.h b/src/drivers/ati/ragexl/atyfb.h</span><br><span>index df8dd3d..6ed6ac9 100644</span><br><span>--- a/src/drivers/ati/ragexl/atyfb.h</span><br><span>+++ b/src/drivers/ati/ragexl/atyfb.h</span><br><span>@@ -96,7 +96,7 @@</span><br><span> #endif</span><br><span> struct fb_info_aty {</span><br><span> #if CONFIG_CONSOLE_BTEXT</span><br><span style="color: hsl(0, 100%, 40%);">-#if PLL_CRTC_DECODE==1</span><br><span style="color: hsl(120, 100%, 40%);">+#if PLL_CRTC_DECODE == 1</span><br><span> struct fb_info fb_info;</span><br><span> #endif</span><br><span> #endif</span><br><span>@@ -119,7 +119,7 @@</span><br><span> struct { u8 red, green, blue, pad; } palette[256];</span><br><span> #endif</span><br><span> struct atyfb_par default_par;</span><br><span style="color: hsl(0, 100%, 40%);">-#if PLL_CRTC_DECODE==1</span><br><span style="color: hsl(120, 100%, 40%);">+#if PLL_CRTC_DECODE == 1</span><br><span> struct atyfb_par current_par;</span><br><span> #endif</span><br><span> </span><br><span>diff --git a/src/drivers/ati/ragexl/mach64_ct.c b/src/drivers/ati/ragexl/mach64_ct.c</span><br><span>index 9b45f2a..b5fd65c 100644</span><br><span>--- a/src/drivers/ati/ragexl/mach64_ct.c</span><br><span>+++ b/src/drivers/ati/ragexl/mach64_ct.c</span><br><span>@@ -14,7 +14,7 @@</span><br><span> struct pll_ct *pll);</span><br><span> static int aty_var_to_pll_ct(const struct fb_info_aty *info, u32 vclk_per,</span><br><span> u8 bpp, union aty_pll *pll);</span><br><span style="color: hsl(0, 100%, 40%);">-#if PLL_CRTC_DECODE==1</span><br><span style="color: hsl(120, 100%, 40%);">+#if PLL_CRTC_DECODE == 1</span><br><span> static u32 aty_pll_ct_to_var(const struct fb_info_aty *info,</span><br><span> const union aty_pll *pll);</span><br><span> #endif</span><br><span>@@ -31,7 +31,7 @@</span><br><span> u32 xclks_per_row, fifo_off, fifo_on, y, fifo_size;</span><br><span> u32 memcntl, n, t_pfc, t_rp, t_ras, t_rcd, t_crd, t_rcc, t_lat;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#if DEBUG_PLL==1</span><br><span style="color: hsl(120, 100%, 40%);">+#if DEBUG_PLL == 1</span><br><span> printk(BIOS_DEBUG, "aty_dsp_gt : mclk_fb_mult=%d\n", pll->mclk_fb_mult);</span><br><span> #endif</span><br><span> </span><br><span>@@ -121,7 +121,7 @@</span><br><span> static int aty_valid_pll_ct(const struct fb_info_aty *info, u32 vclk_per,</span><br><span> struct pll_ct *pll)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-#if DEBUG_PLL==1</span><br><span style="color: hsl(120, 100%, 40%);">+#if DEBUG_PLL == 1</span><br><span> int pllmclk, pllsclk;</span><br><span> #endif</span><br><span> u32 q;</span><br><span>@@ -145,7 +145,7 @@</span><br><span> pll->mclk_post_div_real = 1;</span><br><span> pll->sclk_fb_div = q*pll->mclk_post_div_real/8;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#if DEBUG_PLL==1</span><br><span style="color: hsl(120, 100%, 40%);">+#if DEBUG_PLL == 1</span><br><span> pllsclk = (1000000 * 2 * pll->sclk_fb_div) /</span><br><span> (info->ref_clk_per * pll->pll_ref_div);</span><br><span> </span><br><span>@@ -171,7 +171,7 @@</span><br><span> pll->xclk_post_div_real = 1;</span><br><span> pll->mclk_fb_div = q*pll->xclk_post_div_real/8;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#if DEBUG_PLL==1</span><br><span style="color: hsl(120, 100%, 40%);">+#if DEBUG_PLL == 1</span><br><span> pllmclk = (1000000 * pll->mclk_fb_mult * pll->mclk_fb_div) /</span><br><span> (info->ref_clk_per * pll->pll_ref_div);</span><br><span> printk(BIOS_DEBUG, "aty_valid_pll_ct: pllmclk=%d MHz, xclk=%d MHz\n",</span><br><span>@@ -285,7 +285,7 @@</span><br><span> return 0;</span><br><span> }</span><br><span> #if CONFIG_CONSOLE_BTEXT</span><br><span style="color: hsl(0, 100%, 40%);">-#if PLL_CRTC_DECODE==1</span><br><span style="color: hsl(120, 100%, 40%);">+#if PLL_CRTC_DECODE == 1</span><br><span> u32 aty_pll_ct_to_var(const struct fb_info_aty *info,</span><br><span> const union aty_pll *pll)</span><br><span> {</span><br><span>@@ -299,7 +299,7 @@</span><br><span> #endif</span><br><span> void aty_set_pll_ct(const struct fb_info_aty *info, const union aty_pll *pll)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-#if DEBUG_PLL==1</span><br><span style="color: hsl(120, 100%, 40%);">+#if DEBUG_PLL == 1</span><br><span> printk(BIOS_DEBUG, "aty_set_pll_ct: about to program:\n"</span><br><span> "refdiv=%d, extcntl=0x%02x, mfbdiv=%d\n"</span><br><span> "spllcntl2=0x%02x, sfbdiv=%d, gencntl=0x%02x\n"</span><br><span>diff --git a/src/drivers/ati/ragexl/xlinit.c b/src/drivers/ati/ragexl/xlinit.c</span><br><span>index c5d4404..67293be 100644</span><br><span>--- a/src/drivers/ati/ragexl/xlinit.c</span><br><span>+++ b/src/drivers/ati/ragexl/xlinit.c</span><br><span>@@ -60,7 +60,7 @@</span><br><span> #define HAS_VICTORIA 0</span><br><span> </span><br><span> enum {</span><br><span style="color: hsl(0, 100%, 40%);">-#if HAS_VICTORIA==1</span><br><span style="color: hsl(120, 100%, 40%);">+#if HAS_VICTORIA == 1</span><br><span> VICTORIA = 0,</span><br><span> XPERT98,</span><br><span> #else</span><br><span>@@ -88,7 +88,7 @@</span><br><span> u8 dll2_cntl;</span><br><span> u8 pll_yclk_cntl;</span><br><span> } card_cfg[NUM_XL_CARDS] = {</span><br><span style="color: hsl(0, 100%, 40%);">-#if HAS_VICTORIA==1</span><br><span style="color: hsl(120, 100%, 40%);">+#if HAS_VICTORIA == 1</span><br><span> // VICTORIA</span><br><span> { 2700, SDRAM, 0x800000,</span><br><span> 0x10757A3B, 0x64000C81, 0x00110202, 0x7b33A040,</span><br><span>@@ -399,7 +399,7 @@</span><br><span> static int aty_var_to_crtc(const struct fb_info_aty *info,</span><br><span> const struct fb_var_screeninfo *var,</span><br><span> struct crtc *crtc);</span><br><span style="color: hsl(0, 100%, 40%);">-#if PLL_CRTC_DECODE==1</span><br><span style="color: hsl(120, 100%, 40%);">+#if PLL_CRTC_DECODE == 1</span><br><span> static int aty_crtc_to_var(const struct crtc *crtc,</span><br><span> struct fb_var_screeninfo *var);</span><br><span> #endif</span><br><span>@@ -409,7 +409,7 @@</span><br><span> static int atyfb_decode_var(const struct fb_var_screeninfo *var,</span><br><span> struct atyfb_par *par,</span><br><span> const struct fb_info_aty *info);</span><br><span style="color: hsl(0, 100%, 40%);">-#if PLL_CRTC_DECODE==1</span><br><span style="color: hsl(120, 100%, 40%);">+#if PLL_CRTC_DECODE == 1</span><br><span> static int atyfb_encode_var(struct fb_var_screeninfo *var,</span><br><span> const struct atyfb_par *par,</span><br><span> const struct fb_info_aty *info);</span><br><span>@@ -517,7 +517,7 @@</span><br><span> u8 pll_ref_div;</span><br><span> #endif</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#endif /*CONFIG_CONSOLE_BTEXT==1 */</span><br><span style="color: hsl(120, 100%, 40%);">+#endif /*CONFIG_CONSOLE_BTEXT == 1 */</span><br><span> </span><br><span> struct fb_info_aty *info;</span><br><span> struct fb_info_aty info_t;</span><br><span>@@ -536,7 +536,7 @@</span><br><span> info->frame_buffer = res->base;</span><br><span> #endif /* CONFIG_CONSOLE_BTEXT */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#if USE_AUX_REG==0</span><br><span style="color: hsl(120, 100%, 40%);">+#if USE_AUX_REG == 0</span><br><span> info->ati_regbase = res2mmio(res, 0x7ff000+0xc00, 0);</span><br><span> #else</span><br><span> /* Fix this to look for the correct index. */</span><br><span>@@ -752,7 +752,7 @@</span><br><span> }</span><br><span> #endif</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#if PLL_CRTC_DECODE==1</span><br><span style="color: hsl(120, 100%, 40%);">+#if PLL_CRTC_DECODE == 1</span><br><span> atyfb_set_var(&var, -1, &info->fb_info);</span><br><span> #else</span><br><span> atyfb_set_par(&info->default_par, info);</span><br><span>@@ -760,7 +760,7 @@</span><br><span> do_install_cmap(-1, info);</span><br><span> #endif</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#if PLL_CRTC_DECODE==1</span><br><span style="color: hsl(120, 100%, 40%);">+#if PLL_CRTC_DECODE == 1</span><br><span> </span><br><span> printk(BIOS_SPEW, "framebuffer=0x%08x, width=%d, height=%d, bpp=%d, pitch=%d\n",info->frame_buffer,</span><br><span> (((info->current_par.crtc.h_tot_disp>>16) & 0xff)+1)*8,</span><br><span>@@ -830,7 +830,7 @@</span><br><span> </span><br><span> return 0;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-#if PLL_CRTC_DECODE==1</span><br><span style="color: hsl(120, 100%, 40%);">+#if PLL_CRTC_DECODE == 1</span><br><span> static int atyfb_encode_var(struct fb_var_screeninfo *var,</span><br><span> const struct atyfb_par *par,</span><br><span> const struct fb_info_aty *info)</span><br><span>@@ -934,7 +934,7 @@</span><br><span> dp_pix_width = HOST_8BPP | SRC_8BPP | DST_8BPP | BYTE_ORDER_LSB_TO_MSB;</span><br><span> dp_chain_mask = 0x8080;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-#if SUPPORT_8_BPP_ABOVE==1</span><br><span style="color: hsl(120, 100%, 40%);">+#if SUPPORT_8_BPP_ABOVE == 1</span><br><span> else if (bpp <= 16) {</span><br><span> bpp = 16;</span><br><span> pix_width = CRTC_PIX_WIDTH_15BPP;</span><br><span>@@ -986,7 +986,7 @@</span><br><span> </span><br><span> return 0;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-#if PLL_CRTC_DECODE==1</span><br><span style="color: hsl(120, 100%, 40%);">+#if PLL_CRTC_DECODE == 1</span><br><span> static int aty_crtc_to_var(const struct crtc *crtc,</span><br><span> struct fb_var_screeninfo *var)</span><br><span> {</span><br><span>@@ -1049,7 +1049,7 @@</span><br><span> var->transp.offset = 0;</span><br><span> var->transp.length = 0;</span><br><span> break;</span><br><span style="color: hsl(0, 100%, 40%);">-#if SUPPORT_8_BPP_ABOVE==1</span><br><span style="color: hsl(120, 100%, 40%);">+#if SUPPORT_8_BPP_ABOVE == 1</span><br><span> case CRTC_PIX_WIDTH_15BPP: /* RGB 555 */</span><br><span> bpp = 16;</span><br><span> var->red.offset = 10;</span><br><span>@@ -1168,7 +1168,7 @@</span><br><span> /*</span><br><span> * Set the User Defined Part of the Display</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">-#if PLL_CRTC_DECODE==1</span><br><span style="color: hsl(120, 100%, 40%);">+#if PLL_CRTC_DECODE == 1</span><br><span> static int atyfb_set_var(struct fb_var_screeninfo *var, int con,</span><br><span> struct fb_info *fb)</span><br><span> {</span><br><span>@@ -1269,7 +1269,7 @@</span><br><span> </span><br><span> accelmode = par->accel_flags; /* hack */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#if PLL_CRTC_DECODE==1</span><br><span style="color: hsl(120, 100%, 40%);">+#if PLL_CRTC_DECODE == 1</span><br><span> info->current_par = *par;</span><br><span> #endif</span><br><span> </span><br><span>@@ -1293,7 +1293,7 @@</span><br><span> case 8:</span><br><span> i |= 0x02000000;</span><br><span> break;</span><br><span style="color: hsl(0, 100%, 40%);">-#if SUPPORT_8_BPP_ABOVE==1</span><br><span style="color: hsl(120, 100%, 40%);">+#if SUPPORT_8_BPP_ABOVE == 1</span><br><span> case 16:</span><br><span> i |= 0x03000000;</span><br><span> break;</span><br><span>@@ -1309,12 +1309,12 @@</span><br><span> i |= info->mem_refresh_rate << 20;</span><br><span> switch (par->crtc.bpp) {</span><br><span> case 8:</span><br><span style="color: hsl(0, 100%, 40%);">-#if SUPPORT_8_BPP_ABOVE==1</span><br><span style="color: hsl(120, 100%, 40%);">+#if SUPPORT_8_BPP_ABOVE == 1</span><br><span> case 24:</span><br><span> #endif</span><br><span> i |= 0x00000000;</span><br><span> break;</span><br><span style="color: hsl(0, 100%, 40%);">-#if SUPPORT_8_BPP_ABOVE==1</span><br><span style="color: hsl(120, 100%, 40%);">+#if SUPPORT_8_BPP_ABOVE == 1</span><br><span> case 16:</span><br><span> i |= 0x04000000;</span><br><span> break;</span><br><span>@@ -1433,7 +1433,7 @@</span><br><span> i |= 0x2; /*DAC_CNTL|0x2 turns off the extra brightness for gt*/</span><br><span> aty_st_8(DAC_CNTL, i, info);</span><br><span> aty_st_8(DAC_MASK, 0xff, info);</span><br><span style="color: hsl(0, 100%, 40%);">-#if PLL_CRTC_DECODE==1</span><br><span style="color: hsl(120, 100%, 40%);">+#if PLL_CRTC_DECODE == 1</span><br><span> scale = (M64_HAS(INTEGRATED) && info->current_par.crtc.bpp == 16) ? 3 : 0;</span><br><span> #else</span><br><span> scale = (M64_HAS(INTEGRATED) && info->default_par.crtc.bpp == 16) ? 3 : 0;</span><br><span>@@ -1493,7 +1493,7 @@</span><br><span> </span><br><span> static void do_install_cmap(int con, struct fb_info_aty *info)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-#if PLL_CRTC_DECODE==1</span><br><span style="color: hsl(120, 100%, 40%);">+#if PLL_CRTC_DECODE == 1</span><br><span> int size = info->current_par.crtc.bpp == 16 ? 32 : 256;</span><br><span> #else</span><br><span> int size = 256;</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/25857">change 25857</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/25857"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Ia7920c334f6c5e0ed67a6899715cee3552227014 </div>
<div style="display:none"> Gerrit-Change-Number: 25857 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Elyes HAOUAS <ehaouas@noos.fr> </div>