OMAP: DSS2: move get/set_rotate()

Move get/set_rotate() 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 aefd067..9291aa1 100644 (file)
--- a/arch/arm/plat-omap/include/plat/display.h
+++ b/arch/arm/plat-omap/include/plat/display.h
@@ -489,9 +489,6 @@ struct omap_dss_device {
        int (*enable_te)(struct omap_dss_device *dssdev, bool enable);
        int (*get_te)(struct omap_dss_device *dssdev);
 
-       u8 (*get_rotate)(struct omap_dss_device *dssdev);
-       int (*set_rotate)(struct omap_dss_device *dssdev, u8 rotate);
-
        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 4d64449..8f90de0 100644 (file)
--- a/drivers/video/omap2/displays/panel-taal.c
+++ b/drivers/video/omap2/displays/panel-taal.c
@@ -772,16 +772,21 @@ static int taal_rotate(struct omap_dss_device *dssdev, u8 rotate)
 
        dev_dbg(&dssdev->dev, "rotate %d\n", rotate);
 
+       dsi_bus_lock();
+
        if (td->enabled) {
                r = taal_set_addr_mode(rotate, td->mirror);
-
                if (r)
-                       return r;
+                       goto err;
        }
 
        td->rotate = rotate;
 
+       dsi_bus_unlock();
        return 0;
+err:
+       dsi_bus_unlock();
+       return r;
 }
 
 static u8 taal_get_rotate(struct omap_dss_device *dssdev)

diff --git a/drivers/video/omap2/dss/display.c b/drivers/video/omap2/dss/display.c
index 8b91796..263d2fd 100644 (file)
--- a/drivers/video/omap2/dss/display.c
+++ b/drivers/video/omap2/dss/display.c
@@ -185,9 +185,9 @@ static ssize_t display_rotate_show(struct device *dev,
 {
        struct omap_dss_device *dssdev = to_dss_device(dev);
        int rotate;
-       if (!dssdev->get_rotate)
+       if (!dssdev->driver->get_rotate)
                return -ENOENT;
-       rotate = dssdev->get_rotate(dssdev);
+       rotate = dssdev->driver->get_rotate(dssdev);
        return snprintf(buf, PAGE_SIZE, "%u\n", rotate);
 }
 
@@ -198,12 +198,12 @@ static ssize_t display_rotate_store(struct device *dev,
        unsigned long rot;
        int r;
 
-       if (!dssdev->set_rotate || !dssdev->get_rotate)
+       if (!dssdev->driver->set_rotate || !dssdev->driver->get_rotate)
                return -ENOENT;
 
        rot = simple_strtoul(buf, NULL, 0);
 
-       r = dssdev->set_rotate(dssdev, rot);
+       r = dssdev->driver->set_rotate(dssdev, rot);
        if (r)
                return r;
 

diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c
index 2f356d4..82733d1 100644 (file)
--- a/drivers/video/omap2/dss/dsi.c
+++ b/drivers/video/omap2/dss/dsi.c
@@ -3532,36 +3532,6 @@ static int dsi_display_get_te(struct omap_dss_device *dssdev)
        return dsi.te_enabled;
 }
 
-static int dsi_display_set_rotate(struct omap_dss_device *dssdev, u8 rotate)
-{
-
-       DSSDBGF("%d", rotate);
-
-       if (!dssdev->driver->set_rotate || !dssdev->driver->get_rotate)
-               return -EINVAL;
-
-       dsi_bus_lock();
-       dssdev->driver->set_rotate(dssdev, rotate);
-       if (dsi.update_mode == OMAP_DSS_UPDATE_AUTO) {
-               u16 w, h;
-               /* the display dimensions may have changed, so set a new
-                * update region */
-               dssdev->get_resolution(dssdev, &w, &h);
-               dsi_set_update_region(dssdev, 0, 0, w, h);
-       }
-       dsi_bus_unlock();
-
-       return 0;
-}
-
-static u8 dsi_display_get_rotate(struct omap_dss_device *dssdev)
-{
-       if (!dssdev->driver->set_rotate || !dssdev->driver->get_rotate)
-               return 0;
-
-       return dssdev->driver->get_rotate(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)
@@ -3590,9 +3560,6 @@ int dsi_init_display(struct omap_dss_device *dssdev)
        dssdev->enable_te = dsi_display_enable_te;
        dssdev->get_te = dsi_display_get_te;
 
-       dssdev->get_rotate = dsi_display_get_rotate;
-       dssdev->set_rotate = dsi_display_set_rotate;
-
        /* XXX these should be figured out dynamically */
        dssdev->caps = OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE |
                OMAP_DSS_DISPLAY_CAP_TEAR_ELIM;