diff options
author | Roel Kluin <roel.kluin@gmail.com> | 2009-06-16 18:34:35 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-16 22:48:00 -0400 |
commit | f73323de5a07e2a7bf3e9bca36dcc8057e5446d4 (patch) | |
tree | 117a4b713099e79867953bd2f3010945744ae13b | |
parent | 0dac6ecdc056b83ac66e5b5c923fb73268f4332d (diff) |
radeon: P2G2CLK_ALWAYS_ONb tested twice, should 2nd be P2G2CLK_DAC_ALWAYS_ONb?
P2G2CLK_ALWAYS_ONb is tested twice, 2nd should be P2G2CLK_DAC_ALWAYS_ONb.
[akpm@linux-foundation.org: remove duplicated bitwise-OR of PIXCLKS_CNTL__R300_P2G2CLK_ALWAYS_ONb too]
Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Krzysztof Helt <krzysztof.h1@poczta.fm>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | drivers/video/aty/radeon_pm.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/video/aty/radeon_pm.c b/drivers/video/aty/radeon_pm.c index 97a1f095f327..515cf1978d19 100644 --- a/drivers/video/aty/radeon_pm.c +++ b/drivers/video/aty/radeon_pm.c | |||
@@ -213,7 +213,6 @@ static void radeon_pm_disable_dynamic_mode(struct radeonfb_info *rinfo) | |||
213 | PIXCLKS_CNTL__R300_PIXCLK_TRANS_ALWAYS_ONb | | 213 | PIXCLKS_CNTL__R300_PIXCLK_TRANS_ALWAYS_ONb | |
214 | PIXCLKS_CNTL__R300_PIXCLK_TVO_ALWAYS_ONb | | 214 | PIXCLKS_CNTL__R300_PIXCLK_TVO_ALWAYS_ONb | |
215 | PIXCLKS_CNTL__R300_P2G2CLK_ALWAYS_ONb | | 215 | PIXCLKS_CNTL__R300_P2G2CLK_ALWAYS_ONb | |
216 | PIXCLKS_CNTL__R300_P2G2CLK_ALWAYS_ONb | | ||
217 | PIXCLKS_CNTL__R300_DISP_DAC_PIXCLK_DAC2_BLANK_OFF); | 216 | PIXCLKS_CNTL__R300_DISP_DAC_PIXCLK_DAC2_BLANK_OFF); |
218 | OUTPLL(pllPIXCLKS_CNTL, tmp); | 217 | OUTPLL(pllPIXCLKS_CNTL, tmp); |
219 | 218 | ||
@@ -395,7 +394,7 @@ static void radeon_pm_enable_dynamic_mode(struct radeonfb_info *rinfo) | |||
395 | PIXCLKS_CNTL__R300_PIXCLK_TRANS_ALWAYS_ONb | | 394 | PIXCLKS_CNTL__R300_PIXCLK_TRANS_ALWAYS_ONb | |
396 | PIXCLKS_CNTL__R300_PIXCLK_TVO_ALWAYS_ONb | | 395 | PIXCLKS_CNTL__R300_PIXCLK_TVO_ALWAYS_ONb | |
397 | PIXCLKS_CNTL__R300_P2G2CLK_ALWAYS_ONb | | 396 | PIXCLKS_CNTL__R300_P2G2CLK_ALWAYS_ONb | |
398 | PIXCLKS_CNTL__R300_P2G2CLK_ALWAYS_ONb); | 397 | PIXCLKS_CNTL__R300_P2G2CLK_DAC_ALWAYS_ONb); |
399 | OUTPLL(pllPIXCLKS_CNTL, tmp); | 398 | OUTPLL(pllPIXCLKS_CNTL, tmp); |
400 | 399 | ||
401 | tmp = INPLL(pllMCLK_MISC); | 400 | tmp = INPLL(pllMCLK_MISC); |