summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaurus Cuelenaere <mcuelenaere@gmail.com>2010-07-22 00:40:58 +0200
committerTomi Valkeinen <tomi.valkeinen@nokia.com>2010-08-05 15:52:16 +0200
commite8c66dcf5aa8df2d1b1f249519c920d3a45dd613 (patch)
tree0ff59390ed231bd18f2da86b6f6c1e7eaf3295fa
parentOMAP: DSS2: OMAPFB: Fix probe error path (diff)
downloadlinux-e8c66dcf5aa8df2d1b1f249519c920d3a45dd613.tar.xz
linux-e8c66dcf5aa8df2d1b1f249519c920d3a45dd613.zip
OMAP: DSS2: OMAPFB: Fix invalid bpp for PAL and NTSC modes
omapfb_mode_to_timings() sets the bpp to 0 when bootarg omapfb.mode is set to either "pal" or "ntsc". This patch corrects this by setting the bpp to 24, as would be done if omapdss_default_get_recommended_bpp() would be called. Signed-off-by: Maurus Cuelenaere <mcuelenaere@gmail.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com>
-rw-r--r--drivers/video/omap2/omapfb/omapfb-main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c
index e51b7bf64307..04034d410d6d 100644
--- a/drivers/video/omap2/omapfb/omapfb-main.c
+++ b/drivers/video/omap2/omapfb/omapfb-main.c
@@ -2038,11 +2038,11 @@ static int omapfb_mode_to_timings(const char *mode_str,
#ifdef CONFIG_OMAP2_DSS_VENC
if (strcmp(mode_str, "pal") == 0) {
*timings = omap_dss_pal_timings;
- *bpp = 0;
+ *bpp = 24;
return 0;
} else if (strcmp(mode_str, "ntsc") == 0) {
*timings = omap_dss_ntsc_timings;
- *bpp = 0;
+ *bpp = 24;
return 0;
}
#endif