[parisc-linux-cvs] stifb...

[Helge Deller]

last few updates:

Config.in:
- enable CONFIG_FBCON_CFB4/8 for stifb

fbcon-sti.c:
- changes to support new stifb-code

fbcon.c:
- enabled debugging

fbmem.c:
- stifb supports some kind of resource management, so move it to the correct 
section.  (this was requested by Geert Utterhoven some months ago already)


Index: Config.in
===================================================================
RCS file: /home/cvs/parisc/linux/drivers/video/Config.in,v
retrieving revision 1.9
diff -u -r1.9 Config.in
--- Config.in	2001/01/25 00:02:01	1.9
+++ Config.in	2001/03/02 00:38:52
@@ -200,12 +200,14 @@
 	 fi
       fi
       if [ "$CONFIG_FB_ACORN" = "y" -o "$CONFIG_FB_MAC" = "y" -o \
-	   "$CONFIG_FB_SA1100" = "y" -o "$CONFIG_FB_VIRTUAL" = "y" ]; then
+	   "$CONFIG_FB_SA1100" = "y" -o "$CONFIG_FB_VIRTUAL" = "y" -o \
+	   "$CONFIG_FB_STI" = "y" ]; then
 	 define_tristate CONFIG_FBCON_CFB2 y
 	 define_tristate CONFIG_FBCON_CFB4 y
       else
 	 if [ "$CONFIG_FB_ACORN" = "m" -o "$CONFIG_FB_MAC" = "m" -o \
-	      "$CONFIG_FB_SA1100" = "m" -o "$CONFIG_FB_VIRTUAL" = "m" ]; then
+	      "$CONFIG_FB_SA1100" = "m" -o "$CONFIG_FB_VIRTUAL" = "m" -o \
+	      "$CONFIG_FB_STI" = "m" ]; then
 	    define_tristate CONFIG_FBCON_CFB2 m
 	    define_tristate CONFIG_FBCON_CFB4 m
 	 fi
@@ -225,7 +227,7 @@
 	   "$CONFIG_FB_RIVA" = "y" -o \
 	   "$CONFIG_FB_SGIVW" = "y" -o "$CONFIG_FB_CYBER2000" = "y" -o \
 	   "$CONFIG_FB_SA1100" = "y" -o "$CONFIG_FB_3DFX" = "y" -o \
-	   "$CONFIG_FB_SIS" = "y" ]; then
+	   "$CONFIG_FB_SIS" = "y" -o "$CONFIG_FB_STI" = "y" ]; then
 	 define_tristate CONFIG_FBCON_CFB8 y
       else
 	 if [ "$CONFIG_FB_ACORN" = "m" -o "$CONFIG_FB_ATARI" = "m" -o \
@@ -242,7 +244,8 @@
 	      "$CONFIG_FB_P9100" = "m" -o "$CONFIG_FB_ATY128" = "m" -o \
 	      "$CONFIG_FB_RIVA" = "m" -o "$CONFIG_FB_3DFX" = "m" -o \
 	      "$CONFIG_FB_SGIVW" = "m" -o "$CONFIG_FB_CYBER2000" = "m" -o \
-	      "$CONFIG_FB_SA1100" = "m" -o "$CONFIG_FB_SIS" = "m" ]; then
+	      "$CONFIG_FB_SA1100" = "m" -o "$CONFIG_FB_SIS" = "m" -o \
+	      "$CONFIG_FB_STI" = "m" ]; then
 	    define_tristate CONFIG_FBCON_CFB8 m
 	 fi
       fi
Index: fbcon-sti.c
===================================================================
RCS file: /home/cvs/parisc/linux/drivers/video/fbcon-sti.c,v
retrieving revision 1.4
diff -u -r1.4 fbcon-sti.c
--- fbcon-sti.c	2001/02/09 01:13:19	1.4
+++ fbcon-sti.c	2001/03/02 00:38:52
@@ -39,10 +39,13 @@
 static inline u32
 ram2log(void * addr)
 {
+#if 1
+	return (unsigned long) addr;
+#else	
 	u32 a = (unsigned long) addr;
 	u32 r;
 
-#if 0
+#if 1 
 	r  =   a & 0xff000000;		/* fixed part */
 	r += ((a & 0x000000ff) << 5);
 	r += ((a & 0x00ffff00) << 3);
@@ -53,6 +56,7 @@
 #endif
 
 	return r;
+#endif
 }
 
 /* All those functions need better names. */
@@ -152,7 +156,7 @@
 		int height, int width)
 {
 #if 0 /* Unfortunately, still broken */
-	sti_bmove(&default_sti /* FIXME */, sy, sx, dy, dx, height, width);
+	sti_bmove(default_sti /* FIXME */, sy, sx, dy, dx, height, width);
 #else
 	u8 *src, *dest;
 	u_int rows;
Index: fbcon.c
===================================================================
RCS file: /home/cvs/parisc/linux/drivers/video/fbcon.c,v
retrieving revision 1.6
diff -u -r1.6 fbcon.c
--- fbcon.c	2000/11/10 21:43:46	1.6
+++ fbcon.c	2001/03/02 00:38:55
@@ -54,7 +54,7 @@
  *  more details.
  */
 
-#undef FBCONDEBUG
+#define FBCONDEBUG
 
 #include <linux/config.h>
 #include <linux/module.h>
Index: fbmem.c
===================================================================
RCS file: /home/cvs/parisc/linux/drivers/video/fbmem.c,v
retrieving revision 1.10
diff -u -r1.10 fbmem.c
--- fbmem.c	2001/02/09 01:13:19	1.10
+++ fbmem.c	2001/03/02 00:38:55
@@ -256,6 +256,9 @@
 #ifdef CONFIG_FB_HIT
 	{ "hitfb", hitfb_init, NULL },
 #endif
+#ifdef CONFIG_FB_STI
+	{ "stifb", stifb_init, stifb_setup },
+#endif
 
 	/*
 	 * Generic drivers that don't use resource management (yet)
@@ -264,9 +267,6 @@
 #ifdef CONFIG_FB_VGA16
 	{ "vga16", vga16fb_init, vga16fb_setup },
 #endif 
-#ifdef CONFIG_FB_STI
-	{ "stifb", stifb_init, stifb_setup },
-#endif
 
 #ifdef CONFIG_GSP_RESOLVER
 	/* Not a real frame buffer device... */