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

This reverts commit be5caddb7d82f64ce765752e7451240f6a11a589.

Bug: 35427231
Test: netflix, youtube, play movies

Change-Id: Ifde1ce1fa2dcc52367c158208cb68feaa257a672

3 files changed, 13 insertions, 19 deletions

diff --git a/moorefield_hdmi/ips/tangier/TngDisplayContext.cpp b/moorefield_hdmi/ips/tangier/TngDisplayContext.cpp
index e755988..789d80f 100755
--- a/moorefield_hdmi/ips/tangier/TngDisplayContext.cpp
+++ b/moorefield_hdmi/ips/tangier/TngDisplayContext.cpp
@@ -42,15 +42,15 @@ bool TngDisplayContext::initialize()
     CTRACE();
 
     // open frame buffer device
-    gralloc_module_t const* module;
-    int err = hw_get_module(GRALLOC_HARDWARE_MODULE_ID, (hw_module_t const**)&module);
+    const hw_device_t *gralloc;
+    int err = gralloc_open_img(&gralloc);
     if (err) {
         ELOGTRACE("failed to load gralloc module, error = %d", err);
         return false;
     }
 
     // init IMG display device
-    err = module->perform(module, GRALLOC_MODULE_GET_DISPLAY_DEVICE_IMG, (void **)&mIMGDisplayDevice);
+    err = gralloc_get_display_device_img(gralloc, (void **)&mIMGDisplayDevice);
     if (err) {
         ELOGTRACE("failed to get display device, error = %d", err);
         return false;
diff --git a/moorefield_hdmi/ips/tangier/TngGrallocBufferMapper.cpp b/moorefield_hdmi/ips/tangier/TngGrallocBufferMapper.cpp
index 91e6192..6e544e3 100644
--- a/moorefield_hdmi/ips/tangier/TngGrallocBufferMapper.cpp
+++ b/moorefield_hdmi/ips/tangier/TngGrallocBufferMapper.cpp
@@ -22,10 +22,10 @@
 namespace android {
 namespace intel {
 
-TngGrallocBufferMapper::TngGrallocBufferMapper(gralloc_module_t const& module,
-                                                    DataBuffer& buffer)
+TngGrallocBufferMapper::TngGrallocBufferMapper(const hw_device_t& gralloc,
+                                               DataBuffer& buffer)
     : GrallocBufferMapperBase(buffer),
-      mGrallocModule(module),
+      mGralloc(gralloc),
       mBufferObject(0)
 {
     CTRACE();
@@ -122,8 +122,7 @@ bool TngGrallocBufferMapper::map()
 
     CTRACE();
     // get virtual address
-    err = mGrallocModule.perform(&mGrallocModule,
-                                  GRALLOC_MODULE_GET_BUFFER_CPU_ADDRESSES_IMG,
+    err = gralloc_get_buffer_cpu_addresses_img(&mGralloc,
                                   (buffer_handle_t)mClonedHandle,
                                   vaddr,
                                   size);
@@ -162,8 +161,7 @@ bool TngGrallocBufferMapper::map()
         }
     }
 
-    err = mGrallocModule.perform(&mGrallocModule,
-                                  GRALLOC_MODULE_PUT_BUFFER_CPU_ADDRESSES_IMG,
+    err = gralloc_put_buffer_cpu_addresses_img(&mGralloc,
                                   (buffer_handle_t)mClonedHandle);
     return false;
 }
@@ -184,8 +182,7 @@ bool TngGrallocBufferMapper::unmap()
         mSize[i] = 0;
     }
 
-    err = mGrallocModule.perform(&mGrallocModule,
-                                  GRALLOC_MODULE_PUT_BUFFER_CPU_ADDRESSES_IMG,
+    err = gralloc_put_buffer_cpu_addresses_img(&mGralloc,
                                   (buffer_handle_t)mClonedHandle);
     if (err) {
         ELOGTRACE("failed to unmap. err = %d", err);
@@ -239,8 +236,7 @@ uint32_t TngGrallocBufferMapper::getFbHandle(int subIndex)
     }
 
     // get virtual address
-    err = mGrallocModule.perform(&mGrallocModule,
-                                  GRALLOC_MODULE_GET_BUFFER_CPU_ADDRESSES_IMG,
+    err = gralloc_get_buffer_cpu_addresses_img(&mGralloc,
                                   (buffer_handle_t)mClonedHandle,
                                   vaddr,
                                   size);
@@ -254,8 +250,7 @@ uint32_t TngGrallocBufferMapper::getFbHandle(int subIndex)
 
 void TngGrallocBufferMapper::putFbHandle()
 {
-    int err = mGrallocModule.perform(&mGrallocModule,
-                                  GRALLOC_MODULE_PUT_BUFFER_CPU_ADDRESSES_IMG,
+    int err = gralloc_put_buffer_cpu_addresses_img(&mGralloc,
                                   (buffer_handle_t)mClonedHandle);
     if (err) {
         ELOGTRACE("failed to unmap. err = %d", err);
diff --git a/moorefield_hdmi/ips/tangier/TngGrallocBufferMapper.h b/moorefield_hdmi/ips/tangier/TngGrallocBufferMapper.h
index aaf6d4a..94ed8db 100644
--- a/moorefield_hdmi/ips/tangier/TngGrallocBufferMapper.h
+++ b/moorefield_hdmi/ips/tangier/TngGrallocBufferMapper.h
@@ -25,8 +25,7 @@ namespace intel {
 
 class TngGrallocBufferMapper : public GrallocBufferMapperBase {
 public:
-    TngGrallocBufferMapper(gralloc_module_t const& module,
-                               DataBuffer& buffer);
+    TngGrallocBufferMapper(const hw_device_t& gralloc, DataBuffer& buffer);
     virtual ~TngGrallocBufferMapper();
 public:
     bool map();
@@ -40,7 +39,7 @@ private:
     bool mapKhandle();
 
 private:
-    gralloc_module_t const& mGrallocModule;
+    const hw_device_t& mGralloc;
     void* mBufferObject;
     native_handle_t* mClonedHandle;
 };