---

yaml --- r: 344686 b: refs/heads/master c: 96e2e63 h: refs/heads/master v: v3
git-mirror · Dec 7, 2012 · d5a15d4 · d5a15d4
1 parent 5a987df
commit d5a15d4
Show file tree

Hide file tree

Showing 6 changed files with 464 additions and 427 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 549acbe7a3380dd3bd2ac71698549148ecc0d17e
+refs/heads/master: 96e2e6374385d2219b9011f6bfd0de7221a591d4
diff --git a/trunk/drivers/video/omap2/dss/apply.c b/trunk/drivers/video/omap2/dss/apply.c
@@ -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);
@@ -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);