diff options
author | Alan Cox <alan@linux.intel.com> | 2009-12-15 19:46:40 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-16 10:20:05 -0500 |
commit | 8c651311a3a08c1e4815de6933e00a760e498dae (patch) | |
tree | 58e4266ae95b6136ca42a5c236153edf20b1ad53 /drivers/video | |
parent | 312d97152faa30ac4c007937ea09c9c27b10e249 (diff) |
matroxfb: fix problems with display stability
Regression caused in 2.6.23 and then despite repeated requests never fixed
or dealt with (Petr promised to sort it in 2008 but seems to have
forgotten).
Enough is enough - remove the problem line that was added. If it upsets
someone they've had two years to deal with it and at the very least it'll
rattle their cage and wake them up.
Addresses http://bugzilla.kernel.org/show_bug.cgi?id=9709
Signed-off-by: Alan Cox <alan@linux.intel.com>
Reported-by: Damon <account@bugzilla.kernel.org.juxtaposition.net>
Tested-by: Ruud van Melick <rvm1974@raketnet.nl>
Cc: Petr Vandrovec <VANDROVE@vc.cvut.cz>
Cc: Pekka Enberg <penberg@cs.helsinki.fi>
Cc: Paul A. Clarke <pc@us.ibm.com>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/video')
-rw-r--r-- | drivers/video/matrox/g450_pll.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/video/matrox/g450_pll.c b/drivers/video/matrox/g450_pll.c index 09f6e045d5be..c15f8a57498e 100644 --- a/drivers/video/matrox/g450_pll.c +++ b/drivers/video/matrox/g450_pll.c | |||
@@ -368,7 +368,8 @@ static int __g450_setclk(struct matrox_fb_info *minfo, unsigned int fout, | |||
368 | M1064_XDVICLKCTRL_C1DVICLKEN | | 368 | M1064_XDVICLKCTRL_C1DVICLKEN | |
369 | M1064_XDVICLKCTRL_DVILOOPCTL | | 369 | M1064_XDVICLKCTRL_DVILOOPCTL | |
370 | M1064_XDVICLKCTRL_P1LOOPBWDTCTL; | 370 | M1064_XDVICLKCTRL_P1LOOPBWDTCTL; |
371 | matroxfb_DAC_out(minfo, M1064_XDVICLKCTRL, tmp); | 371 | /* Setting this breaks PC systems so don't do it */ |
372 | /* matroxfb_DAC_out(minfo, M1064_XDVICLKCTRL, tmp); */ | ||
372 | matroxfb_DAC_out(minfo, M1064_XPWRCTRL, | 373 | matroxfb_DAC_out(minfo, M1064_XPWRCTRL, |
373 | xpwrctrl); | 374 | xpwrctrl); |
374 | 375 | ||