Merge "Revert "Update the DDK interface and add support for gralloc1.""

3 files changed, 19 insertions, 13 deletions

diff --git a/merrifield/ips/tangier/TngDisplayContext.cpp b/merrifield/ips/tangier/TngDisplayContext.cpp
index 3f4fd5e..f78f20e 100644
--- a/merrifield/ips/tangier/TngDisplayContext.cpp
+++ b/merrifield/ips/tangier/TngDisplayContext.cpp
@@ -43,15 +43,15 @@ bool TngDisplayContext::initialize()
     CTRACE();
 
     // open frame buffer device
-    const hw_device_t *gralloc;
-    int err = gralloc_open_img(&gralloc);
+    gralloc_module_t const* module;
+    int err = hw_get_module(GRALLOC_HARDWARE_MODULE_ID, (hw_module_t const**)&module);
     if (err) {
         ETRACE("failed to load gralloc module, error = %d", err);
         return false;
     }
 
     // init IMG display device
-    err = gralloc_get_display_device_img(gralloc, (void **)&mIMGDisplayDevice);
+    err = module->perform(module, GRALLOC_MODULE_GET_DISPLAY_DEVICE_IMG, (void **)&mIMGDisplayDevice);
     if (err) {
         ETRACE("failed to get display device, error = %d", err);
         return false;
diff --git a/merrifield/ips/tangier/TngGrallocBufferMapper.cpp b/merrifield/ips/tangier/TngGrallocBufferMapper.cpp
index 4f7eb75..bee4f5e 100644
--- a/merrifield/ips/tangier/TngGrallocBufferMapper.cpp
+++ b/merrifield/ips/tangier/TngGrallocBufferMapper.cpp
@@ -22,10 +22,10 @@
 namespace android {
 namespace intel {
 
-TngGrallocBufferMapper::TngGrallocBufferMapper(const hw_device_t& gralloc,
-                                               DataBuffer& buffer)
+TngGrallocBufferMapper::TngGrallocBufferMapper(gralloc_module_t const& module,
+                                                    DataBuffer& buffer)
     : GrallocBufferMapperBase(buffer),
-      mGralloc(gralloc),
+      mGrallocModule(module),
       mBufferObject(0)
 {
     CTRACE();
@@ -122,7 +122,8 @@ bool TngGrallocBufferMapper::map()
 
     CTRACE();
     // get virtual address
-    err = gralloc_get_buffer_cpu_addresses_img(&mGralloc,
+    err = mGrallocModule.perform(&mGrallocModule,
+                                  GRALLOC_MODULE_GET_BUFFER_CPU_ADDRESSES_IMG,
                                   (buffer_handle_t)mClonedHandle,
                                   vaddr,
                                   size);
@@ -161,7 +162,8 @@ bool TngGrallocBufferMapper::map()
         }
     }
 
-    err = gralloc_put_buffer_cpu_addresses_img(&mGralloc,
+    err = mGrallocModule.perform(&mGrallocModule,
+                                  GRALLOC_MODULE_PUT_BUFFER_CPU_ADDRESSES_IMG,
                                   (buffer_handle_t)mClonedHandle);
     return false;
 }
@@ -182,7 +184,8 @@ bool TngGrallocBufferMapper::unmap()
         mSize[i] = 0;
     }
 
-    err = gralloc_put_buffer_cpu_addresses_img(&mGralloc,
+    err = mGrallocModule.perform(&mGrallocModule,
+                                  GRALLOC_MODULE_PUT_BUFFER_CPU_ADDRESSES_IMG,
                                   (buffer_handle_t)mClonedHandle);
     if (err) {
         ETRACE("failed to unmap. err = %d", err);
@@ -236,7 +239,8 @@ buffer_handle_t TngGrallocBufferMapper::getFbHandle(int subIndex)
     }
 
     // get virtual address
-    err = gralloc_get_buffer_cpu_addresses_img(&mGralloc,
+    err = mGrallocModule.perform(&mGrallocModule,
+                                  GRALLOC_MODULE_GET_BUFFER_CPU_ADDRESSES_IMG,
                                   (buffer_handle_t)mClonedHandle,
                                   vaddr,
                                   size);
@@ -250,7 +254,8 @@ buffer_handle_t TngGrallocBufferMapper::getFbHandle(int subIndex)
 
 void TngGrallocBufferMapper::putFbHandle()
 {
-    int err = gralloc_put_buffer_cpu_addresses_img(&mGralloc,
+    int err = mGrallocModule.perform(&mGrallocModule,
+                                  GRALLOC_MODULE_PUT_BUFFER_CPU_ADDRESSES_IMG,
                                   (buffer_handle_t)mClonedHandle);
     if (err) {
         ETRACE("failed to unmap. err = %d", err);
diff --git a/merrifield/ips/tangier/TngGrallocBufferMapper.h b/merrifield/ips/tangier/TngGrallocBufferMapper.h
index 1b27ae1..17f34c2 100644
--- a/merrifield/ips/tangier/TngGrallocBufferMapper.h
+++ b/merrifield/ips/tangier/TngGrallocBufferMapper.h
@@ -26,7 +26,8 @@ namespace intel {
 
 class TngGrallocBufferMapper : public GrallocBufferMapperBase {
 public:
-    TngGrallocBufferMapper(const hw_device_t& gralloc, DataBuffer& buffer);
+    TngGrallocBufferMapper(gralloc_module_t const& module,
+                               DataBuffer& buffer);
     virtual ~TngGrallocBufferMapper();
 public:
     bool map();
@@ -40,7 +41,7 @@ private:
     bool mapKhandle();
 
 private:
-    const hw_device_t& mGralloc;
+    gralloc_module_t const& mGrallocModule;
     void* mBufferObject;
 	native_handle_t* mClonedHandle;
 };