drm/omap: Call dispc timings check operation directly

Instead of call the dispc timings check function dispc_mgr_timings_ok()
from the internal encoders .check_timings() operation, expose it through
the dispc ops (after renaming it to check_timings) and call it directly
from omapdrm. This allows removal of now empty omap_dss_device
.check_timings() operations.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

7 files changed, 13 insertions, 45 deletions

diff --git a/drivers/gpu/drm/omapdrm/dss/dispc.c b/drivers/gpu/drm/omapdrm/dss/dispc.c
index da95dbfdf790..e61a9592a650 100644
--- a/drivers/gpu/drm/omapdrm/dss/dispc.c
+++ b/drivers/gpu/drm/omapdrm/dss/dispc.c
@@ -3113,28 +3113,29 @@ static bool _dispc_mgr_pclk_ok(struct dispc_device *dispc,
                 return pclk <= dispc->feat->max_tv_pclk;
 }
 
-bool dispc_mgr_timings_ok(struct dispc_device *dispc, enum omap_channel channel,
-                          const struct videomode *vm)
+static int dispc_mgr_check_timings(struct dispc_device *dispc,
+                                   enum omap_channel channel,
+                                   const struct videomode *vm)
 {
         if (!_dispc_mgr_size_ok(dispc, vm->hactive, vm->vactive))
-                return false;
+                return MODE_BAD;
 
         if (!_dispc_mgr_pclk_ok(dispc, channel, vm->pixelclock))
-                return false;
+                return MODE_BAD;
 
         if (dss_mgr_is_lcd(channel)) {
                 /* TODO: OMAP4+ supports interlace for LCD outputs */
                 if (vm->flags & DISPLAY_FLAGS_INTERLACED)
-                        return false;
+                        return MODE_BAD;
 
                 if (!_dispc_lcd_timings_ok(dispc, vm->hsync_len,
                                 vm->hfront_porch, vm->hback_porch,
                                 vm->vsync_len, vm->vfront_porch,
                                 vm->vback_porch))
-                        return false;
+                        return MODE_BAD;
         }
 
-        return true;
+        return MODE_OK;
 }
 
 static void _dispc_mgr_set_lcd_timings(struct dispc_device *dispc,
@@ -3236,7 +3237,7 @@ static void dispc_mgr_set_timings(struct dispc_device *dispc,
 
         DSSDBG("channel %d xres %u yres %u\n", channel, t.hactive, t.vactive);
 
-        if (!dispc_mgr_timings_ok(dispc, channel, &t)) {
+        if (dispc_mgr_check_timings(dispc, channel, &t)) {
                 BUG();
                 return;
         }
@@ -4733,6 +4734,7 @@ static const struct dispc_ops dispc_ops = {
         .mgr_go_busy = dispc_mgr_go_busy,
         .mgr_go = dispc_mgr_go,
         .mgr_set_lcd_config = dispc_mgr_set_lcd_config,
+        .mgr_check_timings = dispc_mgr_check_timings,
         .mgr_set_timings = dispc_mgr_set_timings,
         .mgr_setup = dispc_mgr_setup,
         .mgr_gamma_size = dispc_mgr_gamma_size,
diff --git a/drivers/gpu/drm/omapdrm/dss/dpi.c b/drivers/gpu/drm/omapdrm/dss/dpi.c
index 58237decb5a8..d814d71fffbc 100644
--- a/drivers/gpu/drm/omapdrm/dss/dpi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dpi.c
@@ -496,7 +496,6 @@ static int dpi_check_timings(struct omap_dss_device *dssdev,
                              struct videomode *vm)
 {
         struct dpi_data *dpi = dpi_get_data_from_dssdev(dssdev);
-        enum omap_channel channel = dpi->output.dispc_channel;
         int lck_div, pck_div;
         unsigned long fck;
         unsigned long pck;
@@ -506,9 +505,6 @@ static int dpi_check_timings(struct omap_dss_device *dssdev,
         if (vm->hactive % 8 != 0)
                 return -EINVAL;
 
-        if (!dispc_mgr_timings_ok(dpi->dss->dispc, channel, vm))
-                return -EINVAL;
-
         if (vm->pixelclock == 0)
                 return -EINVAL;
 
diff --git a/drivers/gpu/drm/omapdrm/dss/dss.h b/drivers/gpu/drm/omapdrm/dss/dss.h
index ee06051933c5..37790c363128 100644
--- a/drivers/gpu/drm/omapdrm/dss/dss.h
+++ b/drivers/gpu/drm/omapdrm/dss/dss.h
@@ -417,9 +417,6 @@ bool dispc_div_calc(struct dispc_device *dispc, unsigned long dispc_freq,
                     unsigned long pck_min, unsigned long pck_max,
                     dispc_div_calc_func func, void *data);
 
-bool dispc_mgr_timings_ok(struct dispc_device *dispc,
-                          enum omap_channel channel,
-                          const struct videomode *vm);
 int dispc_calc_clock_rates(struct dispc_device *dispc,
                            unsigned long dispc_fclk_rate,
                            struct dispc_clock_info *cinfo);
diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi4.c b/drivers/gpu/drm/omapdrm/dss/hdmi4.c
index a66bdbe3b969..3e2bc85ef538 100644
--- a/drivers/gpu/drm/omapdrm/dss/hdmi4.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi4.c
@@ -251,17 +251,6 @@ static void hdmi_power_off_full(struct omap_hdmi *hdmi)
         hdmi_power_off_core(hdmi);
 }
 
-static int hdmi_display_check_timings(struct omap_dss_device *dssdev,
-                                      struct videomode *vm)
-{
-        struct omap_hdmi *hdmi = dssdev_to_hdmi(dssdev);
-
-        if (!dispc_mgr_timings_ok(hdmi->dss->dispc, dssdev->dispc_channel, vm))
-                return -EINVAL;
-
-        return 0;
-}
-
 static void hdmi_display_set_timings(struct omap_dss_device *dssdev,
                                      const struct videomode *vm)
 {
@@ -508,7 +497,6 @@ static const struct omap_dss_device_ops hdmi_ops = {
         .enable                 = hdmi_display_enable,
         .disable                = hdmi_display_disable,
 
-        .check_timings          = hdmi_display_check_timings,
         .set_timings            = hdmi_display_set_timings,
 
         .read_edid              = hdmi_read_edid,
diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi5.c b/drivers/gpu/drm/omapdrm/dss/hdmi5.c
index d63831c9eacf..c02e08299155 100644
--- a/drivers/gpu/drm/omapdrm/dss/hdmi5.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi5.c
@@ -250,17 +250,6 @@ static void hdmi_power_off_full(struct omap_hdmi *hdmi)
         hdmi_power_off_core(hdmi);
 }
 
-static int hdmi_display_check_timings(struct omap_dss_device *dssdev,
-                                      struct videomode *vm)
-{
-        struct omap_hdmi *hdmi = dssdev_to_hdmi(dssdev);
-
-        if (!dispc_mgr_timings_ok(hdmi->dss->dispc, dssdev->dispc_channel, vm))
-                return -EINVAL;
-
-        return 0;
-}
-
 static void hdmi_display_set_timings(struct omap_dss_device *dssdev,
                                      const struct videomode *vm)
 {
@@ -502,7 +491,6 @@ static const struct omap_dss_device_ops hdmi_ops = {
         .enable                 = hdmi_display_enable,
         .disable                = hdmi_display_disable,
 
-        .check_timings          = hdmi_display_check_timings,
         .set_timings            = hdmi_display_set_timings,
 
         .read_edid              = hdmi_read_edid,
diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h b/drivers/gpu/drm/omapdrm/dss/omapdss.h
index 251e092dfb05..1f698a95a94a 100644
--- a/drivers/gpu/drm/omapdrm/dss/omapdss.h
+++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h
@@ -608,6 +608,9 @@ struct dispc_ops {
         void (*mgr_set_lcd_config)(struct dispc_device *dispc,
                                    enum omap_channel channel,
                                    const struct dss_lcd_mgr_config *config);
+        int (*mgr_check_timings)(struct dispc_device *dispc,
+                                 enum omap_channel channel,
+                                 const struct videomode *vm);
         void (*mgr_set_timings)(struct dispc_device *dispc,
                                 enum omap_channel channel,
                                 const struct videomode *vm);
diff --git a/drivers/gpu/drm/omapdrm/dss/sdi.c b/drivers/gpu/drm/omapdrm/dss/sdi.c
index 8e111afe5958..736a74db3ad5 100644
--- a/drivers/gpu/drm/omapdrm/dss/sdi.c
+++ b/drivers/gpu/drm/omapdrm/dss/sdi.c
@@ -237,12 +237,6 @@ static void sdi_set_timings(struct omap_dss_device *dssdev,
 static int sdi_check_timings(struct omap_dss_device *dssdev,
                              struct videomode *vm)
 {
-        struct sdi_device *sdi = dssdev_to_sdi(dssdev);
-        enum omap_channel channel = dssdev->dispc_channel;
-
-        if (!dispc_mgr_timings_ok(sdi->dss->dispc, channel, vm))
-                return -EINVAL;
-
         if (vm->pixelclock == 0)
                 return -EINVAL;