6 files changed, 40 insertions, 11 deletions

diff --git a/drivers/video/omap2/displays/panel-taal.c b/drivers/video/omap2/displays/panel-taal.c
index 11d69b67a903..e00502ea46e5 100644
--- a/drivers/video/omap2/displays/panel-taal.c
+++ b/drivers/video/omap2/displays/panel-taal.c
@@ -990,6 +990,8 @@ static struct omap_dss_driver taal_driver = {
 
         .setup_update   = taal_setup_update,
         .get_resolution = taal_get_resolution,
+        .get_recommended_bpp = omapdss_default_get_recommended_bpp,
+
         .enable_te      = taal_enable_te,
         .wait_for_te    = taal_wait_te,
         .set_rotate     = taal_rotate,
diff --git a/drivers/video/omap2/dss/core.c b/drivers/video/omap2/dss/core.c
index 2e6ce835ae5c..7ebe50b335ed 100644
--- a/drivers/video/omap2/dss/core.c
+++ b/drivers/video/omap2/dss/core.c
@@ -814,6 +814,9 @@ int omap_dss_register_driver(struct omap_dss_driver *dssdriver)
 
         if (dssdriver->get_resolution == NULL)
                 dssdriver->get_resolution = omapdss_default_get_resolution;
+        if (dssdriver->get_recommended_bpp == NULL)
+                dssdriver->get_recommended_bpp =
+                        omapdss_default_get_recommended_bpp;
 
         return driver_register(&dssdriver->driver);
 }
diff --git a/drivers/video/omap2/dss/display.c b/drivers/video/omap2/dss/display.c
index 3888c191c8a7..af8aae7ef814 100644
--- a/drivers/video/omap2/dss/display.c
+++ b/drivers/video/omap2/dss/display.c
@@ -324,11 +324,8 @@ void default_get_overlay_fifo_thresholds(enum omap_plane plane,
         *fifo_low = fifo_size - burst_size_bytes;
 }
 
-static int default_get_recommended_bpp(struct omap_dss_device *dssdev)
+int omapdss_default_get_recommended_bpp(struct omap_dss_device *dssdev)
 {
-        if (dssdev->panel.recommended_bpp)
-                return dssdev->panel.recommended_bpp;
-
         switch (dssdev->type) {
         case OMAP_DISPLAY_TYPE_DPI:
                 if (dssdev->phy.dpi.data_lines == 24)
@@ -350,6 +347,7 @@ static int default_get_recommended_bpp(struct omap_dss_device *dssdev)
                 BUG();
         }
 }
+EXPORT_SYMBOL(omapdss_default_get_recommended_bpp);
 
 /* Checks if replication logic should be used. Only use for active matrix,
  * when overlay is in RGB12U or RGB16 mode, and LCD interface is
@@ -413,8 +411,6 @@ void dss_init_device(struct platform_device *pdev,
                 return;
         }
 
-        dssdev->get_recommended_bpp = default_get_recommended_bpp;
-
         switch (dssdev->type) {
         case OMAP_DISPLAY_TYPE_DPI:
                 r = dpi_init_display(dssdev);
diff --git a/drivers/video/omap2/dss/venc.c b/drivers/video/omap2/dss/venc.c
index 65514f0f52fd..d13071dd46e5 100644
--- a/drivers/video/omap2/dss/venc.c
+++ b/drivers/video/omap2/dss/venc.c
@@ -460,6 +460,7 @@ static struct omap_dss_driver venc_driver = {
         .resume         = venc_panel_resume,
 
         .get_resolution = omapdss_default_get_resolution,
+        .get_recommended_bpp = omapdss_default_get_recommended_bpp,
 
         .driver         = {
                 .name   = "venc",
diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c
index 212d2efb380c..216ed80293b8 100644
--- a/drivers/video/omap2/omapfb/omapfb-main.c
+++ b/drivers/video/omap2/omapfb/omapfb-main.c
@@ -54,6 +54,8 @@ module_param_named(test, omapfb_test_pattern, bool, 0644);
 #endif
 
 static int omapfb_fb_init(struct omapfb2_device *fbdev, struct fb_info *fbi);
+static int omapfb_get_recommended_bpp(struct omapfb2_device *fbdev,
+                struct omap_dss_device *dssdev);
 
 #ifdef DEBUG
 static void draw_pixel(struct fb_info *fbi, int x, int y, unsigned color)
@@ -1404,6 +1406,7 @@ static int omapfb_alloc_fbmem_display(struct fb_info *fbi, unsigned long size,
                 unsigned long paddr)
 {
         struct omapfb_info *ofbi = FB2OFB(fbi);
+        struct omapfb2_device *fbdev = ofbi->fbdev;
         struct omap_dss_device *display;
         int bytespp;
 
@@ -1412,7 +1415,7 @@ static int omapfb_alloc_fbmem_display(struct fb_info *fbi, unsigned long size,
         if (!display)
                 return 0;
 
-        switch (display->get_recommended_bpp(display)) {
+        switch (omapfb_get_recommended_bpp(fbdev, display)) {
         case 16:
                 bytespp = 2;
                 break;
@@ -1760,7 +1763,7 @@ static int omapfb_fb_init(struct omapfb2_device *fbdev, struct fb_info *fbi)
                 var->yres_virtual = var->yres;
 
                 if (!var->bits_per_pixel) {
-                        switch (display->get_recommended_bpp(display)) {
+                        switch (omapfb_get_recommended_bpp(fbdev, display)) {
                         case 16:
                                 var->bits_per_pixel = 16;
                                 break;
@@ -2011,7 +2014,8 @@ static int omapfb_mode_to_timings(const char *mode_str,
         }
 }
 
-static int omapfb_set_def_mode(struct omap_dss_device *display, char *mode_str)
+static int omapfb_set_def_mode(struct omapfb2_device *fbdev,
+                struct omap_dss_device *display, char *mode_str)
 {
         int r;
         u8 bpp;
@@ -2021,7 +2025,9 @@ static int omapfb_set_def_mode(struct omap_dss_device *display, char *mode_str)
         if (r)
                 return r;
 
-        display->panel.recommended_bpp = bpp;
+        fbdev->bpp_overrides[fbdev->num_bpp_overrides].dssdev = display;
+        fbdev->bpp_overrides[fbdev->num_bpp_overrides].bpp = bpp;
+        ++fbdev->num_bpp_overrides;
 
         if (!display->check_timings || !display->set_timings)
                 return -EINVAL;
@@ -2035,6 +2041,21 @@ static int omapfb_set_def_mode(struct omap_dss_device *display, char *mode_str)
         return 0;
 }
 
+static int omapfb_get_recommended_bpp(struct omapfb2_device *fbdev,
+                struct omap_dss_device *dssdev)
+{
+        int i;
+
+        BUG_ON(dssdev->driver->get_recommended_bpp == NULL);
+
+        for (i = 0; i < fbdev->num_bpp_overrides; ++i) {
+                if (dssdev == fbdev->bpp_overrides[i].dssdev)
+                        return fbdev->bpp_overrides[i].bpp;
+        }
+
+        return dssdev->driver->get_recommended_bpp(dssdev);
+}
+
 static int omapfb_parse_def_modes(struct omapfb2_device *fbdev)
 {
         char *str, *options, *this_opt;
@@ -2073,7 +2094,7 @@ static int omapfb_parse_def_modes(struct omapfb2_device *fbdev)
                         break;
                 }
 
-                r = omapfb_set_def_mode(display, mode_str);
+                r = omapfb_set_def_mode(fbdev, display, mode_str);
                 if (r)
                         break;
         }
diff --git a/drivers/video/omap2/omapfb/omapfb.h b/drivers/video/omap2/omapfb/omapfb.h
index 4ae0b64b3f43..cd54fdbfd8bb 100644
--- a/drivers/video/omap2/omapfb/omapfb.h
+++ b/drivers/video/omap2/omapfb/omapfb.h
@@ -83,6 +83,12 @@ struct omapfb2_device {
         struct omap_overlay *overlays[10];
         unsigned num_managers;
         struct omap_overlay_manager *managers[10];
+
+        unsigned num_bpp_overrides;
+        struct {
+                struct omap_dss_device *dssdev;
+                u8 bpp;
+        } bpp_overrides[10];
 };
 
 struct omapfb_colormode {