summaryrefslogtreecommitdiffstats
path: root/drivers/video/sh_mobile_lcdcfb.c
diff options
context:
space:
mode:
authorDamian <dhobsong@igel.co.jp>2011-05-18 11:10:08 +0000
committerPaul Mundt <lethal@linux-sh.org>2011-05-23 16:06:26 +0900
commit3fedd2ac7662a10ab2973d3b6f11cdce87b7171a (patch)
tree07640424b8ed5b4342376886023beb8907fedfea /drivers/video/sh_mobile_lcdcfb.c
parent7caa4342ca5b37d2d178b464c16badd4228b3b7b (diff)
sh_mobile_meram: Add support for NV24 framebuffers
Since the NV24 framebuffer has a CbCr plane that is twice as wide as the Y plane, it needs to be handled as a special case. Signed-off-by: Damian Hobson-Garcia <dhobsong@igel.co.jp> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/video/sh_mobile_lcdcfb.c')
-rw-r--r--drivers/video/sh_mobile_lcdcfb.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/video/sh_mobile_lcdcfb.c b/drivers/video/sh_mobile_lcdcfb.c
index 3a2cbd18f91..1c652da348e 100644
--- a/drivers/video/sh_mobile_lcdcfb.c
+++ b/drivers/video/sh_mobile_lcdcfb.c
@@ -627,10 +627,14 @@ static int sh_mobile_lcdc_start(struct sh_mobile_lcdc_priv *priv)
ch->meram_enabled = 0;
- if (ch->info->var.nonstd)
- pf = SH_MOBILE_MERAM_PF_NV;
- else
+ if (ch->info->var.nonstd) {
+ if (ch->info->var.bits_per_pixel == 24)
+ pf = SH_MOBILE_MERAM_PF_NV24;
+ else
+ pf = SH_MOBILE_MERAM_PF_NV;
+ } else {
pf = SH_MOBILE_MERAM_PF_RGB;
+ }
ret = mdev->ops->meram_register(mdev, cfg, pitch,
ch->info->var.yres,