drm/omap: Store bus flags in the omap_dss_device structure

Source components in the display pipeline need to configure their output
signals polarities and clock driving edge based on the requirements of
the sink component.

Those requirements are currently shared across the whole pipeline in the
flags of a videomode structure, instead of being local to each bus. This
both prevents multiple buses from having different configurations (when
the hardware supports it), and makes it difficult to move from videomode
to drm_display_mode as the latter doesn't contain bus polarities and
clock edge flags.

Add a bus_flags field to the omap_dss_device structure and move the
DISPLAY_FLAGS_DE_(LOW|HIGH), DISPLAY_FLAGS_PIXDATA_(POS|NEG)EDGE and
DISPLAY_FLAGS_SYNC_(POS|NEG)EDGE videomode flags to bus_flags in all
external encoders, connectors and panels. The videomode flags are still
used internally for internal encoders, this will be addressed in a
second step.

The related videomode flags in the default mode of the DVI connector can
simply be dropped, as they are always overridden by the TFP410 driver.
Note that this results in both the DISPLAY_FLAGS_SYNC_POSEDGE and
DISPLAY_FLAGS_SYNC_NEGEDGE flags being set, which is invalid, but only
the former is tested for when programming the DISPC, so the DVI
connector flags are effectively overridden by the TFP410 flags.

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>

3 files changed, 6 insertions, 9 deletions

diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c b/drivers/gpu/drm/omapdrm/dss/dsi.c
index 0afefac4bf65..280f63081224 100644
--- a/drivers/gpu/drm/omapdrm/dss/dsi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dsi.c
@@ -4053,12 +4053,6 @@ static int dsi_display_init_dispc(struct dsi_data *dsi)
         dsi->vm.flags |= DISPLAY_FLAGS_HSYNC_HIGH;
         dsi->vm.flags &= ~DISPLAY_FLAGS_VSYNC_LOW;
         dsi->vm.flags |= DISPLAY_FLAGS_VSYNC_HIGH;
-        dsi->vm.flags &= ~DISPLAY_FLAGS_PIXDATA_NEGEDGE;
-        dsi->vm.flags |= DISPLAY_FLAGS_PIXDATA_POSEDGE;
-        dsi->vm.flags &= ~DISPLAY_FLAGS_DE_LOW;
-        dsi->vm.flags |= DISPLAY_FLAGS_DE_HIGH;
-        dsi->vm.flags &= ~DISPLAY_FLAGS_SYNC_POSEDGE;
-        dsi->vm.flags |= DISPLAY_FLAGS_SYNC_NEGEDGE;
 
         dss_mgr_set_timings(&dsi->output, &dsi->vm);
 
@@ -5142,6 +5136,9 @@ static int dsi_init_output(struct dsi_data *dsi)
         out->ops = &dsi_ops;
         out->owner = THIS_MODULE;
         out->of_ports = BIT(0);
+        out->bus_flags = DRM_BUS_FLAG_PIXDATA_POSEDGE
+                       | DRM_BUS_FLAG_DE_HIGH
+                       | DRM_BUS_FLAG_SYNC_NEGEDGE;
 
         out->next = omapdss_of_find_connected_device(out->dev->of_node, 0);
         if (IS_ERR(out->next)) {
diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h b/drivers/gpu/drm/omapdrm/dss/omapdss.h
index 87306014a53a..251e092dfb05 100644
--- a/drivers/gpu/drm/omapdrm/dss/omapdss.h
+++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h
@@ -432,6 +432,7 @@ struct omap_dss_device {
         const struct omap_dss_driver *driver;
         const struct omap_dss_device_ops *ops;
         unsigned long ops_flags;
+        unsigned long bus_flags;
 
         /* helper variable for driver suspend/resume */
         bool activate_after_resume;
diff --git a/drivers/gpu/drm/omapdrm/dss/sdi.c b/drivers/gpu/drm/omapdrm/dss/sdi.c
index 3b5f97932475..8e111afe5958 100644
--- a/drivers/gpu/drm/omapdrm/dss/sdi.c
+++ b/drivers/gpu/drm/omapdrm/dss/sdi.c
@@ -151,9 +151,6 @@ static int sdi_display_enable(struct omap_dss_device *dssdev)
         if (r)
                 goto err_get_dispc;
 
-        /* 15.5.9.1.2 */
-        vm->flags |= DISPLAY_FLAGS_PIXDATA_POSEDGE | DISPLAY_FLAGS_SYNC_POSEDGE;
-
         r = sdi_calc_clock_div(sdi, vm->pixelclock, &fck, &dispc_cinfo);
         if (r)
                 goto err_calc_clock_div;
@@ -298,6 +295,8 @@ static int sdi_init_output(struct sdi_device *sdi)
         out->of_ports = BIT(1);
         out->ops = &sdi_ops;
         out->owner = THIS_MODULE;
+        out->bus_flags = DRM_BUS_FLAG_PIXDATA_POSEDGE   /* 15.5.9.1.2 */
+                       | DRM_BUS_FLAG_SYNC_POSEDGE;
 
         out->next = omapdss_of_find_connected_device(out->dev->of_node, 1);
         if (IS_ERR(out->next)) {