[PATCH] fbdev accel wrapper.

[PATCH] fbdev accel wrapper.

[James Simmons]

Hi!
 
  This patch provides a wrapper to use a graphics card's accel engine.
This is a needed step to remove the mess with fbcon-cfb* etc. No driver
has been changed. Just the wrapper has been provided. Geert with your
blessing I like to see it applied to the DJ tree.

   . ---
   |o_o |
   |:_/ |   Give Micro$oft the Bird!!!!
  //   \ \  Use Linux!!!!
 (|     | )
 /'_   _/`\
 ___)=(___/

Re: [PATCH] fbdev accel wrapper. II

[James Simmons]

Oops. Forgot the patch. Here you go.

diff -urN -X /home/jsimmons/dontdiff linux-2.5.2-dj6/drivers/video/Makefile linux/drivers/video/Makefile
--- linux-2.5.2-dj6/drivers/video/Makefile	Mon Jan 28 10:04:47 2002
+++ linux/drivers/video/Makefile	Mon Jan 28 10:52:59 2002
@@ -14,7 +14,7 @@
 		  fbcon-vga.o fbcon-iplan2p2.o fbcon-iplan2p4.o \
 		  fbcon-iplan2p8.o fbcon-vga-planes.o fbcon-cfb16.o \
 		  fbcon-cfb2.o fbcon-cfb24.o fbcon-cfb32.o fbcon-cfb4.o \
-		  fbcon-cfb8.o fbcon-mac.o fbcon-mfb.o \
+		  fbcon-cfb8.o fbcon-mac.o fbcon-mfb.o fbcon-accel.o \
 		  cyber2000fb.o sa1100fb.o fbcon-hga.o
 
 # Each configuration option enables a list of files.
@@ -136,6 +136,7 @@
 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
 
diff -urN -X /home/jsimmons/dontdiff linux-2.5.2-dj6/drivers/video/fbcon-accel.c linux/drivers/video/fbcon-accel.c
--- linux-2.5.2-dj6/drivers/video/fbcon-accel.c	Wed Dec 31 16:00:00 1969
+++ linux/drivers/video/fbcon-accel.c	Mon Jan 28 11:15:10 2002
@@ -0,0 +1,229 @@
+/*
+ *  linux/drivers/video/fbcon-accel.c -- Framebuffer accel console wrapper
+ *
+ *      Created 20 Feb 2001 by James Simmons <jsimmons@users.sf.net>
+ *
+ *  This file is subject to the terms and conditions of the GNU General Public
+ *  License.  See the file COPYING in the main directory of this archive for
+ *  more details.
+ */
+
+#include <linux/module.h>
+#include <linux/tty.h>
+#include <linux/console.h>
+#include <linux/string.h>
+#include <linux/fb.h>
+
+#include <video/fbcon.h>
+
+void fbcon_accel_setup(struct display *p)
+{
+	p->next_line = p->line_length ? p->line_length : p->var.xres_virtual*(p->var.bits_per_pixel<<3);
+	p->next_plane = 0;
+}
+
+void fbcon_accel_bmove(struct display *p, int sy, int sx, int dy, int dx,
+		       int height, int width)
+{
+	struct fb_info *info = p->fb_info;
+	struct fb_copyarea area;
+
+	area.sx = sx * fontwidth(p);
+	area.sy = sy * fontheight(p);
+	area.dx = dx * fontwidth(p);
+	area.dy = dy * fontheight(p);
+	area.height = height * fontheight(p);
+	area.width  = width * fontwidth(p);
+
+	info->fbops->fb_copyarea(info, &area);
+}
+
+void fbcon_accel_clear(struct vc_data *vc, struct display *p, int sy, int sx,
+		       int height, int width)
+{
+	struct fb_info *info = p->fb_info;
+	struct fb_fillrect region;
+
+	if (info->fix.visual == FB_VISUAL_PSEUDOCOLOR)
+		region.color = attr_bgcol_ec(p,vc);
+	else {
+		if (info->var.bits_per_pixel > 16)
+			region.color = ((u32*)info->pseudo_palette)[attr_bgcol_ec(p,vc)];
+		else
+			region.color = ((u16*)info->pseudo_palette)[attr_bgcol_ec(p,vc)];
+	}
+	height++;
+	region.dx = sx * fontwidth(p);
+	region.dy = sy * fontheight(p);
+	region.width = width * fontwidth(p);
+	region.height = height * fontheight(p);
+	region.rop = ROP_COPY;
+
+	info->fbops->fb_fillrect(info, &region);
+}
+
+void fbcon_accel_putc(struct vc_data *vc, struct display *p, int c, int yy,
+		      int xx)
+{
+	struct fb_info *info = p->fb_info;
+	unsigned short charmask = p->charmask;
+	unsigned int width = ((fontwidth(p)+7)>>3);
+	struct fb_image image;
+
+	if (info->fix.visual == FB_VISUAL_PSEUDOCOLOR) {
+		image.fg_color = attr_fgcol(p, c);
+		image.bg_color = attr_bgcol(p, c);
+	} else {
+		if (info->var.bits_per_pixel > 16) {
+			image.fg_color = ((u32*)info->pseudo_palette)[attr_fgcol(p,c)];
+			image.bg_color = ((u32*)info->pseudo_palette)[attr_bgcol(p,c)];
+		} else {
+			image.fg_color = ((u16*)info->pseudo_palette)[attr_fgcol(p,c)];
+			image.bg_color = ((u16*)info->pseudo_palette)[attr_bgcol(p,c)];
+		}
+	}
+	image.dx = xx * fontwidth(p);
+	image.dy = yy * fontheight(p);
+	image.width = fontwidth(p);
+	image.height = fontheight(p);
+	image.depth = 1;
+	image.data = p->fontdata + (c & charmask)*fontheight(p)*width;
+	info->fbops->fb_imageblit(info, &image);
+}
+
+void fbcon_accel_putcs(struct vc_data *vc, struct display *p,
+		       const unsigned short *s, int count, int yy, int xx)
+{
+	struct fb_info *info = p->fb_info;
+	unsigned short charmask = p->charmask;
+	unsigned int width = ((fontwidth(p)+7)>>3);
+	struct fb_image image;
+
+	if (info->fix.visual == FB_VISUAL_PSEUDOCOLOR) {
+		image.fg_color = attr_fgcol(p, *s);
+		image.bg_color = attr_bgcol(p, *s);
+	} else {
+		if (info->var.bits_per_pixel > 16) {
+			image.fg_color = ((u32*)info->pseudo_palette)[attr_fgcol(p,*s)];
+			image.bg_color = ((u32*)info->pseudo_palette)[attr_bgcol(p,*s)];
+		} else {
+			image.fg_color = ((u16*)info->pseudo_palette)[attr_fgcol(p,*s)];
+			image.bg_color = ((u16*)info->pseudo_palette)[attr_bgcol(p,*s)];
+	}
+}
+
+	image.dx = xx * fontwidth(p);
+	image.dy = yy * fontheight(p);
+	image.width = fontwidth(p);
+	image.height = fontheight(p);
+	image.depth = 1;
+
+	while (count--) {
+		image.data = p->fontdata +
+			(scr_readw(s++) & charmask) * fontheight(p) * width;
+		info->fbops->fb_imageblit(info, &image);
+		image.dx += fontwidth(p);
+	}
+}
+
+void fbcon_accel_revc(struct display *p, int xx, int yy)
+{
+	struct fb_info *info = p->fb_info;
+	struct fb_fillrect region;
+
+	if (info->fix.visual == FB_VISUAL_PSEUDOCOLOR)
+		region.color = attr_bgcol_ec(p, p->conp);
+	else {
+		if (info->var.bits_per_pixel > 16)
+			region.color = ((u32*)info->pseudo_palette)[attr_bgcol_ec(p,p->conp)];
+		else
+			region.color = ((u16*)info->pseudo_palette)[attr_bgcol_ec(p,p->conp)];
+	}
+	region.dx = xx * fontwidth(p);
+	region.dy = yy * fontheight(p);
+	region.width  = fontwidth(p);
+	region.height = fontheight(p); 
+	region.rop = ROP_XOR;
+	info->fbops->fb_fillrect(info, &region);
+}
+
+void fbcon_accel_clear_margins(struct vc_data *vc, struct display *p,
+			       int bottom_only)
+{
+	struct fb_info *info = p->fb_info;
+	unsigned int cw = fontwidth(p);
+	unsigned int ch = fontheight(p);
+	unsigned int rw = info->var.xres % cw;
+	unsigned int bh = info->var.yres % ch;
+	unsigned int rs = info->var.xres - rw;
+	unsigned int bs = info->var.yres - bh;
+	struct fb_fillrect region;
+
+	if (info->fix.visual == FB_VISUAL_PSEUDOCOLOR)
+		region.color = attr_bgcol_ec(p,vc);
+	else {
+		if (info->var.bits_per_pixel > 16)
+			region.color = ((u32*)info->pseudo_palette)[attr_bgcol_ec(p,vc)];
+		else
+			region.color = ((u16*)info->pseudo_palette)[attr_bgcol_ec(p,vc)];
+	}
+
+	if (rw && !bottom_only) {
+		region.dx = info->var.xoffset + rs;
+		region.dy = 0;
+		region.width  = rw;
+		region.height = info->var.yres_virtual;
+		region.rop = ROP_COPY;
+		info->fbops->fb_fillrect(info, &region); 
+	}
+
+	if (bh) {
+		region.dx = info->var.xoffset;
+                region.dy = info->var.yoffset + bs;
+                region.width  = rs;
+                region.height = bh;
+                region.rop = ROP_COPY;
+		info->fbops->fb_fillrect(info, &region);
+	}
+}
+
+    /*
+     *  `switch' for the low level operations
+     */
+
+struct display_switch fbcon_accel = {
+	setup:		fbcon_accel_setup,
+	bmove:		fbcon_accel_bmove,
+	clear:		fbcon_accel_clear,
+	putc:		fbcon_accel_putc,
+	putcs:		fbcon_accel_putcs,
+	revc:		fbcon_accel_revc,
+	clear_margins:	fbcon_accel_clear_margins,
+	fontwidthmask:	FONTWIDTH(4)|FONTWIDTH(8)|FONTWIDTH(12)|FONTWIDTH(16)
+};
+
+#ifdef MODULE
+MODULE_LICENSE("GPL");
+
+int init_module(void)
+{
+    return 0;
+}
+
+void cleanup_module(void)
+{}
+#endif /* MODULE */
+
+
+    /*
+     *  Visible symbols for modules
+     */
+
+EXPORT_SYMBOL(fbcon_accel);
+EXPORT_SYMBOL(fbcon_accel_setup);
+EXPORT_SYMBOL(fbcon_accel_bmove);
+EXPORT_SYMBOL(fbcon_accel_clear);
+EXPORT_SYMBOL(fbcon_accel_putc);
+EXPORT_SYMBOL(fbcon_accel_putcs);
+EXPORT_SYMBOL(fbcon_accel_revc);
+EXPORT_SYMBOL(fbcon_accel_clear_margins);

Re: [PATCH] fbdev accel wrapper. II

[Geert Uytterhoeven]

On Mon, 28 Jan 2002, James Simmons wrote:
> Oops. Forgot the patch. Here you go.
> 
> diff -urN -X /home/jsimmons/dontdiff linux-2.5.2-dj6/drivers/video/fbcon-accel.c linux/drivers/video/fbcon-accel.c
> --- linux-2.5.2-dj6/drivers/video/fbcon-accel.c	Wed Dec 31 16:00:00 1969
> +++ linux/drivers/video/fbcon-accel.c	Mon Jan 28 11:15:10 2002

  [...]

> +void fbcon_accel_clear(struct vc_data *vc, struct display *p, int sy, int sx,
> +		       int height, int width)
> +{
> +	struct fb_info *info = p->fb_info;
> +	struct fb_fillrect region;
> +
> +	if (info->fix.visual == FB_VISUAL_PSEUDOCOLOR)
> +		region.color = attr_bgcol_ec(p,vc);
> +	else {
> +		if (info->var.bits_per_pixel > 16)
> +			region.color = ((u32*)info->pseudo_palette)[attr_bgcol_ec(p,vc)];
> +		else
> +			region.color = ((u16*)info->pseudo_palette)[attr_bgcol_ec(p,vc)];
> +	}

What about non-pseudocolor modes with bpp <= 8? We still use the 16-bit wide
pseudo-palette in that case?

Alternatively we can always use the 32-bit wide pseudo-palette, so the test
for info->var.bits_per_pixel can go away (assumed there are no pixel sizes
where more than 32 bits are needed for the color information). Then a pixel
value is just an opaque 32-bit value (cfr. fbtest).

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds

Re: [PATCH] fbdev accel wrapper. II

[James Simmons]

> > +void fbcon_accel_clear(struct vc_data *vc, struct display *p, int sy, int sx,
> > +		       int height, int width)
> > +{
> > +	struct fb_info *info = p->fb_info;
> > +	struct fb_fillrect region;
> > +
> > +	if (info->fix.visual == FB_VISUAL_PSEUDOCOLOR)
> > +		region.color = attr_bgcol_ec(p,vc);
> > +	else {
> > +		if (info->var.bits_per_pixel > 16)
> > +			region.color = ((u32*)info->pseudo_palette)[attr_bgcol_ec(p,vc)];
> > +		else
> > +			region.color = ((u16*)info->pseudo_palette)[attr_bgcol_ec(p,vc)];
> > +	}
> 
> What about non-pseudocolor modes with bpp <= 8? We still use the 16-bit wide
> pseudo-palette in that case?
> 
> Alternatively we can always use the 32-bit wide pseudo-palette, so the test
> for info->var.bits_per_pixel can go away (assumed there are no pixel sizes
> where more than 32 bits are needed for the color information). Then a pixel
> value is just an opaque 32-bit value (cfr. fbtest).

   I have been giving it some thought plus with the conversation with
Petr. The whole point of pseudo_palette was to be a generic data storage
area to pass around in the upper layers without the upper layers touching
it. Even having those simple test in fbcon-accel.c defeats this purpose.
  
  I now feel it is best if we set psuedo_palette to u32 size. The way to
look at pseudo_palette[regno] is not as a place where a pixel value is
stored but a place where device specific data is held. That device
specific data could be anything. We just know that data is related to
a specific color from the palette for the console system. The value in 
pseudo_palette[x] might not match the framebuffer lay out. The value could
be something that optimizes the graphics accelerator when dealing with
colors. For example as Petr pointed out we can fill psuedo_palette[indx] 
with "(value << 16) | value" in 16bpp case. This will make several accelerators 
(such as MGA...) much happier. If we use (value * 0x01010101) for 8bpp the
MGA bitblt/clear functions can be exactly identical for all color depths.
   This is one of the goals. To provide one function for all color depths.
We now have the above as  

void fbcon_accel_clear(struct vc_data *vc, struct display *p, int sy, 
                       int sx, int height, int width)
{
    struct fb_info *info = p->fb_info;
    struct fb_fillrect region;

    if (info->fix.visual == FB_VISUAL_PSEUDOCOLOR)
        region.color = attr_bgcol_ec(p,vc);
    else 
        region.color = info->pseudo_palette)[attr_bgcol_ec(p,vc)];
      
    height++;
    region.dx = sx * fontwidth(p);
    region.dy = sy * fontheight(p);
    region.width = width * fontwidth(p);
    region.height = height * fontheight(p);
    region.rop = ROP_COPY;

    info->fbops->fb_fillrect(info, &region);
}
  
As you can see the upper layer function doesn't care what data is in
pseudo_palette[x]. It just grabs that data and pushes it to xxxfb_fillrect
which does care about the format. How will the driver put the proper data
into pseudo_palette. With xxxfb_setcolreg which handles the hardware
specific stuff. Again this is hidden from the upper layers. Both
xxxfb_setcolreg and xxxfb_fillrect can then work at any color depth.
What do you think?

   . ---
   |o_o |
   |:_/ |   Give Micro$oft the Bird!!!!
  //   \ \  Use Linux!!!!
 (|     | )
 /'_   _/`\
 ___)=(___/

Re: [PATCH] fbdev accel wrapper. II

[Russell King]

On Tue, Jan 29, 2002 at 03:59:26PM -0800, James Simmons wrote:
>     if (info->fix.visual == FB_VISUAL_PSEUDOCOLOR)
>         region.color = attr_bgcol_ec(p,vc);
>     else 
>         region.color = info->pseudo_palette)[attr_bgcol_ec(p,vc)];
                        ^                    ^

I hope this is a typing mistake that's not present in the real source. 8)

-- 
Russell King (rmk@arm.linux.org.uk)                The developer of ARM Linux
             http://www.arm.linux.org.uk/personal/aboutme.html

Re: [PATCH] fbdev accel wrapper. II

[James Simmons]

> On Tue, Jan 29, 2002 at 03:59:26PM -0800, James Simmons wrote:
> >     if (info->fix.visual == FB_VISUAL_PSEUDOCOLOR)
> >         region.color = attr_bgcol_ec(p,vc);
> >     else 
> >         region.color = info->pseudo_palette)[attr_bgcol_ec(p,vc)];
>                         ^                    ^
> 
> I hope this is a typing mistake that's not present in the real source. 8)

The above is my pseudo code I wrote in the email.