diff options
author | Daniel Cardenas <danielcar@google.com> | 2017-02-23 04:32:33 +0000 |
---|---|---|
committer | Daniel Cardenas <danielcar@google.com> | 2017-02-23 04:32:33 +0000 |
commit | be5caddb7d82f64ce765752e7451240f6a11a589 (patch) | |
tree | d67f92a32e63a82adce5677c8bed1966ccdc3371 /moorefield_hdmi/ips | |
parent | 7a141a8d91c694a65c0d191ef15f9c1e350263cf (diff) | |
download | hwcomposer-be5caddb7d82f64ce765752e7451240f6a11a589.tar.gz |
Revert "Update the DDK interface and add support for gralloc1."
This reverts commit 7a141a8d91c694a65c0d191ef15f9c1e350263cf.
Change-Id: I2730fb82a20d5211aef85475337f0539b2910285
Diffstat (limited to 'moorefield_hdmi/ips')
-rwxr-xr-x | moorefield_hdmi/ips/tangier/TngDisplayContext.cpp | 6 | ||||
-rw-r--r-- | moorefield_hdmi/ips/tangier/TngGrallocBufferMapper.cpp | 21 | ||||
-rw-r--r-- | moorefield_hdmi/ips/tangier/TngGrallocBufferMapper.h | 5 |
3 files changed, 19 insertions, 13 deletions
diff --git a/moorefield_hdmi/ips/tangier/TngDisplayContext.cpp b/moorefield_hdmi/ips/tangier/TngDisplayContext.cpp index 789d80f..e755988 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 - 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) { ELOGTRACE("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) { 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 6e544e3..91e6192 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(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) { ELOGTRACE("failed to unmap. err = %d", err); @@ -236,7 +239,8 @@ uint32_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 @@ uint32_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) { ELOGTRACE("failed to unmap. err = %d", err); diff --git a/moorefield_hdmi/ips/tangier/TngGrallocBufferMapper.h b/moorefield_hdmi/ips/tangier/TngGrallocBufferMapper.h index 94ed8db..aaf6d4a 100644 --- a/moorefield_hdmi/ips/tangier/TngGrallocBufferMapper.h +++ b/moorefield_hdmi/ips/tangier/TngGrallocBufferMapper.h @@ -25,7 +25,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(); @@ -39,7 +40,7 @@ private: bool mapKhandle(); private: - const hw_device_t& mGralloc; + gralloc_module_t const& mGrallocModule; void* mBufferObject; native_handle_t* mClonedHandle; }; |