summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOndrej Zajicek <santiago@crfreenet.org>2007-03-16 13:38:16 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-03-16 19:25:04 -0700
commite52e15d3c153b88c4536cf18214fac18481c888a (patch)
tree3f5c93cbb1a5a79b704eacc4bd7af1877fbb30c6
parent28735a7253a6c24364765e80a5428b4a151fccc2 (diff)
downloadblackbird-op-linux-e52e15d3c153b88c4536cf18214fac18481c888a.tar.gz
blackbird-op-linux-e52e15d3c153b88c4536cf18214fac18481c888a.zip
[PATCH] sstfb: fix pixclock setting on Voodoo 1/2 cards
Pixclock setting in sstfb didn't work with my Voodoo 2 card with ICS 5342 DAC (this DAC requires two consecutive writes to one of its registers to program pixclock - maybe first write merged with second). Signed-off-by: Ondrej Zajicek <santiago@crfreenet.org> Signed-off-by: Antonino Daplas <adaplas@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/video/sstfb.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/video/sstfb.c b/drivers/video/sstfb.c
index 59cd1e750f30..62fa5500361d 100644
--- a/drivers/video/sstfb.c
+++ b/drivers/video/sstfb.c
@@ -257,6 +257,7 @@ static void __sst_dac_write(u8 __iomem *vbase, u8 reg, u8 val)
r_dprintk("sst_dac_write(%#x, %#x)\n", reg, val);
reg &= 0x07;
__sst_write(vbase, DAC_DATA,(((u32)reg << 8)) | (u32)val);
+ __sst_wait_idle(vbase);
}
/* indexed access to ti/att dacs */
OpenPOWER on IntegriCloud