From 92ca10f6214e37639288400e854432bfc8c15295 Mon Sep 17 00:00:00 2001 From: Ondrej Zary Date: Thu, 29 Jul 2010 22:32:20 +0200 Subject: [PATCH] --- yaml --- r: 201388 b: refs/heads/master c: 00b4703f03ce04bd7f2f912fd05a243096ab826f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/video/cyber2000fb.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 46334cfa2f67..add6bb97ae35 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f2d2420bbf4bb125ea5f2e1573d4da6b668fc78a +refs/heads/master: 00b4703f03ce04bd7f2f912fd05a243096ab826f diff --git a/trunk/drivers/video/cyber2000fb.c b/trunk/drivers/video/cyber2000fb.c index 3a561df2e8a2..3eee8296513c 100644 --- a/trunk/drivers/video/cyber2000fb.c +++ b/trunk/drivers/video/cyber2000fb.c @@ -436,6 +436,8 @@ static void cyber2000fb_write_ramdac_ctrl(struct cfb_info *cfb) cyber2000fb_writeb(i | 4, 0x3cf, cfb); cyber2000fb_writeb(val, 0x3c6, cfb); cyber2000fb_writeb(i, 0x3cf, cfb); + /* prevent card lock-up observed on x86 with CyberPro 2000 */ + cyber2000fb_readb(0x3cf, cfb); } static void cyber2000fb_set_timing(struct cfb_info *cfb, struct par_info *hw)