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>

1 files changed, 7 insertions, 3 deletions

diff --git a/drivers/video/sh_mobile_lcdcfb.c b/drivers/video/sh_mobile_lcdcfb.c
index 3a2cbd18f91b..1c652da348ea 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,