Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87a7cc68 authored by Krzysztof Helt's avatar Krzysztof Helt Committed by Linus Torvalds
Browse files

pm2fb: accelerated fillrect and copyarea 



This is a port of accelerated functions from 2.4 kernel.  Only fillrect and
copyarea are accelerated.  Fillrect is not accelerated in 24-bit mode.

[adaplas]
Add appropriate flags

Signed-off-by: default avatarKrzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: default avatarAntonino Daplas <adaplas@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 34ed25f5

drivers/video/pm2fb.c

+128 −4
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ static struct fb_fix_screeninfo pm2fb_fix __devinitdata = { 
	.xpanstep =	1,

	.ypanstep =	1,

	.ywrapstep =	0, 

	.accel =	FB_ACCEL_NONE,

	.accel =	FB_ACCEL_3DLABS_PERMEDIA2,

};



/*
@@ -206,6 +206,17 @@ static inline void WAIT_FIFO(struct pm2fb_par* p, u32 a) 
}

#endif



static void wait_pm2(struct pm2fb_par* par) {



	WAIT_FIFO(par, 1);

	pm2_WR(par, PM2R_SYNC, 0);

	mb();

	do {

		while (pm2_RD(par, PM2R_OUT_FIFO_WORDS) == 0);

		rmb();

	} while (pm2_RD(par, PM2R_OUT_FIFO) != PM2TAG(PM2R_SYNC));

}



/*

 * partial products for the supported horizontal resolutions.

 */
@@ -1041,6 +1052,117 @@ static int pm2fb_blank(int blank_mode, struct fb_info *info) 
	return 0;

}



/*

 * block operation. copy=0: rectangle fill, copy=1: rectangle copy.

 */

static void pm2fb_block_op(struct pm2fb_par* par, int copy,

				s32 xsrc, s32 ysrc,

				s32 x, s32 y, s32 w, s32 h,

				u32 color) {



	if (!w || !h)

		return;

	WAIT_FIFO(par, 6);

	pm2_WR(par, PM2R_CONFIG, PM2F_CONFIG_FB_WRITE_ENABLE |

		PM2F_CONFIG_FB_READ_SOURCE_ENABLE);

	pm2_WR(par, PM2R_FB_PIXEL_OFFSET, 0);

	if (copy)

		pm2_WR(par, PM2R_FB_SOURCE_DELTA,

			((ysrc-y) & 0xfff) << 16 | ((xsrc-x) & 0xfff));

	else

		pm2_WR(par, PM2R_FB_BLOCK_COLOR, color);

	pm2_WR(par, PM2R_RECTANGLE_ORIGIN, (y << 16) | x);

	pm2_WR(par, PM2R_RECTANGLE_SIZE, (h << 16) | w);

	wmb();

	pm2_WR(par, PM2R_RENDER,PM2F_RENDER_RECTANGLE |

				(x<xsrc ? PM2F_INCREASE_X : 0) |

				(y<ysrc ? PM2F_INCREASE_Y : 0) |

				(copy ? 0 : PM2F_RENDER_FASTFILL));

	wait_pm2(par);

}



static void pm2fb_fillrect (struct fb_info *info,

				const struct fb_fillrect *region)

{

	struct pm2fb_par *par = info->par;

	struct fb_fillrect modded;

	int vxres, vyres;

	u32 color = (info->fix.visual == FB_VISUAL_TRUECOLOR) ?

		((u32*)info->pseudo_palette)[region->color] : region->color;



	if (info->state != FBINFO_STATE_RUNNING)

		return;

	if ((info->flags & FBINFO_HWACCEL_DISABLED) ||

		region->rop != ROP_COPY ) {

		cfb_fillrect(info, region);

		return;

	}



	vxres = info->var.xres_virtual;

	vyres = info->var.yres_virtual;



	memcpy(&modded, region, sizeof(struct fb_fillrect));



	if(!modded.width || !modded.height ||

	   modded.dx >= vxres || modded.dy >= vyres)

		return;



	if(modded.dx + modded.width  > vxres)

		modded.width  = vxres - modded.dx;

	if(modded.dy + modded.height > vyres)

		modded.height = vyres - modded.dy;



	if(info->var.bits_per_pixel == 8)

		color |= color << 8;

	if(info->var.bits_per_pixel <= 16)

		color |= color << 16;



	if(info->var.bits_per_pixel != 24)

		pm2fb_block_op(par, 0, 0, 0,

				modded.dx, modded.dy,

				modded.width, modded.height, color);

	else

		cfb_fillrect(info, region);

}



static void pm2fb_copyarea(struct fb_info *info,

				const struct fb_copyarea *area)

{

	struct pm2fb_par *par = info->par;

	struct fb_copyarea modded;

	u32 vxres, vyres;



	if (info->state != FBINFO_STATE_RUNNING)

		return;

	if (info->flags & FBINFO_HWACCEL_DISABLED) {

		cfb_copyarea(info, area);

		return;

	}



	memcpy(&modded, area, sizeof(struct fb_copyarea));



	vxres = info->var.xres_virtual;

	vyres = info->var.yres_virtual;



	if(!modded.width || !modded.height ||

	   modded.sx >= vxres || modded.sy >= vyres ||

	   modded.dx >= vxres || modded.dy >= vyres)

		return;



	if(modded.sx + modded.width > vxres)

		modded.width = vxres - modded.sx;

	if(modded.dx + modded.width > vxres)

		modded.width = vxres - modded.dx;

	if(modded.sy + modded.height > vyres)

		modded.height = vyres - modded.sy;

	if(modded.dy + modded.height > vyres)

		modded.height = vyres - modded.dy;



	pm2fb_block_op(par, 1, modded.sx, modded.sy,

			modded.dx, modded.dy,

			modded.width, modded.height, 0);

}



/* ------------ Hardware Independent Functions ------------ */



/*
@@ -1054,8 +1176,8 @@ static struct fb_ops pm2fb_ops = { 
	.fb_setcolreg	= pm2fb_setcolreg,

	.fb_blank	= pm2fb_blank,

	.fb_pan_display	= pm2fb_pan_display,

	.fb_fillrect	= cfb_fillrect,

	.fb_copyarea	= cfb_copyarea,

	.fb_fillrect	= pm2fb_fillrect,

	.fb_copyarea	= pm2fb_copyarea,

	.fb_imageblit	= cfb_imageblit,

};
@@ -1204,7 +1326,9 @@ static int __devinit pm2fb_probe(struct pci_dev *pdev, 
	info->fix		= pm2fb_fix; 	

	info->pseudo_palette	= default_par->palette;

	info->flags		= FBINFO_DEFAULT |

                                  FBINFO_HWACCEL_YPAN;

                                  FBINFO_HWACCEL_YPAN |

	                          FBINFO_HWACCEL_COPYAREA |

	                          FBINFO_HWACCEL_FILLRECT;



	if (!mode)

		mode = "640x480@60";