diff options
author | David Woodhouse <dwmw2@infradead.org> | 2006-08-30 18:30:38 -0400 |
---|---|---|
committer | David Woodhouse <dwmw2@infradead.org> | 2006-08-30 18:30:38 -0400 |
commit | 0a7d5f8ce960e74fa22986bda4af488539796e49 (patch) | |
tree | e29ad17808a5c3410518e22dae8dfe94801b59f3 /drivers/video/matrox/g450_pll.c | |
parent | 0165508c80a2b5d5268d9c5dfa9b30c534a33693 (diff) | |
parent | dc709bd190c130b299ac19d596594256265c042a (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/video/matrox/g450_pll.c')
-rw-r--r-- | drivers/video/matrox/g450_pll.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/video/matrox/g450_pll.c b/drivers/video/matrox/g450_pll.c index 440272ad10e7..7c76e079ca7d 100644 --- a/drivers/video/matrox/g450_pll.c +++ b/drivers/video/matrox/g450_pll.c | |||
@@ -331,7 +331,15 @@ static int __g450_setclk(WPMINFO unsigned int fout, unsigned int pll, | |||
331 | tmp |= M1064_XPIXCLKCTRL_PLL_UP; | 331 | tmp |= M1064_XPIXCLKCTRL_PLL_UP; |
332 | } | 332 | } |
333 | matroxfb_DAC_out(PMINFO M1064_XPIXCLKCTRL, tmp); | 333 | matroxfb_DAC_out(PMINFO M1064_XPIXCLKCTRL, tmp); |
334 | #ifdef __powerpc__ | ||
335 | /* This is necessary to avoid jitter on PowerPC | ||
336 | * (OpenFirmware) systems, but apparently | ||
337 | * introduces jitter, at least on a x86-64 | ||
338 | * using DVI. | ||
339 | * A simple workaround is disable for non-PPC. | ||
340 | */ | ||
334 | matroxfb_DAC_out(PMINFO M1064_XDVICLKCTRL, 0); | 341 | matroxfb_DAC_out(PMINFO M1064_XDVICLKCTRL, 0); |
342 | #endif /* __powerpc__ */ | ||
335 | matroxfb_DAC_out(PMINFO M1064_XPWRCTRL, xpwrctrl); | 343 | matroxfb_DAC_out(PMINFO M1064_XPWRCTRL, xpwrctrl); |
336 | 344 | ||
337 | matroxfb_DAC_unlock_irqrestore(flags); | 345 | matroxfb_DAC_unlock_irqrestore(flags); |