From: Sylvain Meyer <sylvain.meyer@worldonline.fr>
Date: Wed, 22 Jun 2005 00:17:02 +0000 (-0700)
Subject: [PATCH] intelfb: fix accel detection when changing video modes
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=df529338d9c5d9329e503955795c89472e1ba6e6;p=openwrt%2Fstaging%2Fblogic.git

[PATCH] intelfb: fix accel detection when changing video modes

Changed the tests in intelfb_set_par to check also the parameter
var.accel_flags.  If null, do nothing about ring buffers.

Now, the DirectFB i830 driver could nicely work even if intelfb is hw
accelerated.  Just change the /etc/fb.modes file to disable console hw
acceleration when starting a DirectFB app.

Signed-off-by: Sylvain Meyer <sylvain.meyer@worldonline.fr>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/drivers/video/intelfb/intelfbdrv.c b/drivers/video/intelfb/intelfbdrv.c
index 7a5750b449a8..448c90864016 100644
--- a/drivers/video/intelfb/intelfbdrv.c
+++ b/drivers/video/intelfb/intelfbdrv.c
@@ -1301,7 +1301,7 @@ intelfb_set_par(struct fb_info *info)
 
 	intelfb_blank(FB_BLANK_POWERDOWN, info);
 
-	if (dinfo->accel)
+	if (ACCEL(dinfo, info))
 		intelfbhw_2d_stop(dinfo);
 
  	memcpy(hw, &dinfo->save_state, sizeof(*hw));
@@ -1317,7 +1317,7 @@ intelfb_set_par(struct fb_info *info)
 
 	update_dinfo(dinfo, &info->var);
 
-	if (dinfo->accel)
+	if (ACCEL(dinfo, info))
 		intelfbhw_2d_start(dinfo);
 
 	intelfb_pan_display(&info->var, info);