OMAPDSS: DSSCOMP: Handle inactive state in composition apply

We ignore the error due to display in inactive state during
mgr->apply. This leave the composition in applied state if
display is disabled or suspended inbetween composition apply.
On system suspend with HDMI connected compositions are still
applied even after HDMI becomes inactive( suspend state). On
resume SGX starts dumping because one composition is struck
in applied state.

This patch fixes this issue by calling mbg->blank to
clear such compositions.

Change-Id: Ib0498b97c23c129a673678517d665b1bdb462eb3
Signed-off-by: Arthur Philpott <arthur.philpott@ti.com>

diff --git a/drivers/video/omap2/dsscomp/queue.c b/drivers/video/omap2/dsscomp/queue.c
index e7ccdbd09ec0ac38cc1131c3a65f4da898753e11..280cdceaac395a067e589ba1e6188fc1faf2f06a 100755 (executable)
--- a/drivers/video/omap2/dsscomp/queue.c
+++ b/drivers/video/omap2/dsscomp/queue.c
@@ -600,11 +600,13 @@ skip_ovl_set:
                        mgr->ovls[oix] = cdev->ovls[oi->cfg.ix];
                        mgr->ovls[oix]->enabled = oi->cfg.enabled;
                }
-               r = mgr->set_ovl(mgr);
-               if (r) {
-                       dev_err(DEV(cdev), "[%p] "
-                               "set_ovl failed\n", comp);
-                       goto err;
+               if (!r) {
+                       r = mgr->set_ovl(mgr);
+                       if (r) {
+                               dev_err(DEV(cdev), "[%p] "
+                                       "set_ovl failed\n", comp);
+                               goto err;
+                       }
                }
        }
        mutex_unlock(&mtx);