OMAP: DSS2: move set/get_mirror()

Move set/get_mirror() from omap_dss_device to omap_dss_driver.

This is part of a larger patch-set, which moves the control from omapdss
driver to the display driver.

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

diff --git a/arch/arm/plat-omap/include/plat/display.h b/arch/arm/plat-omap/include/plat/display.h
index a3363846e18a1605701340b71a33b3b2b73d8c41..aefd0676cd81437231ff448b55f88b55d8da5e90 100644 (file)
--- a/arch/arm/plat-omap/include/plat/display.h
+++ b/arch/arm/plat-omap/include/plat/display.h
@@ -492,9 +492,6 @@ struct omap_dss_device {
        u8 (*get_rotate)(struct omap_dss_device *dssdev);
        int (*set_rotate)(struct omap_dss_device *dssdev, u8 rotate);
 
-       bool (*get_mirror)(struct omap_dss_device *dssdev);
-       int (*set_mirror)(struct omap_dss_device *dssdev, bool enable);
-
        int (*set_wss)(struct omap_dss_device *dssdev, u32 wss);
        u32 (*get_wss)(struct omap_dss_device *dssdev);
 

diff --git a/drivers/video/omap2/displays/panel-taal.c b/drivers/video/omap2/displays/panel-taal.c
index 5f78d3851d91ad080298735fc37fda0ae8691821..4d644497431d50b8d0e160e42ca26f2d4ee2a676 100644 (file)
--- a/drivers/video/omap2/displays/panel-taal.c
+++ b/drivers/video/omap2/displays/panel-taal.c
@@ -797,16 +797,20 @@ static int taal_mirror(struct omap_dss_device *dssdev, bool enable)
 
        dev_dbg(&dssdev->dev, "mirror %d\n", enable);
 
+       dsi_bus_lock();
        if (td->enabled) {
                r = taal_set_addr_mode(td->rotate, enable);
-
                if (r)
-                       return r;
+                       goto err;
        }
 
        td->mirror = enable;
 
+       dsi_bus_unlock();
        return 0;
+err:
+       dsi_bus_unlock();
+       return r;
 }
 
 static bool taal_get_mirror(struct omap_dss_device *dssdev)

diff --git a/drivers/video/omap2/dss/display.c b/drivers/video/omap2/dss/display.c
index 3f345b8cbcb08eb06ba13e56070b386999c0042e..8b9179668f4860d64f47f4b02aa81946147c0f10 100644 (file)
--- a/drivers/video/omap2/dss/display.c
+++ b/drivers/video/omap2/dss/display.c
@@ -215,9 +215,9 @@ static ssize_t display_mirror_show(struct device *dev,
 {
        struct omap_dss_device *dssdev = to_dss_device(dev);
        int mirror;
-       if (!dssdev->get_mirror)
+       if (!dssdev->driver->get_mirror)
                return -ENOENT;
-       mirror = dssdev->get_mirror(dssdev);
+       mirror = dssdev->driver->get_mirror(dssdev);
        return snprintf(buf, PAGE_SIZE, "%u\n", mirror);
 }
 
@@ -228,12 +228,12 @@ static ssize_t display_mirror_store(struct device *dev,
        unsigned long mirror;
        int r;
 
-       if (!dssdev->set_mirror || !dssdev->get_mirror)
+       if (!dssdev->driver->set_mirror || !dssdev->driver->get_mirror)
                return -ENOENT;
 
        mirror = simple_strtoul(buf, NULL, 0);
 
-       r = dssdev->set_mirror(dssdev, mirror);
+       r = dssdev->driver->set_mirror(dssdev, mirror);
        if (r)
                return r;
 

diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c
index 638d8c29e9d9b4101970bf91a300cac2ddf5f7b8..2f356d471b0e08cebe1b920b7033d42753e5f3ed 100644 (file)
--- a/drivers/video/omap2/dss/dsi.c
+++ b/drivers/video/omap2/dss/dsi.c
@@ -3562,28 +3562,6 @@ static u8 dsi_display_get_rotate(struct omap_dss_device *dssdev)
        return dssdev->driver->get_rotate(dssdev);
 }
 
-static int dsi_display_set_mirror(struct omap_dss_device *dssdev, bool mirror)
-{
-       DSSDBGF("%d", mirror);
-
-       if (!dssdev->driver->set_mirror || !dssdev->driver->get_mirror)
-               return -EINVAL;
-
-       dsi_bus_lock();
-       dssdev->driver->set_mirror(dssdev, mirror);
-       dsi_bus_unlock();
-
-       return 0;
-}
-
-static bool dsi_display_get_mirror(struct omap_dss_device *dssdev)
-{
-       if (!dssdev->driver->set_mirror || !dssdev->driver->get_mirror)
-               return 0;
-
-       return dssdev->driver->get_mirror(dssdev);
-}
-
 void dsi_get_overlay_fifo_thresholds(enum omap_plane plane,
                u32 fifo_size, enum omap_burst_size *burst_size,
                u32 *fifo_low, u32 *fifo_high)
@@ -3615,9 +3593,6 @@ int dsi_init_display(struct omap_dss_device *dssdev)
        dssdev->get_rotate = dsi_display_get_rotate;
        dssdev->set_rotate = dsi_display_set_rotate;
 
-       dssdev->get_mirror = dsi_display_get_mirror;
-       dssdev->set_mirror = dsi_display_set_mirror;
-
        /* XXX these should be figured out dynamically */
        dssdev->caps = OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE |
                OMAP_DSS_DISPLAY_CAP_TEAR_ELIM;