From: Ondrej Zajicek <santiago@crfreenet.org>
Date: Fri, 16 Mar 2007 21:38:16 +0000 (-0800)
Subject: [PATCH] sstfb: fix pixclock setting on Voodoo 1/2 cards
X-Git-Tag: v2.6.21-rc5~98
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=e52e15d3c153b88c4536cf18214fac18481c888a;p=powerpc.git

[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>
---

diff --git a/drivers/video/sstfb.c b/drivers/video/sstfb.c
index 59cd1e750f..62fa550036 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 */