mirror of
https://github.com/torvalds/linux.git
synced 2024-11-11 06:31:49 +00:00
fbdev: consolidate common drawing functions into a header file
Consolidate common drawing functions into a single header file. Signed-off-by: Antonino Daplas <adaplas@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Antonino A. Daplas
Linus Torvalds
parent
52102c07a6
commit
dc0e6e0544
@ -22,8 +22,6 @@
|
||||
* help moving some redundant computations and branches out of the loop, too.
|
||||
*/
|
||||
|
||||
|
||||
|
||||
#include <linux/module.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/string.h>
|
||||
@ -31,6 +29,7 @@
|
||||
#include <linux/slab.h>
|
||||
#include <asm/types.h>
|
||||
#include <asm/io.h>
|
||||
#include "fb_draw.h"
|
||||
|
||||
#if BITS_PER_LONG == 32
|
||||
# define FB_WRITEL fb_writel
|
||||
@ -40,17 +39,6 @@
|
||||
# define FB_READL fb_readq
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Compose two values, using a bitmask as decision value
|
||||
* This is equivalent to (a & mask) | (b & ~mask)
|
||||
*/
|
||||
|
||||
static inline unsigned long
|
||||
comp(unsigned long a, unsigned long b, unsigned long mask)
|
||||
{
|
||||
return ((a ^ b) & mask) ^ b;
|
||||
}
|
||||
|
||||
/*
|
||||
* Generic bitwise copy algorithm
|
||||
*/
|
||||
|
||||
@ -21,6 +21,7 @@
|
||||
#include <linux/string.h>
|
||||
#include <linux/fb.h>
|
||||
#include <asm/types.h>
|
||||
#include "fb_draw.h"
|
||||
|
||||
#if BITS_PER_LONG == 32
|
||||
# define FB_WRITEL fb_writel
|
||||
@ -28,73 +29,6 @@
|
||||
#else
|
||||
# define FB_WRITEL fb_writeq
|
||||
# define FB_READL fb_readq
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Compose two values, using a bitmask as decision value
|
||||
* This is equivalent to (a & mask) | (b & ~mask)
|
||||
*/
|
||||
|
||||
static inline unsigned long
|
||||
comp(unsigned long a, unsigned long b, unsigned long mask)
|
||||
{
|
||||
return ((a ^ b) & mask) ^ b;
|
||||
}
|
||||
|
||||
/*
|
||||
* Create a pattern with the given pixel's color
|
||||
*/
|
||||
|
||||
#if BITS_PER_LONG == 64
|
||||
static inline unsigned long
|
||||
pixel_to_pat( u32 bpp, u32 pixel)
|
||||
{
|
||||
switch (bpp) {
|
||||
case 1:
|
||||
return 0xfffffffffffffffful*pixel;
|
||||
case 2:
|
||||
return 0x5555555555555555ul*pixel;
|
||||
case 4:
|
||||
return 0x1111111111111111ul*pixel;
|
||||
case 8:
|
||||
return 0x0101010101010101ul*pixel;
|
||||
case 12:
|
||||
return 0x0001001001001001ul*pixel;
|
||||
case 16:
|
||||
return 0x0001000100010001ul*pixel;
|
||||
case 24:
|
||||
return 0x0000000001000001ul*pixel;
|
||||
case 32:
|
||||
return 0x0000000100000001ul*pixel;
|
||||
default:
|
||||
panic("pixel_to_pat(): unsupported pixelformat\n");
|
||||
}
|
||||
}
|
||||
#else
|
||||
static inline unsigned long
|
||||
pixel_to_pat( u32 bpp, u32 pixel)
|
||||
{
|
||||
switch (bpp) {
|
||||
case 1:
|
||||
return 0xfffffffful*pixel;
|
||||
case 2:
|
||||
return 0x55555555ul*pixel;
|
||||
case 4:
|
||||
return 0x11111111ul*pixel;
|
||||
case 8:
|
||||
return 0x01010101ul*pixel;
|
||||
case 12:
|
||||
return 0x00001001ul*pixel;
|
||||
case 16:
|
||||
return 0x00010001ul*pixel;
|
||||
case 24:
|
||||
return 0x00000001ul*pixel;
|
||||
case 32:
|
||||
return 0x00000001ul*pixel;
|
||||
default:
|
||||
panic("pixel_to_pat(): unsupported pixelformat\n");
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
/*
|
||||
|
||||
72
drivers/video/fb_draw.h
Normal file
72
drivers/video/fb_draw.h
Normal file
@ -0,0 +1,72 @@
|
||||
#ifndef _FB_DRAW_H
|
||||
#define _FB_DRAW_H
|
||||
|
||||
#include <asm/types.h>
|
||||
|
||||
/*
|
||||
* Compose two values, using a bitmask as decision value
|
||||
* This is equivalent to (a & mask) | (b & ~mask)
|
||||
*/
|
||||
|
||||
static inline unsigned long
|
||||
comp(unsigned long a, unsigned long b, unsigned long mask)
|
||||
{
|
||||
return ((a ^ b) & mask) ^ b;
|
||||
}
|
||||
|
||||
/*
|
||||
* Create a pattern with the given pixel's color
|
||||
*/
|
||||
|
||||
#if BITS_PER_LONG == 64
|
||||
static inline unsigned long
|
||||
pixel_to_pat( u32 bpp, u32 pixel)
|
||||
{
|
||||
switch (bpp) {
|
||||
case 1:
|
||||
return 0xfffffffffffffffful*pixel;
|
||||
case 2:
|
||||
return 0x5555555555555555ul*pixel;
|
||||
case 4:
|
||||
return 0x1111111111111111ul*pixel;
|
||||
case 8:
|
||||
return 0x0101010101010101ul*pixel;
|
||||
case 12:
|
||||
return 0x0001001001001001ul*pixel;
|
||||
case 16:
|
||||
return 0x0001000100010001ul*pixel;
|
||||
case 24:
|
||||
return 0x0000000001000001ul*pixel;
|
||||
case 32:
|
||||
return 0x0000000100000001ul*pixel;
|
||||
default:
|
||||
panic("pixel_to_pat(): unsupported pixelformat\n");
|
||||
}
|
||||
}
|
||||
#else
|
||||
static inline unsigned long
|
||||
pixel_to_pat( u32 bpp, u32 pixel)
|
||||
{
|
||||
switch (bpp) {
|
||||
case 1:
|
||||
return 0xfffffffful*pixel;
|
||||
case 2:
|
||||
return 0x55555555ul*pixel;
|
||||
case 4:
|
||||
return 0x11111111ul*pixel;
|
||||
case 8:
|
||||
return 0x01010101ul*pixel;
|
||||
case 12:
|
||||
return 0x00001001ul*pixel;
|
||||
case 16:
|
||||
return 0x00010001ul*pixel;
|
||||
case 24:
|
||||
return 0x00000001ul*pixel;
|
||||
case 32:
|
||||
return 0x00000001ul*pixel;
|
||||
default:
|
||||
panic("pixel_to_pat(): unsupported pixelformat\n");
|
||||
}
|
||||
}
|
||||
#endif
|
||||
#endif /* FB_DRAW_H */
|
||||
@ -19,17 +19,7 @@
|
||||
#include <linux/slab.h>
|
||||
#include <asm/types.h>
|
||||
#include <asm/io.h>
|
||||
|
||||
/*
|
||||
* Compose two values, using a bitmask as decision value
|
||||
* This is equivalent to (a & mask) | (b & ~mask)
|
||||
*/
|
||||
|
||||
static inline unsigned long
|
||||
comp(unsigned long a, unsigned long b, unsigned long mask)
|
||||
{
|
||||
return ((a ^ b) & mask) ^ b;
|
||||
}
|
||||
#include "fb_draw.h"
|
||||
|
||||
/*
|
||||
* Generic bitwise copy algorithm
|
||||
|
||||
@ -15,73 +15,7 @@
|
||||
#include <linux/string.h>
|
||||
#include <linux/fb.h>
|
||||
#include <asm/types.h>
|
||||
|
||||
/*
|
||||
* Compose two values, using a bitmask as decision value
|
||||
* This is equivalent to (a & mask) | (b & ~mask)
|
||||
*/
|
||||
|
||||
static inline unsigned long
|
||||
comp(unsigned long a, unsigned long b, unsigned long mask)
|
||||
{
|
||||
return ((a ^ b) & mask) ^ b;
|
||||
}
|
||||
|
||||
/*
|
||||
* Create a pattern with the given pixel's color
|
||||
*/
|
||||
|
||||
#if BITS_PER_LONG == 64
|
||||
static inline unsigned long
|
||||
pixel_to_pat( u32 bpp, u32 pixel)
|
||||
{
|
||||
switch (bpp) {
|
||||
case 1:
|
||||
return 0xfffffffffffffffful*pixel;
|
||||
case 2:
|
||||
return 0x5555555555555555ul*pixel;
|
||||
case 4:
|
||||
return 0x1111111111111111ul*pixel;
|
||||
case 8:
|
||||
return 0x0101010101010101ul*pixel;
|
||||
case 12:
|
||||
return 0x0001001001001001ul*pixel;
|
||||
case 16:
|
||||
return 0x0001000100010001ul*pixel;
|
||||
case 24:
|
||||
return 0x0000000001000001ul*pixel;
|
||||
case 32:
|
||||
return 0x0000000100000001ul*pixel;
|
||||
default:
|
||||
panic("pixel_to_pat(): unsupported pixelformat\n");
|
||||
}
|
||||
}
|
||||
#else
|
||||
static inline unsigned long
|
||||
pixel_to_pat( u32 bpp, u32 pixel)
|
||||
{
|
||||
switch (bpp) {
|
||||
case 1:
|
||||
return 0xfffffffful*pixel;
|
||||
case 2:
|
||||
return 0x55555555ul*pixel;
|
||||
case 4:
|
||||
return 0x11111111ul*pixel;
|
||||
case 8:
|
||||
return 0x01010101ul*pixel;
|
||||
case 12:
|
||||
return 0x00001001ul*pixel;
|
||||
case 16:
|
||||
return 0x00010001ul*pixel;
|
||||
case 24:
|
||||
return 0x00000001ul*pixel;
|
||||
case 32:
|
||||
return 0x00000001ul*pixel;
|
||||
default:
|
||||
panic("pixel_to_pat(): unsupported pixelformat\n");
|
||||
}
|
||||
}
|
||||
#endif
|
||||
#include "fb_draw.h"
|
||||
|
||||
/*
|
||||
* Aligned pattern fill using 32/64-bit memory accesses
|
||||
|
||||
Loading…
Reference in New Issue
Block a user