diff options
| author | Dave Jones <davej@redhat.com> | 2006-09-05 23:16:33 +0200 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-09-05 23:16:33 +0200 |
| commit | 23e735bc7b0e1d614656881794257b4224efda3a (patch) | |
| tree | d9523b531156fedb204e31b4612519b0a7a003e7 /drivers/video/matrox/g450_pll.c | |
| parent | [CPUFREQ] Fix sparse warning in ondemand (diff) | |
| parent | Linux 2.6.18-rc6 (diff) | |
| download | linux-23e735bc7b0e1d614656881794257b4224efda3a.tar.xz linux-23e735bc7b0e1d614656881794257b4224efda3a.zip | |
Merge ../linus
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, tmp |= M1064_XPIXCLKCTRL_PLL_UP; } matroxfb_DAC_out(PMINFO M1064_XPIXCLKCTRL, tmp); +#ifdef __powerpc__ + /* This is necessary to avoid jitter on PowerPC + * (OpenFirmware) systems, but apparently + * introduces jitter, at least on a x86-64 + * using DVI. + * A simple workaround is disable for non-PPC. + */ matroxfb_DAC_out(PMINFO M1064_XDVICLKCTRL, 0); +#endif /* __powerpc__ */ matroxfb_DAC_out(PMINFO M1064_XPWRCTRL, xpwrctrl); matroxfb_DAC_unlock_irqrestore(flags); |