drm/omap: Store bus flags in the omap_dss_device structure
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Wed, 6 Jun 2018 12:20:01 +0000 (15:20 +0300)
committerTomi Valkeinen <tomi.valkeinen@ti.com>
Mon, 3 Sep 2018 13:13:30 +0000 (16:13 +0300)
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>
12 files changed:
drivers/gpu/drm/omapdrm/displays/connector-dvi.c
drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c
drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c
drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c
drivers/gpu/drm/omapdrm/displays/panel-sharp-ls037v7dw01.c
drivers/gpu/drm/omapdrm/displays/panel-sony-acx565akm.c
drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c
drivers/gpu/drm/omapdrm/displays/panel-tpo-td043mtea1.c
drivers/gpu/drm/omapdrm/dss/dsi.c
drivers/gpu/drm/omapdrm/dss/omapdss.h
drivers/gpu/drm/omapdrm/dss/sdi.c
drivers/gpu/drm/omapdrm/omap_crtc.c

index b89555ed53a08b8ee747185814fe9e104a2bcfe3..5871872ae19bd12c464316f6a6a77b2abd162194 100644 (file)
@@ -33,9 +33,7 @@ static const struct videomode dvic_default_vm = {
        .vsync_len      = 4,
        .vback_porch    = 7,
 
-       .flags          = DISPLAY_FLAGS_HSYNC_HIGH | DISPLAY_FLAGS_VSYNC_HIGH |
-                         DISPLAY_FLAGS_SYNC_NEGEDGE | DISPLAY_FLAGS_DE_HIGH |
-                         DISPLAY_FLAGS_PIXDATA_POSEDGE,
+       .flags          = DISPLAY_FLAGS_HSYNC_HIGH | DISPLAY_FLAGS_VSYNC_HIGH,
 };
 
 struct panel_drv_data {
index 86c90c15681e1553b6ed2e4fb19bc2964611c75b..56b78cd38701f1d288fd7b9a160d4ecce4e8dfa9 100644 (file)
@@ -76,12 +76,6 @@ static void tfp410_disable(struct omap_dss_device *dssdev)
        dssdev->state = OMAP_DSS_DISPLAY_DISABLED;
 }
 
-static void tfp410_fix_timings(struct videomode *vm)
-{
-       vm->flags |= DISPLAY_FLAGS_DE_HIGH | DISPLAY_FLAGS_PIXDATA_POSEDGE |
-                    DISPLAY_FLAGS_SYNC_POSEDGE;
-}
-
 static void tfp410_set_timings(struct omap_dss_device *dssdev,
                               const struct videomode *vm)
 {
@@ -95,8 +89,6 @@ static int tfp410_check_timings(struct omap_dss_device *dssdev,
 {
        struct omap_dss_device *src = dssdev->src;
 
-       tfp410_fix_timings(vm);
-
        return src->ops->check_timings(src, vm);
 }
 
@@ -137,6 +129,8 @@ static int tfp410_probe(struct platform_device *pdev)
        dssdev->output_type = OMAP_DISPLAY_TYPE_DVI;
        dssdev->owner = THIS_MODULE;
        dssdev->of_ports = BIT(1) | BIT(0);
+       dssdev->bus_flags = DRM_BUS_FLAG_DE_HIGH | DRM_BUS_FLAG_SYNC_POSEDGE
+                         | DRM_BUS_FLAG_PIXDATA_POSEDGE;
 
        dssdev->next = omapdss_of_find_connected_device(pdev->dev.of_node, 1);
        if (IS_ERR(dssdev->next)) {
index ffa69fd44d87ddf6a04f885f99ae9115b9f7aeba..a211506506c00eb3d939ccc3df0f100a65b76a89 100644 (file)
@@ -33,14 +33,7 @@ static const struct videomode lb035q02_vm = {
        .vfront_porch   = 4,
        .vback_porch    = 18,
 
-       .flags          = DISPLAY_FLAGS_HSYNC_LOW | DISPLAY_FLAGS_VSYNC_LOW |
-                         DISPLAY_FLAGS_DE_HIGH | DISPLAY_FLAGS_SYNC_NEGEDGE |
-                         DISPLAY_FLAGS_PIXDATA_POSEDGE,
-       /*
-        * Note: According to the panel documentation:
-        * DE is active LOW
-        * DATA needs to be driven on the FALLING edge
-        */
+       .flags          = DISPLAY_FLAGS_HSYNC_LOW | DISPLAY_FLAGS_VSYNC_LOW,
 };
 
 struct panel_drv_data {
@@ -252,6 +245,14 @@ static int lb035q02_panel_spi_probe(struct spi_device *spi)
        dssdev->owner = THIS_MODULE;
        dssdev->of_ports = BIT(0);
 
+       /*
+        * Note: According to the panel documentation:
+        * DE is active LOW
+        * DATA needs to be driven on the FALLING edge
+        */
+       dssdev->bus_flags = DRM_BUS_FLAG_DE_HIGH | DRM_BUS_FLAG_SYNC_NEGEDGE
+                         | DRM_BUS_FLAG_PIXDATA_POSEDGE;
+
        omapdss_display_init(dssdev);
        omapdss_device_register(dssdev);
 
index 26af95a71eaba910f5ae7d074d45a67782c6e0a6..1b2f33d43bd963bc33a951995908ca27297d896d 100644 (file)
@@ -71,9 +71,7 @@ static const struct videomode nec_8048_panel_vm = {
        .vsync_len      = 1,
        .vback_porch    = 4,
 
-       .flags          = DISPLAY_FLAGS_HSYNC_LOW | DISPLAY_FLAGS_VSYNC_LOW |
-                         DISPLAY_FLAGS_DE_HIGH | DISPLAY_FLAGS_SYNC_POSEDGE |
-                         DISPLAY_FLAGS_PIXDATA_POSEDGE,
+       .flags          = DISPLAY_FLAGS_HSYNC_LOW | DISPLAY_FLAGS_VSYNC_LOW,
 };
 
 #define to_panel_data(p) container_of(p, struct panel_drv_data, dssdev)
@@ -241,6 +239,8 @@ static int nec_8048_probe(struct spi_device *spi)
        dssdev->type = OMAP_DISPLAY_TYPE_DPI;
        dssdev->owner = THIS_MODULE;
        dssdev->of_ports = BIT(0);
+       dssdev->bus_flags = DRM_BUS_FLAG_DE_HIGH | DRM_BUS_FLAG_SYNC_POSEDGE
+                         | DRM_BUS_FLAG_PIXDATA_POSEDGE;
 
        omapdss_display_init(dssdev);
        omapdss_device_register(dssdev);
index a83cd9f4bdb075575af91c1a3e68d25b81263583..fbf88aaaaf56a57e105bcf4e946d041d117a4b53 100644 (file)
@@ -46,13 +46,7 @@ static const struct videomode sharp_ls_vm = {
        .vfront_porch   = 1,
        .vback_porch    = 1,
 
-       .flags          = DISPLAY_FLAGS_HSYNC_LOW | DISPLAY_FLAGS_VSYNC_LOW |
-                         DISPLAY_FLAGS_DE_HIGH | DISPLAY_FLAGS_SYNC_NEGEDGE |
-                         DISPLAY_FLAGS_PIXDATA_POSEDGE,
-       /*
-        * Note: According to the panel documentation:
-        * DATA needs to be driven on the FALLING edge
-        */
+       .flags          = DISPLAY_FLAGS_HSYNC_LOW | DISPLAY_FLAGS_VSYNC_LOW,
 };
 
 #define to_panel_data(p) container_of(p, struct panel_drv_data, dssdev)
@@ -250,6 +244,13 @@ static int sharp_ls_probe(struct platform_device *pdev)
        dssdev->owner = THIS_MODULE;
        dssdev->of_ports = BIT(0);
 
+       /*
+        * Note: According to the panel documentation:
+        * DATA needs to be driven on the FALLING edge
+        */
+       dssdev->bus_flags = DRM_BUS_FLAG_DE_HIGH | DRM_BUS_FLAG_SYNC_NEGEDGE
+                         | DRM_BUS_FLAG_PIXDATA_POSEDGE;
+
        omapdss_display_init(dssdev);
        omapdss_device_register(dssdev);
 
index 8e45c5e64efa648a1b92ef6756d253cab78a0b8d..7e99d546132f2008420d520ec4140aa043b232f0 100644 (file)
@@ -97,9 +97,7 @@ static const struct videomode acx565akm_panel_vm = {
        .vsync_len      = 3,
        .vback_porch    = 4,
 
-       .flags          = DISPLAY_FLAGS_HSYNC_LOW | DISPLAY_FLAGS_VSYNC_LOW |
-                         DISPLAY_FLAGS_DE_HIGH | DISPLAY_FLAGS_SYNC_NEGEDGE |
-                         DISPLAY_FLAGS_PIXDATA_POSEDGE,
+       .flags          = DISPLAY_FLAGS_HSYNC_LOW | DISPLAY_FLAGS_VSYNC_LOW,
 };
 
 #define to_panel_data(p) container_of(p, struct panel_drv_data, dssdev)
@@ -764,6 +762,8 @@ static int acx565akm_probe(struct spi_device *spi)
        dssdev->type = OMAP_DISPLAY_TYPE_SDI;
        dssdev->owner = THIS_MODULE;
        dssdev->of_ports = BIT(0);
+       dssdev->bus_flags = DRM_BUS_FLAG_DE_HIGH | DRM_BUS_FLAG_SYNC_NEGEDGE
+                         | DRM_BUS_FLAG_PIXDATA_POSEDGE;
 
        omapdss_display_init(dssdev);
        omapdss_device_register(dssdev);
index b2a16c470f73dc033721689bc3a8706dae25a676..e8c73ad48e0c4c5d00f513926370d2a42d34d2b2 100644 (file)
@@ -49,13 +49,7 @@ static const struct videomode td028ttec1_panel_vm = {
        .vsync_len      = 2,
        .vback_porch    = 2,
 
-       .flags          = DISPLAY_FLAGS_HSYNC_LOW | DISPLAY_FLAGS_VSYNC_LOW |
-                         DISPLAY_FLAGS_DE_HIGH | DISPLAY_FLAGS_SYNC_POSEDGE |
-                         DISPLAY_FLAGS_PIXDATA_NEGEDGE,
-       /*
-        * Note: According to the panel documentation:
-        * SYNC needs to be driven on the FALLING edge
-        */
+       .flags          = DISPLAY_FLAGS_HSYNC_LOW | DISPLAY_FLAGS_VSYNC_LOW,
 };
 
 #define JBT_COMMAND    0x000
@@ -374,6 +368,13 @@ static int td028ttec1_panel_probe(struct spi_device *spi)
        dssdev->owner = THIS_MODULE;
        dssdev->of_ports = BIT(0);
 
+       /*
+        * Note: According to the panel documentation:
+        * SYNC needs to be driven on the FALLING edge
+        */
+       dssdev->bus_flags = DRM_BUS_FLAG_DE_HIGH | DRM_BUS_FLAG_SYNC_POSEDGE
+                         | DRM_BUS_FLAG_PIXDATA_NEGEDGE;
+
        omapdss_display_init(dssdev);
        omapdss_device_register(dssdev);
 
index 42f80b3ec350047844b000ec6ef9976866d1b027..ae7a40a1759a3105f922baba2bbfce5d1bdef214 100644 (file)
@@ -81,13 +81,7 @@ static const struct videomode tpo_td043_vm = {
        .vfront_porch   = 39,
        .vback_porch    = 34,
 
-       .flags          = DISPLAY_FLAGS_HSYNC_LOW | DISPLAY_FLAGS_VSYNC_LOW |
-                         DISPLAY_FLAGS_DE_HIGH | DISPLAY_FLAGS_SYNC_POSEDGE |
-                         DISPLAY_FLAGS_PIXDATA_NEGEDGE,
-       /*
-        * Note: According to the panel documentation:
-        * SYNC needs to be driven on the FALLING edge
-        */
+       .flags          = DISPLAY_FLAGS_HSYNC_LOW | DISPLAY_FLAGS_VSYNC_LOW,
 };
 
 #define to_panel_data(p) container_of(p, struct panel_drv_data, dssdev)
@@ -472,6 +466,13 @@ static int tpo_td043_probe(struct spi_device *spi)
        dssdev->owner = THIS_MODULE;
        dssdev->of_ports = BIT(0);
 
+       /*
+        * Note: According to the panel documentation:
+        * SYNC needs to be driven on the FALLING edge
+        */
+       dssdev->bus_flags = DRM_BUS_FLAG_DE_HIGH | DRM_BUS_FLAG_SYNC_POSEDGE
+                         | DRM_BUS_FLAG_PIXDATA_NEGEDGE;
+
        omapdss_display_init(dssdev);
        omapdss_device_register(dssdev);
 
index 0afefac4bf653927f89001089c96802d97421825..280f6308122438d155b3ed9bb943d315d03281fc 100644 (file)
@@ -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)) {
index 87306014a53a41bfc850bef16d1ed3b620814265..251e092dfb05e2be9e0e1652d48d58dcd5b74a8d 100644 (file)
@@ -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;
index 3b5f979324753f675edc11f6c682a43c729aac5a..8e111afe595855da0b0ab364194917218a63dc26 100644 (file)
@@ -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)) {
index 6e7a777907f5f02a6123b2d6af5c635e86a49876..39693dfe54af4c25b218a389d685083d1b6b2c45 100644 (file)
@@ -419,12 +419,9 @@ static enum drm_mode_status omap_crtc_mode_valid(struct drm_crtc *crtc,
 static void omap_crtc_mode_set_nofb(struct drm_crtc *crtc)
 {
        struct omap_crtc *omap_crtc = to_omap_crtc(crtc);
-       struct omap_dss_device *display = omap_crtc->pipe->display;
        struct drm_display_mode *mode = &crtc->state->adjusted_mode;
-       const u32 flags_mask = DISPLAY_FLAGS_DE_HIGH | DISPLAY_FLAGS_DE_LOW |
-               DISPLAY_FLAGS_PIXDATA_POSEDGE | DISPLAY_FLAGS_PIXDATA_NEGEDGE |
-               DISPLAY_FLAGS_SYNC_POSEDGE | DISPLAY_FLAGS_SYNC_NEGEDGE;
-       struct videomode vm = {0};
+       struct videomode *vm = &omap_crtc->vm;
+       struct omap_dss_device *dssdev;
 
        DBG("%s: set mode: %d:\"%s\" %d %d %d %d %d %d %d %d %d %d 0x%x 0x%x",
            omap_crtc->name, mode->base.id, mode->name,
@@ -433,7 +430,7 @@ static void omap_crtc_mode_set_nofb(struct drm_crtc *crtc)
            mode->vdisplay, mode->vsync_start, mode->vsync_end, mode->vtotal,
            mode->type, mode->flags);
 
-       drm_display_mode_to_videomode(mode, &omap_crtc->vm);
+       drm_display_mode_to_videomode(mode, vm);
 
        /*
         * HACK: This fixes the vm flags.
@@ -442,13 +439,36 @@ static void omap_crtc_mode_set_nofb(struct drm_crtc *crtc)
         * struct drm_display_mode and struct videomode. The hack below
         * goes and fetches the missing flags from the panel drivers.
         *
-        * Correct solution would be to use DRM's bus-flags, but that's not
-        * easily possible before the omapdrm's panel/encoder driver model
-        * has been changed to the DRM model.
+        * A better solution is to use DRM's bus-flags through the whole driver.
         */
 
-       display->ops->get_timings(display, &vm);
-       omap_crtc->vm.flags |= vm.flags & flags_mask;
+       for (dssdev = omap_crtc->pipe->output; dssdev; dssdev = dssdev->next) {
+               unsigned long bus_flags = dssdev->bus_flags;
+
+               if (!(vm->flags & (DISPLAY_FLAGS_DE_LOW |
+                                  DISPLAY_FLAGS_DE_HIGH))) {
+                       if (bus_flags & DRM_BUS_FLAG_DE_LOW)
+                               vm->flags |= DISPLAY_FLAGS_DE_LOW;
+                       else if (bus_flags & DRM_BUS_FLAG_DE_HIGH)
+                               vm->flags |= DISPLAY_FLAGS_DE_HIGH;
+               }
+
+               if (!(vm->flags & (DISPLAY_FLAGS_PIXDATA_POSEDGE |
+                                  DISPLAY_FLAGS_PIXDATA_NEGEDGE))) {
+                       if (bus_flags & DRM_BUS_FLAG_PIXDATA_POSEDGE)
+                               vm->flags |= DISPLAY_FLAGS_PIXDATA_POSEDGE;
+                       else if (bus_flags & DRM_BUS_FLAG_PIXDATA_NEGEDGE)
+                               vm->flags |= DISPLAY_FLAGS_PIXDATA_NEGEDGE;
+               }
+
+               if (!(vm->flags & (DISPLAY_FLAGS_SYNC_POSEDGE |
+                                  DISPLAY_FLAGS_SYNC_NEGEDGE))) {
+                       if (bus_flags & DRM_BUS_FLAG_SYNC_POSEDGE)
+                               vm->flags |= DISPLAY_FLAGS_SYNC_POSEDGE;
+                       else if (bus_flags & DRM_BUS_FLAG_SYNC_NEGEDGE)
+                               vm->flags |= DISPLAY_FLAGS_SYNC_NEGEDGE;
+               }
+       }
 }
 
 static int omap_crtc_atomic_check(struct drm_crtc *crtc,