Re: [Linux-fbdev-devel] [PATCH] radeon: P2G2CLK_ALWAYS_ONb tested twice, should 2nd be P2G2CLK_DAC_ALWAYS_ONb?

[Benjamin H. <be...@ke...>]

On Wed, 2009-05-27 at 23:54 -0700, Andrew Morton wrote:
> On Fri, 15 May 2009 22:45:27 +0200 Roel Kluin <roe...@gm...> wrote:
> 
> > P2G2CLK_ALWAYS_ONb is tested twice, 2nd should be P2G2CLK_DAC_ALWAYS_ONb.
> > 
> > Signed-off-by: Roel Kluin <roe...@gm...>
> > ---
> > Is this correct? I am only guessing. Please review.
> 
> Nobody knows?

It looks ok, I've acked it, we'll see how it goes :-)

Cheers,
Ben.

> > diff --git a/drivers/video/aty/radeon_pm.c b/drivers/video/aty/radeon_pm.c
> > index 97a1f09..100112f 100644
> > --- a/drivers/video/aty/radeon_pm.c
> > +++ b/drivers/video/aty/radeon_pm.c
> > @@ -395,7 +395,7 @@ static void radeon_pm_enable_dynamic_mode(struct radeonfb_info *rinfo)
> >  			PIXCLKS_CNTL__R300_PIXCLK_TRANS_ALWAYS_ONb      |
> >  			PIXCLKS_CNTL__R300_PIXCLK_TVO_ALWAYS_ONb        |
> >  			PIXCLKS_CNTL__R300_P2G2CLK_ALWAYS_ONb           |
> > -			PIXCLKS_CNTL__R300_P2G2CLK_ALWAYS_ONb);
> > +			PIXCLKS_CNTL__R300_P2G2CLK_DAC_ALWAYS_ONb);
> >  		OUTPLL(pllPIXCLKS_CNTL, tmp);
> >  
> >  		tmp = INPLL(pllMCLK_MISC);
> 
> The same thing happens at line 215:
> 
>                 tmp &= ~(PIXCLKS_CNTL__PIX2CLK_ALWAYS_ONb		|
> 			 PIXCLKS_CNTL__PIX2CLK_DAC_ALWAYS_ONb		|
> 			 PIXCLKS_CNTL__DISP_TVOUT_PIXCLK_TV_ALWAYS_ONb	|
> 			 PIXCLKS_CNTL__R300_DVOCLK_ALWAYS_ONb		|
> 			 PIXCLKS_CNTL__PIXCLK_BLEND_ALWAYS_ONb		|
> 			 PIXCLKS_CNTL__PIXCLK_GV_ALWAYS_ONb		|
> 			 PIXCLKS_CNTL__R300_PIXCLK_DVO_ALWAYS_ONb	|
> 			 PIXCLKS_CNTL__PIXCLK_LVDS_ALWAYS_ONb		|
> 			 PIXCLKS_CNTL__PIXCLK_TMDS_ALWAYS_ONb		|
> 			 PIXCLKS_CNTL__R300_PIXCLK_TRANS_ALWAYS_ONb	|
> 			 PIXCLKS_CNTL__R300_PIXCLK_TVO_ALWAYS_ONb	|
> 			 PIXCLKS_CNTL__R300_P2G2CLK_ALWAYS_ONb		|
> 			 PIXCLKS_CNTL__R300_P2G2CLK_ALWAYS_ONb		|
> 			 PIXCLKS_CNTL__R300_DISP_DAC_PIXCLK_DAC2_BLANK_OFF);
> 
> but that's easier to fix.