OMAPDSS: fix use of dssdev->caps

Recent commit dca2b1522ccab28d03fb79f6e70e70ea78033d52 (OMAPDSS: DSI:
Maintain copy of operation mode in driver data) broke DSI for video mode
displays. The commit changed the way dssdev->caps are initialized, and
the result was that every DSI display is initialized with manual-update
and tear-elim caps.

The code that sets dssdev->caps is not very good, even when fixed.
omapdss driver shouldn't be writing dssdev->caps at all.

This patch fixes the problem with video mode displays by moving the
initialization of dssdev->caps to the panel driver. The same change is
done for RFBI.

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

diff --git a/drivers/video/omap2/displays/panel-n8x0.c b/drivers/video/omap2/displays/panel-n8x0.c
index 17ae85e0033f4f02f92dc95d6ae8224e6c87f9cb..3fc5ad081a212906c92c69497436ddbe08a8807f 100644 (file)
--- a/drivers/video/omap2/displays/panel-n8x0.c
+++ b/drivers/video/omap2/displays/panel-n8x0.c
@@ -489,6 +489,7 @@ static int n8x0_panel_probe(struct omap_dss_device *dssdev)
        dssdev->panel.timings.y_res = 480;
        dssdev->ctrl.pixel_size = 16;
        dssdev->ctrl.rfbi_timings = n8x0_panel_timings;
+       dssdev->caps = OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE;
 
        memset(&props, 0, sizeof(props));
        props.max_brightness = 127;

diff --git a/drivers/video/omap2/displays/panel-taal.c b/drivers/video/omap2/displays/panel-taal.c
index ddda96a52d06cf0842878749bc49fb7bfd0c95b8..7b2d7bb79e68f118c2e466668d4152ebf8b313db 100644 (file)
--- a/drivers/video/omap2/displays/panel-taal.c
+++ b/drivers/video/omap2/displays/panel-taal.c
@@ -884,6 +884,8 @@ static int taal_probe(struct omap_dss_device *dssdev)
 
        dssdev->panel.timings = panel_config->timings;
        dssdev->panel.dsi_pix_fmt = OMAP_DSS_DSI_FMT_RGB888;
+       dssdev->caps = OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE |
+               OMAP_DSS_DISPLAY_CAP_TEAR_ELIM;
 
        td = kzalloc(sizeof(*td), GFP_KERNEL);
        if (!td) {

diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c
index 340c832d21d8f0ca1b9c88b8dfc588072dba3a86..254666fd3958b74b86ef8a7ee62286f919614de0 100644 (file)
--- a/drivers/video/omap2/dss/dsi.c
+++ b/drivers/video/omap2/dss/dsi.c
@@ -4866,11 +4866,6 @@ static int __init dsi_init_display(struct omap_dss_device *dssdev)
 
        DSSDBG("DSI init\n");
 
-       if (dsi->mode == OMAP_DSS_DSI_CMD_MODE) {
-               dssdev->caps = OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE |
-                       OMAP_DSS_DISPLAY_CAP_TEAR_ELIM;
-       }
-
        if (dsi->vdds_dsi_reg == NULL) {
                struct regulator *vdds_dsi;
 

diff --git a/drivers/video/omap2/dss/rfbi.c b/drivers/video/omap2/dss/rfbi.c
index 5a9c0e9d8710fb6f615e77f8505f191440d4afe8..2e520d3085c883c8f6f4f6436a80760f2e2d27c0 100644 (file)
--- a/drivers/video/omap2/dss/rfbi.c
+++ b/drivers/video/omap2/dss/rfbi.c
@@ -939,7 +939,6 @@ EXPORT_SYMBOL(omapdss_rfbi_display_disable);
 static int __init rfbi_init_display(struct omap_dss_device *dssdev)
 {
        rfbi.dssdev[dssdev->phy.rfbi.channel] = dssdev;
-       dssdev->caps = OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE;
        return 0;
 }