Commit 1a78d9a3 authored by Zsolt Kajtar's avatar Zsolt Kajtar Committed by Helge Deller
Browse files

fbdev: wmt_ge_rops: Remove fb_draw.h includes 



Remove dependency on fb_draw.h to allow fbcon packed pixel drawing refactoring.

Signed-off-by: default avatarZsolt Kajtar <soci@c64.rulez.org>
Signed-off-by: default avatarHelge Deller <deller@gmx.de>
parent b8389cbe

drivers/video/fbdev/wmt_ge_rops.c

+28 −2
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ 
#include <linux/io.h>

#include <linux/platform_device.h>



#include "core/fb_draw.h"

#include "wmt_ge_rops.h"



#define GE_COMMAND_OFF		0x00
@@ -41,6 +40,33 @@ 


static void __iomem *regbase;



/* from the spec it seems more like depth than bits per pixel */

static inline unsigned long pixel_to_pat(u32 depth, u32 pixel, struct fb_info *p)

{

	switch (depth) {

	case 1:

		return ~0ul*pixel;

	case 2:

		return ~0ul/3*pixel;

	case 4:

		return ~0ul/15*pixel;

	case 8:

		return ~0ul/255*pixel;

	case 12:

	case 15:

	case 16:

		return ~0ul/0xffff*pixel;

	case 18:

	case 24:

		return 0x1000001ul*pixel;

	case 32:

		return pixel;

	default:

		fb_warn_once(p, "%s: unsupported pixelformat %d\n", __func__, depth);

		return 0;

	}

}



void wmt_ge_fillrect(struct fb_info *p, const struct fb_fillrect *rect)

{

	unsigned long fg, pat;
@@ -54,7 +80,7 @@ void wmt_ge_fillrect(struct fb_info *p, const struct fb_fillrect *rect) 
	else

		fg = rect->color;



	pat = pixel_to_pat(p->var.bits_per_pixel, fg);

	pat = pixel_to_pat(p->var.bits_per_pixel, fg, p);



	if (p->fbops->fb_sync)

		p->fbops->fb_sync(p);