On Don, 2012-07-12 at 13:50 -0700, Connor Behan wrote: > The source should not assume that debugging is turned off. It should > build even if the user edits r128.h and enables it. > Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=47785 > > Signed-off-by: Connor Behan <[email protected]> > --- > src/r128_driver.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/src/r128_driver.c b/src/r128_driver.c > index 3f83b2f..6165650 100644 > --- a/src/r128_driver.c > +++ b/src/r128_driver.c > @@ -3897,8 +3897,8 @@ static void R128InitPLLRegisters(ScrnInfoPtr pScrn, > R128SavePtr save, > } > > /* Define PLL2 registers for requested video mode. */ > -static void R128InitPLL2Registers(R128SavePtr save, R128PLLPtr pll, > - double dot_clock) > +static void R128InitPLL2Registers(ScrnInfoPtr pScrn, R128SavePtr save, > + R128PLLPtr pll, double dot_clock) > { > unsigned long freq = dot_clock * 100; > struct { > @@ -4160,7 +4160,7 @@ static Bool R128Init(ScrnInfoPtr pScrn, DisplayModePtr > mode, R128SavePtr save) > if (!R128InitCrtc2Registers(pScrn, save, > pScrn->currentMode,info)) > return FALSE; > - R128InitPLL2Registers(save, &info->pll, dot_clock); > + R128InitPLL2Registers(pScrn, save, &info->pll, dot_clock); > if (!R128InitDDA2Registers(pScrn, save, &info->pll, info, mode)) > return FALSE; > }
Changing R128_DEBUG to 1 in r128.h still breaks the build for me with this patch applied. -- Earthling Michel Dänzer | http://www.amd.com Libre software enthusiast | Debian, X and DRI developer _______________________________________________ xorg-driver-ati mailing list [email protected] http://lists.x.org/mailman/listinfo/xorg-driver-ati
