Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-16 17:12:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

s3c-fb: integrate palette setup code into main driver

Browse Source 
Remove the palette setup code from the header files and put it into the
main driver.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Pawel Osciak <p.osciak@samsung.com>
Cc: InKi Dae <inki.dae@samsung.com>
Cc: KyungMin Park <kyungmin.park.samsung.com>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Ben Dooks 2010-08-10 18:02:34 -07:00 committed by Linus Torvalds
parent c4bb6ffa77
commit bc2da1b6fb
2 changed files with 32 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
arch/arm/plat-samsung/include/plat/regs-fb-v4.h
View File

@ -137,40 +137,6 @@
#define WPALCON_W2PAL_16BPP_A555 (1 << 6) #define WPALCON_W2PAL_16BPP_A555 (1 << 6)
/* system specific implementation code for palette sizes, and other
* information that changes depending on which architecture is being
* compiled.
*/
struct s3c_fb_palette {
struct fb_bitfield r;
struct fb_bitfield g;
struct fb_bitfield b;
struct fb_bitfield a;
};
static inline void s3c_fb_init_palette(unsigned int window,
struct s3c_fb_palette *palette)
{
if (window < 2) {
/* Windows 0/1 are 8/8/8 or A/8/8/8 */
palette->r.offset = 16;
palette->r.length = 8;
palette->g.offset = 8;
palette->g.length = 8;
palette->b.offset = 0;
palette->b.length = 8;
} else {
/* currently we assume RGB 5/6/5 */
palette->r.offset = 11;
palette->r.length = 5;
palette->g.offset = 5;
palette->g.length = 6;
palette->b.offset = 0;
palette->b.length = 5;
}
}
/* Notes on per-window bpp settings /* Notes on per-window bpp settings
* *
* Value Win0 Win1 Win2 Win3 Win 4 * Value Win0 Win1 Win2 Win3 Win 4

33
drivers/video/s3c-fb.c
View File

@ -115,6 +115,20 @@ struct s3c_fb_driverdata {
struct s3c_fb_win_variant *win[S3C_FB_MAX_WIN]; struct s3c_fb_win_variant *win[S3C_FB_MAX_WIN];
}; };
/**
* struct s3c_fb_palette - palette information
* @r: Red bitfield.
* @g: Green bitfield.
* @b: Blue bitfield.
* @a: Alpha bitfield.
*/
struct s3c_fb_palette {
struct fb_bitfield r;
struct fb_bitfield g;
struct fb_bitfield b;
struct fb_bitfield a;
};
/** /**
* struct s3c_fb_win - per window private data for each framebuffer. * struct s3c_fb_win - per window private data for each framebuffer.
* @windata: The platform data supplied for the window configuration. * @windata: The platform data supplied for the window configuration.
@ -866,7 +880,24 @@ static int __devinit s3c_fb_probe_win(struct s3c_fb *sfb, unsigned int win_no,
} }
/* setup the r/b/g positions for the window's palette */ /* setup the r/b/g positions for the window's palette */
s3c_fb_init_palette(win_no, &win->palette); if (win->variant.palette_16bpp) {
/* Set RGB 5:6:5 as default */
win->palette.r.offset = 11;
win->palette.r.length = 5;
win->palette.g.offset = 5;
win->palette.g.length = 6;
win->palette.b.offset = 0;
win->palette.b.length = 5;
} else {
/* Set 8bpp or 8bpp and 1bit alpha */
win->palette.r.offset = 16;
win->palette.r.length = 8;
win->palette.g.offset = 8;
win->palette.g.length = 8;
win->palette.b.offset = 0;
win->palette.b.length = 8;
}
/* setup the initial video mode from the window */ /* setup the initial video mode from the window */
fb_videomode_to_var(&fbinfo->var, initmode); fb_videomode_to_var(&fbinfo->var, initmode);