Commit b276dd09 authored by Tomi Valkeinen's avatar Tomi Valkeinen

OMAPDSS: DISPC: remove dssdev depependency from error handler

The dispc error handler tries to "fix" issues by disabling and enabling
panel. This is problematic, as we're trying to remove the dependency
from omapdss to the omap_dss_devices. It's also racy, and doesn't really
fix anything.

This patch removes the use of omap_dss_device from the error handler,
and just disables and enables the associated overlay manager. This
should produce similar results as the previous solution, without using
dssdev.

However, the error handling is still horrible. But the problem boils
down to one question, to which I don't have a clear answer: what to do
when a HW error happens?
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 4c6c65b0
...@@ -3902,15 +3902,12 @@ static void dispc_error_worker(struct work_struct *work) ...@@ -3902,15 +3902,12 @@ static void dispc_error_worker(struct work_struct *work)
if (bit & errors) { if (bit & errors) {
int j; int j;
struct omap_dss_device *dssdev = mgr->get_device(mgr);
bool enable;
DSSERR("SYNC_LOST on channel %s, restarting the output " DSSERR("SYNC_LOST on channel %s, restarting the output "
"with video overlays disabled\n", "with video overlays disabled\n",
mgr->name); mgr->name);
enable = dssdev->state == OMAP_DSS_DISPLAY_ACTIVE; dss_mgr_disable(mgr);
dssdev->driver->disable(dssdev);
for (j = 0; j < omap_dss_get_num_overlays(); ++j) { for (j = 0; j < omap_dss_get_num_overlays(); ++j) {
struct omap_overlay *ovl; struct omap_overlay *ovl;
...@@ -3918,14 +3915,10 @@ static void dispc_error_worker(struct work_struct *work) ...@@ -3918,14 +3915,10 @@ static void dispc_error_worker(struct work_struct *work)
if (ovl->id != OMAP_DSS_GFX && if (ovl->id != OMAP_DSS_GFX &&
ovl->manager == mgr) ovl->manager == mgr)
dispc_ovl_enable(ovl->id, false); ovl->disable(ovl);
} }
dispc_mgr_go(mgr->id); dss_mgr_enable(mgr);
msleep(50);
if (enable)
dssdev->driver->enable(dssdev);
} }
} }
...@@ -3933,13 +3926,9 @@ static void dispc_error_worker(struct work_struct *work) ...@@ -3933,13 +3926,9 @@ static void dispc_error_worker(struct work_struct *work)
DSSERR("OCP_ERR\n"); DSSERR("OCP_ERR\n");
for (i = 0; i < omap_dss_get_num_overlay_managers(); ++i) { for (i = 0; i < omap_dss_get_num_overlay_managers(); ++i) {
struct omap_overlay_manager *mgr; struct omap_overlay_manager *mgr;
struct omap_dss_device *dssdev;
mgr = omap_dss_get_overlay_manager(i); mgr = omap_dss_get_overlay_manager(i);
dssdev = mgr->get_device(mgr); dss_mgr_disable(mgr);
if (dssdev && dssdev->driver)
dssdev->driver->disable(dssdev);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment