Skip to content

Commit

Permalink
OMAPDSS: move irq handling to dispc-compat
Browse files Browse the repository at this point in the history
The whole dispc irq handling system we currently have is only needed for
compat layer, and thus can be moved from dispc.c to the compat layer.

This is quite straigtforward, but we need to add new dispc functions to
request and free the actual hardware irq: dispc_request_irq() and
dispc_free_irq().

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
  • Loading branch information
Tomi Valkeinen committed Dec 7, 2012
1 parent 549acbe commit 96e2e63
Show file tree
Hide file tree
Showing 5 changed files with 463 additions and 426 deletions.
14 changes: 14 additions & 0 deletions drivers/video/omap2/dss/apply.c
Original file line number Diff line number Diff line change
Expand Up @@ -1607,11 +1607,23 @@ int omapdss_compat_init(void)
if (r)
goto err_mgr_ops;

dispc_runtime_get();

r = dss_dispc_initialize_irq();
if (r)
goto err_init_irq;

dispc_runtime_put();

out:
mutex_unlock(&compat_init_lock);

return 0;

err_init_irq:
dispc_runtime_put();
dss_uninstall_mgr_ops();

err_mgr_ops:
dss_uninit_overlay_managers(pdev);
dss_uninit_overlays(pdev);
Expand All @@ -1633,6 +1645,8 @@ void omapdss_compat_uninit(void)
if (--compat_refcnt > 0)
goto out;

dss_dispc_uninitialize_irq();

dss_uninstall_mgr_ops();

dss_uninit_overlay_managers(pdev);
Expand Down
Loading

0 comments on commit 96e2e63

Please sign in to comment.