From be9b614d12b200a64ea871fc0b2c5247c08b54c3 Mon Sep 17 00:00:00 2001 From: Justin Hibbits Date: Sun, 6 Apr 2014 23:57:19 +0000 Subject: Clear the backlight level when it's turned off. Also, reduce the delay times to less conservative values, also found in the radeonkms driver. MFC after: 2 weeks X-MFC-with: r264205 --- sys/powerpc/powermac/atibl.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'sys/powerpc/powermac') diff --git a/sys/powerpc/powermac/atibl.c b/sys/powerpc/powermac/atibl.c index b49dc6981d1c..6a12e2fc0b8c 100644 --- a/sys/powerpc/powermac/atibl.c +++ b/sys/powerpc/powermac/atibl.c @@ -235,21 +235,21 @@ atibl_setlevel(struct atibl_softc *sc, int newlevel) lvds_gen_cntl |= (newlevel << RADEON_LVDS_BL_MOD_LEVEL_SHIFT) & RADEON_LVDS_BL_MOD_LEVEL_MASK; lvds_gen_cntl |= RADEON_LVDS_BL_MOD_EN; - DELAY(2000000); + DELAY(200000); bus_write_4(sc->sc_memr, RADEON_LVDS_GEN_CNTL, lvds_gen_cntl); } else { pixclks_cntl = atibl_pll_rreg(sc, RADEON_PIXCLKS_CNTL); atibl_pll_wreg(sc, RADEON_PIXCLKS_CNTL, pixclks_cntl & ~RADEON_PIXCLK_LVDS_ALWAYS_ONb); lvds_gen_cntl |= RADEON_LVDS_DISPLAY_DIS; - lvds_gen_cntl &= ~RADEON_LVDS_BL_MOD_EN; + lvds_gen_cntl &= ~(RADEON_LVDS_BL_MOD_EN | RADEON_LVDS_BL_MOD_LEVEL_MASK); bus_write_4(sc->sc_memr, RADEON_LVDS_GEN_CNTL, lvds_gen_cntl); lvds_gen_cntl &= ~(RADEON_LVDS_ON | RADEON_LVDS_EN); - DELAY(2000000); + DELAY(200000); bus_write_4(sc->sc_memr, RADEON_LVDS_GEN_CNTL, lvds_gen_cntl); atibl_pll_wreg(sc, RADEON_PIXCLKS_CNTL, pixclks_cntl); - DELAY(2000000); + DELAY(200000); } return (0); -- cgit v1.2.3