diff options
Diffstat (limited to 'merrifield/ips')
-rw-r--r-- | merrifield/ips/tangier/TngDisplayContext.cpp | 6 | ||||
-rw-r--r-- | merrifield/ips/tangier/TngGrallocBufferMapper.cpp | 21 | ||||
-rw-r--r-- | merrifield/ips/tangier/TngGrallocBufferMapper.h | 5 |
3 files changed, 13 insertions, 19 deletions
diff --git a/merrifield/ips/tangier/TngDisplayContext.cpp b/merrifield/ips/tangier/TngDisplayContext.cpp index f78f20e..3f4fd5e 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 - 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) { ETRACE("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) { 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 bee4f5e..4f7eb75 100644 --- a/merrifield/ips/tangier/TngGrallocBufferMapper.cpp +++ b/merrifield/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) { ETRACE("failed to unmap. err = %d", err); @@ -239,8 +236,7 @@ buffer_handle_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 @@ buffer_handle_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) { ETRACE("failed to unmap. err = %d", err); diff --git a/merrifield/ips/tangier/TngGrallocBufferMapper.h b/merrifield/ips/tangier/TngGrallocBufferMapper.h index 17f34c2..1b27ae1 100644 --- a/merrifield/ips/tangier/TngGrallocBufferMapper.h +++ b/merrifield/ips/tangier/TngGrallocBufferMapper.h @@ -26,8 +26,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(); @@ -41,7 +40,7 @@ private: bool mapKhandle(); private: - gralloc_module_t const& mGrallocModule; + const hw_device_t& mGralloc; void* mBufferObject; native_handle_t* mClonedHandle; }; |