OMAPFB: Adding a check for timings in set_def_mode

When omapfb.mode is passed through bootargs, when omapfb is setting mode,
it would check if timings passed are fine for panel attached to it.
It makes use of check_timing API provided by the panel.

In current code if check_timing API is not available for attached panel,
OMAPFB would return -EINVAL and BPP sent via bootargs will not have any effect.

In case of panels like TAAL panel, omapfb or any other driver should not be allowed to
change the timings. So bpps sent via bootargs will not have an effect.

In such case we can check only the x_res and y_res with the panels resolution
and if they match go ahead and set the bpps.
The bpp value sent via bootarg would have an effect.

Signed-off-by: Mayuresh Janorkar <mayur@ti.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c
index 4fdab8e9c4963249ab9d47b19eb33c56a9422fbe..505ec667204906130eb4457e6d96d75b885f670b 100644 (file)
--- a/drivers/video/omap2/omapfb/omapfb-main.c
+++ b/drivers/video/omap2/omapfb/omapfb-main.c
@@ -2090,7 +2090,7 @@ static int omapfb_set_def_mode(struct omapfb2_device *fbdev,
 {
        int r;
        u8 bpp;
-       struct omap_video_timings timings;
+       struct omap_video_timings timings, temp_timings;
 
        r = omapfb_mode_to_timings(mode_str, &timings, &bpp);
        if (r)
@@ -2100,14 +2100,23 @@ static int omapfb_set_def_mode(struct omapfb2_device *fbdev,
        fbdev->bpp_overrides[fbdev->num_bpp_overrides].bpp = bpp;
        ++fbdev->num_bpp_overrides;
 
-       if (!display->driver->check_timings || !display->driver->set_timings)
-               return -EINVAL;
+       if (display->driver->check_timings) {
+               r = display->driver->check_timings(display, &timings);
+               if (r)
+                       return r;
+       } else {
+               /* If check_timings is not present compare xres and yres */
+               if (display->driver->get_timings) {
+                       display->driver->get_timings(display, &temp_timings);
 
-       r = display->driver->check_timings(display, &timings);
-       if (r)
-               return r;
+                       if (temp_timings.x_res != timings.x_res ||
+                               temp_timings.y_res != timings.y_res)
+                               return -EINVAL;
+               }
+       }
 
-       display->driver->set_timings(display, &timings);
+       if (display->driver->set_timings)
+                       display->driver->set_timings(display, &timings);
 
        return 0;
 }