This patch adds suspend / resume functionality to the RFBI driver along with
missing callback functions needed by OMAP Frame buffer.
Signed-off-by: Mikkel Christensen <m...@ti.com>
---
drivers/video/omap2/dss/rfbi.c | 76 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 76 insertions(+), 0 deletions(-)
diff --git a/drivers/video/omap2/dss/rfbi.c b/drivers/video/omap2/dss/rfbi.c
index 9dd2349..ddfc472 100644
--- a/drivers/video/omap2/dss/rfbi.c
+++ b/drivers/video/omap2/dss/rfbi.c
@@ -1181,6 +1181,7 @@ int rfbi_init(void)
/* Enable autoidle and smart-idle */
l = rfbi_read_reg(RFBI_SYSCONFIG);
+ l &= ~((0x03 << 3)|(0x01 << 0));
l |= (1 << 0) | (2 << 3);
rfbi_write_reg(RFBI_SYSCONFIG, l);
@@ -1208,6 +1209,9 @@ static int rfbi_display_update(struct omap_dss_device
*dssdev,
{
int rfbi_module;
+ if (dssdev->state != OMAP_DSS_DISPLAY_ACTIVE)
+ return 0;
+
if (w == 0 || h == 0)
return 0;
@@ -1239,6 +1243,18 @@ static int rfbi_display_enable_te(struct omap_dss_device
*dssdev, bool enable)
return 0;
}
+static enum omap_dss_update_mode rfbi_display_get_update_mode(
+ struct omap_dss_device *dssdev)
+{
+ return OMAP_DSS_UPDATE_MANUAL;
+}
+
+static int rfbi_display_set_update_mode(struct omap_dss_device *dssdev,
+ enum omap_dss_update_mode mode)
+{
+ return 0;
+}
+
static int rfbi_display_enable(struct omap_dss_device *dssdev)
{
int r;
@@ -1269,6 +1285,7 @@ static int rfbi_display_enable(struct omap_dss_device
*dssdev)
rfbi_set_timings(dssdev->phy.rfbi.channel,
&dssdev->ctrl.rfbi_timings);
+ dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
if (dssdev->driver->enable) {
r = dssdev->driver->enable(dssdev);
@@ -1288,12 +1305,67 @@ err0:
static void rfbi_display_disable(struct omap_dss_device *dssdev)
{
+ dssdev->state = OMAP_DSS_DISPLAY_DISABLED;
+
dssdev->driver->disable(dssdev);
omap_dispc_unregister_isr(framedone_callback, NULL,
DISPC_IRQ_FRAMEDONE);
omap_dss_stop_device(dssdev);
}
+static int rfbi_display_suspend(struct omap_dss_device *dssdev)
+{
+ unsigned long l;
+
+ if (dssdev->state != OMAP_DSS_DISPLAY_ACTIVE)
+ return -EINVAL;
+
+ DSSDBG("rfbi_display_suspend\n");
+
+ if (dssdev->driver->suspend)
+ dssdev->driver->suspend(dssdev);
+
+ dispc_enable_lcd_out(0);
+
+ /* Force idle */
+ rfbi_enable_clocks(1);
+ l = rfbi_read_reg(RFBI_SYSCONFIG);
+ l &= ~(0x03 << 3);
+ rfbi_write_reg(RFBI_SYSCONFIG, l);
+ rfbi_enable_clocks(0);
+
+ dssdev->state = OMAP_DSS_DISPLAY_SUSPENDED;
+
+ return 0;
+}
+
+static int rfbi_display_resume(struct omap_dss_device *dssdev)
+{
+ unsigned long l;
+
+ if (dssdev->state != OMAP_DSS_DISPLAY_SUSPENDED)
+ return -EINVAL;
+
+ DSSDBG("rfbi_display_resume\n");
+
+ /* Re-enable autoidle */
+ rfbi_enable_clocks(1);
+ l = rfbi_read_reg(RFBI_SYSCONFIG);
+ l &= ~(0x03 << 3);
+ l |= (0x02 << 3);
+ rfbi_write_reg(RFBI_SYSCONFIG, l);
+ rfbi_enable_clocks(0);
+
+ dispc_enable_lcd_out(1);
+
+ if (dssdev->driver->resume)
+ dssdev->driver->resume(dssdev);
+
+ dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
+
+ return 0;
+}
+
int rfbi_init_display(struct omap_dss_device *dssdev)
{
dssdev->enable = rfbi_display_enable;
@@ -1301,6 +1373,10 @@ int rfbi_init_display(struct omap_dss_device *dssdev)
dssdev->update = rfbi_display_update;
dssdev->sync = rfbi_display_sync;
dssdev->enable_te = rfbi_display_enable_te;
+ dssdev->get_update_mode = rfbi_display_get_update_mode;
+ dssdev->set_update_mode = rfbi_display_set_update_mode;
+ dssdev->suspend = rfbi_display_suspend;
+ dssdev->resume = rfbi_display_resume;
rfbi.dssdev[dssdev->phy.rfbi.channel] = dssdev;
--
1.6.0.4
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
