diff options
author | Pieter Grimmerink <p.grimmerink@inepro.com> | 2009-11-13 04:28:54 -0500 |
---|---|---|
committer | Eric Miao <eric.y.miao@gmail.com> | 2009-11-30 20:02:30 -0500 |
commit | 049ad833b1e52f6edeb675c744547167bf76ab2c (patch) | |
tree | b2daca2e01d73d93fdd60b4f6d66fa6ebfe2586e | |
parent | 448ac479768d6c242338ecf13569dc297f8908ce (diff) |
pxafb: add transparency field to pxafb_mode_info struct
This allows to select either RGB565 (transparency 0) or RGBT555
(transparency 1) from the mode info
Signed-off-by: Pieter Grimmerink <p.grimmerink@inepro.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
-rw-r--r-- | arch/arm/mach-pxa/include/mach/pxafb.h | 3 | ||||
-rw-r--r-- | drivers/video/pxafb.c | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/include/mach/pxafb.h b/arch/arm/mach-pxa/include/mach/pxafb.h index f73061c90b5e..160ec83f51a6 100644 --- a/arch/arm/mach-pxa/include/mach/pxafb.h +++ b/arch/arm/mach-pxa/include/mach/pxafb.h | |||
@@ -76,7 +76,8 @@ struct pxafb_mode_info { | |||
76 | u_char bpp; | 76 | u_char bpp; |
77 | u_int cmap_greyscale:1, | 77 | u_int cmap_greyscale:1, |
78 | depth:8, | 78 | depth:8, |
79 | unused:23; | 79 | transparency:1, |
80 | unused:22; | ||
80 | 81 | ||
81 | /* Parallel Mode Timing */ | 82 | /* Parallel Mode Timing */ |
82 | u_char hsync_len; | 83 | u_char hsync_len; |
diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c index 33a6aacfcbe3..f58a3aae6ea6 100644 --- a/drivers/video/pxafb.c +++ b/drivers/video/pxafb.c | |||
@@ -398,6 +398,7 @@ static void pxafb_setmode(struct fb_var_screeninfo *var, | |||
398 | var->lower_margin = mode->lower_margin; | 398 | var->lower_margin = mode->lower_margin; |
399 | var->sync = mode->sync; | 399 | var->sync = mode->sync; |
400 | var->grayscale = mode->cmap_greyscale; | 400 | var->grayscale = mode->cmap_greyscale; |
401 | var->transp.length = mode->transparency; | ||
401 | 402 | ||
402 | /* set the initial RGBA bitfields */ | 403 | /* set the initial RGBA bitfields */ |
403 | pxafb_set_pixfmt(var, mode->depth); | 404 | pxafb_set_pixfmt(var, mode->depth); |