On Tue, Jun 18, 2002 at 10:15:08AM -0700, James Simmons wrote:
> Your right. Alot of people have been bitten by that. Especially since
> people are so use to manually setting the CFB stuff. Patch applied to BK
> tree.
>
Looks like I was a bit hasty with the patch .. fbcon_accel won't resolve if
fbcon-accel.c isn't linked in, which in turn won't happen unless
CONFIG_FBCON_ACCEL is set. Can we just do something like the attached instead
(in addition to killing the ifdef in fbgen.c..)?
Regards,
-- Paul Mundt <lethal@chaoticdreams.org>--- linux-fbdev-2.5/drivers/video/Config.in Tue Jun 18 13:39:49 2002 +++ linux-fbdev-2.5/drivers/video/Config.in Tue Jun 18 13:40:51 2002 @@ -220,7 +220,6 @@ tristate ' 16 bpp packed pixels support' CONFIG_FBCON_CFB16 tristate ' 24 bpp packed pixels support' CONFIG_FBCON_CFB24 tristate ' 32 bpp packed pixels support' CONFIG_FBCON_CFB32 - tristate ' Hardware acceleration support' CONFIG_FBCON_ACCEL tristate ' Amiga bitplanes support' CONFIG_FBCON_AFB tristate ' Amiga interleaved bitplanes support' CONFIG_FBCON_ILBM tristate ' Atari interleaved bitplanes (2 planes) support' CONFIG_FBCON_IPLAN2P2 @@ -363,22 +362,6 @@ define_tristate CONFIG_FBCON_CFB32 m fi fi - if [ "$CONFIG_FB_NEOMAGIC" = "y" -o "$CONFIG_FB_VESA" = "y" -o \ - "$CONFIG_FB_FM2" = "y" -o "$CONFIG_FB_HIT" = "y" -o \ - "$CONFIG_FB_HP300" = "y" -o "$CONFIG_FB_Q40" = "y" -o \ - "$CONFIG_FB_ANAKIN" = "y" -o "$CONFIG_FB_G364" = "y" -o \ - "$CONFIG_FB_VIRTUAL" = "y" -o "$CONFIG_FB_CLPS711X" = "y" -o \ - "$CONFIG_FB_PMAG_BA" = "y" -o "$CONFIG_FB_PMAGB_B" = "y" -o \ - "$CONFIG_FB_3DFX" = "y" -o "$CONFIG_FB_TX3912" = "y" -o \ - "$CONFIG_FB_MAXINE" = "y" -o "$CONFIG_FB_APOLLO" = "y" ]; then - define_tristate CONFIG_FBCON_ACCEL y - else - if [ "$CONFIG_FB_NEOMAGIC" = "m" -o "$CONFIG_FB_HIT" = "m" -o \ - "$CONFIG_FB_G364" = "m" -o "$CONFIG_FB_VIRTUAL" = "m" -o \ - "$CONFIG_FB_CLPS711X" = "m" -o "$CONFIG_FB_3DFX" = "m" ]; then - define_tristate CONFIG_FBCON_ACCEL m - fi - fi if [ "$CONFIG_FB_AMIGA" = "y" ]; then define_tristate CONFIG_FBCON_AFB y define_tristate CONFIG_FBCON_ILBM y --- linux-fbdev-2.5/drivers/video/Makefile Tue Jun 18 13:39:45 2002 +++ linux-fbdev-2.5/drivers/video/Makefile Tue Jun 18 13:40:13 2002 @@ -33,7 +33,7 @@ obj-$(CONFIG_FONT_ACORN_8x8) += font_acorn_8x8.o # Add fbmon.o back into obj-$(CONFIG_FB) in 2.5.x -obj-$(CONFIG_FB) += fbmem.o fbcmap.o modedb.o fbcon.o fonts.o fbgen.o +obj-$(CONFIG_FB) += fbmem.o fbcmap.o modedb.o fbcon.o fonts.o fbgen.o fbcon-accel.o # Only include macmodes.o if we have FB support and are PPC ifeq ($(CONFIG_FB),y) obj-$(CONFIG_PPC) += macmodes.o @@ -122,7 +122,6 @@ obj-$(CONFIG_FBCON_VGA) += fbcon-vga.o obj-$(CONFIG_FBCON_HGA) += fbcon-hga.o obj-$(CONFIG_FBCON_STI) += fbcon-sti.o -obj-$(CONFIG_FBCON_ACCEL) += fbcon-accel.o include $(TOPDIR)/Rules.make --- linux-fbdev-2.5/drivers/video/fbcon-accel.h Tue Jun 18 13:41:56 2002 +++ linux-fbdev-2.5/drivers/video/fbcon-accel.h Tue Jun 18 13:42:10 2002 @@ -5,18 +5,6 @@ #ifndef _VIDEO_FBCON_ACCEL_H #define _VIDEO_FBCON_ACCEL_H -#include <linux/config.h> - -#ifdef MODULE -#if defined(CONFIG_FBCON_ACCEL) || defined(CONFIG_FBCON_ACCEL_MODULE) -#define FBCON_HAS_ACCEL -#endif -#else -#if defined(CONFIG_FBCON_ACCEL) -#define FBCON_HAS_ACCEL -#endif -#endif - extern struct display_switch fbcon_accel; extern void fbcon_accel_setup(struct display *p); extern void fbcon_accel_bmove(struct display *p, int sy, int sx, int dy,
This archive was generated by hypermail 2b29 : Sun Jun 23 2002 - 22:00:16 EST