From 2ae85702f7b51386c2daf021940aed0d10759bc0 Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Thu, 20 Apr 2017 11:01:18 -0700 Subject: [PATCH] graphics: use mapper from the composer We must use the mapper HAL instead of gralloc0/gralloc1 from the composer. Bug: 37540361 Test: boots on marlin, angler, and ryu Change-Id: I5a3ff6a025bf51a3507a4f33fa77e9506a6f1ec9 --- graphics/composer/2.1/default/Android.bp | 5 +- .../composer/2.1/default/ComposerClient.cpp | 128 +++--------------- 2 files changed, 22 insertions(+), 111 deletions(-) diff --git a/graphics/composer/2.1/default/Android.bp b/graphics/composer/2.1/default/Android.bp index fb75bebecc..037f81089e 100644 --- a/graphics/composer/2.1/default/Android.bp +++ b/graphics/composer/2.1/default/Android.bp @@ -5,8 +5,8 @@ cc_library_static { export_include_dirs: ["."], srcs: ["ComposerClient.cpp"], shared_libs: [ - "android.hardware.graphics.allocator@2.0", "android.hardware.graphics.composer@2.1", + "android.hardware.graphics.mapper@2.0", "libbase", "libcutils", "libfmq", @@ -27,8 +27,8 @@ cc_library_shared { srcs: ["Hwc.cpp"], static_libs: ["libhwcomposer-client"], shared_libs: [ - "android.hardware.graphics.allocator@2.0", "android.hardware.graphics.composer@2.1", + "android.hardware.graphics.mapper@2.0", "libbase", "libcutils", "libfmq", @@ -51,7 +51,6 @@ cc_binary { init_rc: ["android.hardware.graphics.composer@2.1-service.rc"], static_libs: ["libhwcomposer-client"], shared_libs: [ - "android.hardware.graphics.allocator@2.0", "android.hardware.graphics.composer@2.1", "libbase", "libbinder", diff --git a/graphics/composer/2.1/default/ComposerClient.cpp b/graphics/composer/2.1/default/ComposerClient.cpp index d599b44ce9..87e4d3b7a7 100644 --- a/graphics/composer/2.1/default/ComposerClient.cpp +++ b/graphics/composer/2.1/default/ComposerClient.cpp @@ -16,8 +16,7 @@ #define LOG_TAG "HwcPassthrough" -#include -#include +#include #include #include "ComposerClient.h" @@ -33,10 +32,11 @@ namespace implementation { namespace { +using MapperError = android::hardware::graphics::mapper::V2_0::Error; +using android::hardware::graphics::mapper::V2_0::IMapper; + class HandleImporter { public: - HandleImporter() : mInitialized(false) {} - bool initialize() { // allow only one client @@ -44,9 +44,7 @@ public: return false; } - if (!openGralloc()) { - return false; - } + mMapper = IMapper::getService(); mInitialized = true; return true; @@ -54,11 +52,7 @@ public: void cleanup() { - if (!mInitialized) { - return; - } - - closeGralloc(); + mMapper.clear(); mInitialized = false; } @@ -76,12 +70,20 @@ public: return true; } - buffer_handle_t clone = cloneBuffer(handle); - if (!clone) { + MapperError error; + buffer_handle_t importedHandle; + mMapper->importBuffer( + hidl_handle(handle), + [&](const auto& tmpError, const auto& tmpBufferHandle) { + error = tmpError; + importedHandle = static_cast(tmpBufferHandle); + }); + if (error != MapperError::NONE) { return false; } - handle = clone; + handle = importedHandle; + return true; } @@ -91,102 +93,12 @@ public: return; } - releaseBuffer(handle); + mMapper->freeBuffer(const_cast(handle)); } private: - bool mInitialized; - - // Some existing gralloc drivers do not support retaining more than once, - // when we are in passthrough mode. - bool openGralloc() - { - const hw_module_t* module = nullptr; - int err = hw_get_module(GRALLOC_HARDWARE_MODULE_ID, &module); - if (err) { - ALOGE("failed to get gralloc module"); - return false; - } - - uint8_t major = (module->module_api_version >> 8) & 0xff; - if (major > 1) { - ALOGE("unknown gralloc module major version %d", major); - return false; - } - - if (major == 1) { - err = gralloc1_open(module, &mDevice); - if (err) { - ALOGE("failed to open gralloc1 device"); - return false; - } - - mRetain = reinterpret_cast( - mDevice->getFunction(mDevice, GRALLOC1_FUNCTION_RETAIN)); - mRelease = reinterpret_cast( - mDevice->getFunction(mDevice, GRALLOC1_FUNCTION_RELEASE)); - if (!mRetain || !mRelease) { - ALOGE("invalid gralloc1 device"); - gralloc1_close(mDevice); - return false; - } - } else { - mModule = reinterpret_cast(module); - } - - return true; - } - - void closeGralloc() - { - if (mDevice) { - gralloc1_close(mDevice); - } - } - - buffer_handle_t cloneBuffer(buffer_handle_t handle) - { - native_handle_t* clone = native_handle_clone(handle); - if (!clone) { - ALOGE("failed to clone buffer %p", handle); - return nullptr; - } - - bool err; - if (mDevice) { - err = (mRetain(mDevice, clone) != GRALLOC1_ERROR_NONE); - } else { - err = (mModule->registerBuffer(mModule, clone) != 0); - } - - if (err) { - ALOGE("failed to retain/register buffer %p", clone); - native_handle_close(clone); - native_handle_delete(clone); - return nullptr; - } - - return clone; - } - - void releaseBuffer(buffer_handle_t handle) - { - if (mDevice) { - mRelease(mDevice, handle); - } else { - mModule->unregisterBuffer(mModule, handle); - } - native_handle_close(handle); - native_handle_delete(const_cast(handle)); - } - - // gralloc1 - gralloc1_device_t* mDevice; - GRALLOC1_PFN_RETAIN mRetain; - GRALLOC1_PFN_RELEASE mRelease; - - // gralloc0 - const gralloc_module_t* mModule; + bool mInitialized = false; + sp mMapper; }; HandleImporter sHandleImporter;