On Tue, Oct 6, 2009 at 3:48 PM, Roel Kluin <[email protected]> wrote: > Duplicate bits set > > Signed-off-by: Roel Kluin <[email protected]> > --- > Please review. I merely guessed what it should be.
These look correct. DDX should probably be fixed as well. Acked-by: Alex Deucher <[email protected]> > > diff --git a/drivers/gpu/drm/radeon/radeon_clocks.c > b/drivers/gpu/drm/radeon/radeon_clocks.c > index 152eef1..f5c32a7 100644 > --- a/drivers/gpu/drm/radeon/radeon_clocks.c > +++ b/drivers/gpu/drm/radeon/radeon_clocks.c > @@ -411,7 +411,7 @@ void radeon_legacy_set_clock_gating(struct radeon_device > *rdev, int enable) > R300_PIXCLK_TRANS_ALWAYS_ONb | > R300_PIXCLK_TVO_ALWAYS_ONb | > R300_P2G2CLK_ALWAYS_ONb | > - R300_P2G2CLK_ALWAYS_ONb); > + R300_P2G2CLK_DAC_ALWAYS_ONb); > WREG32_PLL(RADEON_PIXCLKS_CNTL, tmp); > } else if (rdev->family >= CHIP_RV350) { > tmp = RREG32_PLL(R300_SCLK_CNTL2); > @@ -464,7 +464,7 @@ void radeon_legacy_set_clock_gating(struct radeon_device > *rdev, int enable) > R300_PIXCLK_TRANS_ALWAYS_ONb | > R300_PIXCLK_TVO_ALWAYS_ONb | > R300_P2G2CLK_ALWAYS_ONb | > - R300_P2G2CLK_ALWAYS_ONb); > + R300_P2G2CLK_DAC_ALWAYS_ONb); > WREG32_PLL(RADEON_PIXCLKS_CNTL, tmp); > > tmp = RREG32_PLL(RADEON_MCLK_MISC); > @@ -654,7 +654,7 @@ void radeon_legacy_set_clock_gating(struct radeon_device > *rdev, int enable) > R300_PIXCLK_TRANS_ALWAYS_ONb | > R300_PIXCLK_TVO_ALWAYS_ONb | > R300_P2G2CLK_ALWAYS_ONb | > - R300_P2G2CLK_ALWAYS_ONb | > + R300_P2G2CLK_DAC_ALWAYS_ONb | > R300_DISP_DAC_PIXCLK_DAC2_BLANK_OFF); > WREG32_PLL(RADEON_PIXCLKS_CNTL, tmp); > } else if (rdev->family >= CHIP_RV350) { > @@ -705,7 +705,7 @@ void radeon_legacy_set_clock_gating(struct radeon_device > *rdev, int enable) > R300_PIXCLK_TRANS_ALWAYS_ONb | > R300_PIXCLK_TVO_ALWAYS_ONb | > R300_P2G2CLK_ALWAYS_ONb | > - R300_P2G2CLK_ALWAYS_ONb | > + R300_P2G2CLK_DAC_ALWAYS_ONb | > R300_DISP_DAC_PIXCLK_DAC2_BLANK_OFF); > WREG32_PLL(RADEON_PIXCLKS_CNTL, tmp); > } else { > diff --git a/drivers/gpu/drm/radeon/radeon_legacy_encoders.c > b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c > index b1547f7..ddf90be 100644 > --- a/drivers/gpu/drm/radeon/radeon_legacy_encoders.c > +++ b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c > @@ -881,7 +881,7 @@ static void radeon_legacy_tv_dac_mode_set(struct > drm_encoder *encoder, > R420_TV_DAC_DACADJ_MASK | > R420_TV_DAC_RDACPD | > R420_TV_DAC_GDACPD | > - R420_TV_DAC_GDACPD | > + R420_TV_DAC_BDACPD | > R420_TV_DAC_TVENABLE); > } else { > tv_dac_cntl &= ~(RADEON_TV_DAC_STD_MASK | > @@ -889,7 +889,7 @@ static void radeon_legacy_tv_dac_mode_set(struct > drm_encoder *encoder, > RADEON_TV_DAC_DACADJ_MASK | > RADEON_TV_DAC_RDACPD | > RADEON_TV_DAC_GDACPD | > - RADEON_TV_DAC_GDACPD); > + RADEON_TV_DAC_BDACPD); > } > > /* FIXME TV */ > > ------------------------------------------------------------------------------ > Come build with us! The BlackBerry(R) Developer Conference in SF, CA > is the only developer event you need to attend this year. Jumpstart your > developing skills, take BlackBerry mobile applications to market and stay > ahead of the curve. Join us from November 9 - 12, 2009. Register now! > http://p.sf.net/sfu/devconference > -- > _______________________________________________ > Dri-devel mailing list > [email protected] > https://lists.sourceforge.net/lists/listinfo/dri-devel > ------------------------------------------------------------------------------ Come build with us! The BlackBerry(R) Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9 - 12, 2009. Register now! http://p.sf.net/sfu/devconference -- _______________________________________________ Dri-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/dri-devel
