commit 1c5e55680d9165d8f9bb2bc6e2c4261574b5d41d
author Puneet Kumar <puneetster@google.com> Thu Jul 30 03:35:38 2015 +0000
committer Puneet Kumar <puneetster@google.com> Thu Jul 30 03:35:38 2015 +0000
tree 59dfc0090c4c085ad306f8d0789a144fb620f8b0
parent 7912438911de042dc035cf1ea39daaf4e56bf9f3

Revert "drm_hwcomposer: remove compositor interface"

This reverts commit 7912438911de042dc035cf1ea39daaf4e56bf9f3.

For now until we can get back to a stable SF/compositor.

Change-Id: I2ba7cab4f1cccfe44b3d35fb18c7784125e88fd6

drmresources.cpp

diff --git a/drmresources.cpp b/drmresources.cpp
index feb5187..9be990f 100644
--- a/drmresources.cpp
+++ b/drmresources.cpp
@@ -467,7 +467,7 @@
     return -EINVAL;
   }
 
-  DrmComposition *comp = compositor_.CreateComposition(NULL);
+  DrmComposition *comp = (DrmComposition *)compositor_.CreateComposition(NULL);
   if (!comp) {
     ALOGE("Failed to create composition for dpms on %d", display);
     return -ENOMEM;
@@ -478,7 +478,7 @@
     delete comp;
     return ret;
   }
-  ret = compositor_.QueueComposition(comp);
+  ret = compositor_.QueueComposition((Composition *)comp);
   if (ret) {
     ALOGE("Failed to queue dpms composition on %d %d", display, ret);
     return ret;