drm_hwcomposer: Move hw_module related code out of DrmHwcTwo.* files
... to reduce complexity of DrmHwcTwo class.
Create "hwc2_device" directory that will be later used to fit
all frontend-related code.
Signed-off-by: Roman Stratiienko <roman.o.stratiienko@globallogic.com>
diff --git a/DrmHwcTwo.cpp b/DrmHwcTwo.cpp
index ad4936b..06c1909 100644
--- a/DrmHwcTwo.cpp
+++ b/DrmHwcTwo.cpp
@@ -38,13 +38,7 @@
namespace android {
-DrmHwcTwo::DrmHwcTwo() : hwc2_device() {
- common.tag = HARDWARE_DEVICE_TAG;
- common.version = HWC_DEVICE_API_VERSION_2_0;
- common.close = HookDevClose;
- getCapabilities = HookDevGetCapabilities;
- getFunction = HookDevGetFunction;
-}
+DrmHwcTwo::DrmHwcTwo() = default;
HWC2::Error DrmHwcTwo::CreateDisplay(hwc2_display_t displ,
HWC2::DisplayType type) {
@@ -1285,320 +1279,4 @@
}
}
-// static
-int DrmHwcTwo::HookDevClose(hw_device_t *dev) {
- // NOLINTNEXTLINE (cppcoreguidelines-pro-type-reinterpret-cast): Safe
- auto *hwc2_dev = reinterpret_cast<hwc2_device_t *>(dev);
- std::unique_ptr<DrmHwcTwo> ctx(toDrmHwcTwo(hwc2_dev));
- return 0;
-}
-
-// static
-void DrmHwcTwo::HookDevGetCapabilities(hwc2_device_t * /*dev*/,
- uint32_t *out_count,
- int32_t * /*out_capabilities*/) {
- *out_count = 0;
-}
-
-// static
-hwc2_function_pointer_t DrmHwcTwo::HookDevGetFunction(
- struct hwc2_device * /*dev*/, int32_t descriptor) {
- auto func = static_cast<HWC2::FunctionDescriptor>(descriptor);
- switch (func) {
- // Device functions
- case HWC2::FunctionDescriptor::CreateVirtualDisplay:
- return ToHook<HWC2_PFN_CREATE_VIRTUAL_DISPLAY>(
- DeviceHook<int32_t, decltype(&DrmHwcTwo::CreateVirtualDisplay),
- &DrmHwcTwo::CreateVirtualDisplay, uint32_t, uint32_t,
- int32_t *, hwc2_display_t *>);
- case HWC2::FunctionDescriptor::DestroyVirtualDisplay:
- return ToHook<HWC2_PFN_DESTROY_VIRTUAL_DISPLAY>(
- DeviceHook<int32_t, decltype(&DrmHwcTwo::DestroyVirtualDisplay),
- &DrmHwcTwo::DestroyVirtualDisplay, hwc2_display_t>);
- case HWC2::FunctionDescriptor::Dump:
- return ToHook<HWC2_PFN_DUMP>(
- DeviceHook<void, decltype(&DrmHwcTwo::Dump), &DrmHwcTwo::Dump,
- uint32_t *, char *>);
- case HWC2::FunctionDescriptor::GetMaxVirtualDisplayCount:
- return ToHook<HWC2_PFN_GET_MAX_VIRTUAL_DISPLAY_COUNT>(
- DeviceHook<uint32_t, decltype(&DrmHwcTwo::GetMaxVirtualDisplayCount),
- &DrmHwcTwo::GetMaxVirtualDisplayCount>);
- case HWC2::FunctionDescriptor::RegisterCallback:
- return ToHook<HWC2_PFN_REGISTER_CALLBACK>(
- DeviceHook<int32_t, decltype(&DrmHwcTwo::RegisterCallback),
- &DrmHwcTwo::RegisterCallback, int32_t,
- hwc2_callback_data_t, hwc2_function_pointer_t>);
-
- // Display functions
- case HWC2::FunctionDescriptor::AcceptDisplayChanges:
- return ToHook<HWC2_PFN_ACCEPT_DISPLAY_CHANGES>(
- DisplayHook<decltype(&HwcDisplay::AcceptDisplayChanges),
- &HwcDisplay::AcceptDisplayChanges>);
- case HWC2::FunctionDescriptor::CreateLayer:
- return ToHook<HWC2_PFN_CREATE_LAYER>(
- DisplayHook<decltype(&HwcDisplay::CreateLayer),
- &HwcDisplay::CreateLayer, hwc2_layer_t *>);
- case HWC2::FunctionDescriptor::DestroyLayer:
- return ToHook<HWC2_PFN_DESTROY_LAYER>(
- DisplayHook<decltype(&HwcDisplay::DestroyLayer),
- &HwcDisplay::DestroyLayer, hwc2_layer_t>);
- case HWC2::FunctionDescriptor::GetActiveConfig:
- return ToHook<HWC2_PFN_GET_ACTIVE_CONFIG>(
- DisplayHook<decltype(&HwcDisplay::GetActiveConfig),
- &HwcDisplay::GetActiveConfig, hwc2_config_t *>);
- case HWC2::FunctionDescriptor::GetChangedCompositionTypes:
- return ToHook<HWC2_PFN_GET_CHANGED_COMPOSITION_TYPES>(
- DisplayHook<decltype(&HwcDisplay::GetChangedCompositionTypes),
- &HwcDisplay::GetChangedCompositionTypes, uint32_t *,
- hwc2_layer_t *, int32_t *>);
- case HWC2::FunctionDescriptor::GetClientTargetSupport:
- return ToHook<HWC2_PFN_GET_CLIENT_TARGET_SUPPORT>(
- DisplayHook<decltype(&HwcDisplay::GetClientTargetSupport),
- &HwcDisplay::GetClientTargetSupport, uint32_t, uint32_t,
- int32_t, int32_t>);
- case HWC2::FunctionDescriptor::GetColorModes:
- return ToHook<HWC2_PFN_GET_COLOR_MODES>(
- DisplayHook<decltype(&HwcDisplay::GetColorModes),
- &HwcDisplay::GetColorModes, uint32_t *, int32_t *>);
- case HWC2::FunctionDescriptor::GetDisplayAttribute:
- return ToHook<HWC2_PFN_GET_DISPLAY_ATTRIBUTE>(
- DisplayHook<decltype(&HwcDisplay::GetDisplayAttribute),
- &HwcDisplay::GetDisplayAttribute, hwc2_config_t, int32_t,
- int32_t *>);
- case HWC2::FunctionDescriptor::GetDisplayConfigs:
- return ToHook<HWC2_PFN_GET_DISPLAY_CONFIGS>(
- DisplayHook<decltype(&HwcDisplay::GetDisplayConfigs),
- &HwcDisplay::GetDisplayConfigs, uint32_t *,
- hwc2_config_t *>);
- case HWC2::FunctionDescriptor::GetDisplayName:
- return ToHook<HWC2_PFN_GET_DISPLAY_NAME>(
- DisplayHook<decltype(&HwcDisplay::GetDisplayName),
- &HwcDisplay::GetDisplayName, uint32_t *, char *>);
- case HWC2::FunctionDescriptor::GetDisplayRequests:
- return ToHook<HWC2_PFN_GET_DISPLAY_REQUESTS>(
- DisplayHook<decltype(&HwcDisplay::GetDisplayRequests),
- &HwcDisplay::GetDisplayRequests, int32_t *, uint32_t *,
- hwc2_layer_t *, int32_t *>);
- case HWC2::FunctionDescriptor::GetDisplayType:
- return ToHook<HWC2_PFN_GET_DISPLAY_TYPE>(
- DisplayHook<decltype(&HwcDisplay::GetDisplayType),
- &HwcDisplay::GetDisplayType, int32_t *>);
- case HWC2::FunctionDescriptor::GetDozeSupport:
- return ToHook<HWC2_PFN_GET_DOZE_SUPPORT>(
- DisplayHook<decltype(&HwcDisplay::GetDozeSupport),
- &HwcDisplay::GetDozeSupport, int32_t *>);
- case HWC2::FunctionDescriptor::GetHdrCapabilities:
- return ToHook<HWC2_PFN_GET_HDR_CAPABILITIES>(
- DisplayHook<decltype(&HwcDisplay::GetHdrCapabilities),
- &HwcDisplay::GetHdrCapabilities, uint32_t *, int32_t *,
- float *, float *, float *>);
- case HWC2::FunctionDescriptor::GetReleaseFences:
- return ToHook<HWC2_PFN_GET_RELEASE_FENCES>(
- DisplayHook<decltype(&HwcDisplay::GetReleaseFences),
- &HwcDisplay::GetReleaseFences, uint32_t *, hwc2_layer_t *,
- int32_t *>);
- case HWC2::FunctionDescriptor::PresentDisplay:
- return ToHook<HWC2_PFN_PRESENT_DISPLAY>(
- DisplayHook<decltype(&HwcDisplay::PresentDisplay),
- &HwcDisplay::PresentDisplay, int32_t *>);
- case HWC2::FunctionDescriptor::SetActiveConfig:
- return ToHook<HWC2_PFN_SET_ACTIVE_CONFIG>(
- DisplayHook<decltype(&HwcDisplay::SetActiveConfig),
- &HwcDisplay::SetActiveConfig, hwc2_config_t>);
- case HWC2::FunctionDescriptor::SetClientTarget:
- return ToHook<HWC2_PFN_SET_CLIENT_TARGET>(
- DisplayHook<decltype(&HwcDisplay::SetClientTarget),
- &HwcDisplay::SetClientTarget, buffer_handle_t, int32_t,
- int32_t, hwc_region_t>);
- case HWC2::FunctionDescriptor::SetColorMode:
- return ToHook<HWC2_PFN_SET_COLOR_MODE>(
- DisplayHook<decltype(&HwcDisplay::SetColorMode),
- &HwcDisplay::SetColorMode, int32_t>);
- case HWC2::FunctionDescriptor::SetColorTransform:
- return ToHook<HWC2_PFN_SET_COLOR_TRANSFORM>(
- DisplayHook<decltype(&HwcDisplay::SetColorTransform),
- &HwcDisplay::SetColorTransform, const float *, int32_t>);
- case HWC2::FunctionDescriptor::SetOutputBuffer:
- return ToHook<HWC2_PFN_SET_OUTPUT_BUFFER>(
- DisplayHook<decltype(&HwcDisplay::SetOutputBuffer),
- &HwcDisplay::SetOutputBuffer, buffer_handle_t, int32_t>);
- case HWC2::FunctionDescriptor::SetPowerMode:
- return ToHook<HWC2_PFN_SET_POWER_MODE>(
- DisplayHook<decltype(&HwcDisplay::SetPowerMode),
- &HwcDisplay::SetPowerMode, int32_t>);
- case HWC2::FunctionDescriptor::SetVsyncEnabled:
- return ToHook<HWC2_PFN_SET_VSYNC_ENABLED>(
- DisplayHook<decltype(&HwcDisplay::SetVsyncEnabled),
- &HwcDisplay::SetVsyncEnabled, int32_t>);
- case HWC2::FunctionDescriptor::ValidateDisplay:
- return ToHook<HWC2_PFN_VALIDATE_DISPLAY>(
- DisplayHook<decltype(&HwcDisplay::ValidateDisplay),
- &HwcDisplay::ValidateDisplay, uint32_t *, uint32_t *>);
-#if PLATFORM_SDK_VERSION > 27
- case HWC2::FunctionDescriptor::GetRenderIntents:
- return ToHook<HWC2_PFN_GET_RENDER_INTENTS>(
- DisplayHook<decltype(&HwcDisplay::GetRenderIntents),
- &HwcDisplay::GetRenderIntents, int32_t, uint32_t *,
- int32_t *>);
- case HWC2::FunctionDescriptor::SetColorModeWithRenderIntent:
- return ToHook<HWC2_PFN_SET_COLOR_MODE_WITH_RENDER_INTENT>(
- DisplayHook<decltype(&HwcDisplay::SetColorModeWithIntent),
- &HwcDisplay::SetColorModeWithIntent, int32_t, int32_t>);
-#endif
-#if PLATFORM_SDK_VERSION > 28
- case HWC2::FunctionDescriptor::GetDisplayIdentificationData:
- return ToHook<HWC2_PFN_GET_DISPLAY_IDENTIFICATION_DATA>(
- DisplayHook<decltype(&HwcDisplay::GetDisplayIdentificationData),
- &HwcDisplay::GetDisplayIdentificationData, uint8_t *,
- uint32_t *, uint8_t *>);
- case HWC2::FunctionDescriptor::GetDisplayCapabilities:
- return ToHook<HWC2_PFN_GET_DISPLAY_CAPABILITIES>(
- DisplayHook<decltype(&HwcDisplay::GetDisplayCapabilities),
- &HwcDisplay::GetDisplayCapabilities, uint32_t *,
- uint32_t *>);
- case HWC2::FunctionDescriptor::GetDisplayBrightnessSupport:
- return ToHook<HWC2_PFN_GET_DISPLAY_BRIGHTNESS_SUPPORT>(
- DisplayHook<decltype(&HwcDisplay::GetDisplayBrightnessSupport),
- &HwcDisplay::GetDisplayBrightnessSupport, bool *>);
- case HWC2::FunctionDescriptor::SetDisplayBrightness:
- return ToHook<HWC2_PFN_SET_DISPLAY_BRIGHTNESS>(
- DisplayHook<decltype(&HwcDisplay::SetDisplayBrightness),
- &HwcDisplay::SetDisplayBrightness, float>);
-#endif /* PLATFORM_SDK_VERSION > 28 */
-#if PLATFORM_SDK_VERSION > 29
- case HWC2::FunctionDescriptor::GetDisplayConnectionType:
- return ToHook<HWC2_PFN_GET_DISPLAY_CONNECTION_TYPE>(
- DisplayHook<decltype(&HwcDisplay::GetDisplayConnectionType),
- &HwcDisplay::GetDisplayConnectionType, uint32_t *>);
- case HWC2::FunctionDescriptor::GetDisplayVsyncPeriod:
- return ToHook<HWC2_PFN_GET_DISPLAY_VSYNC_PERIOD>(
- DisplayHook<decltype(&HwcDisplay::GetDisplayVsyncPeriod),
- &HwcDisplay::GetDisplayVsyncPeriod,
- hwc2_vsync_period_t *>);
- case HWC2::FunctionDescriptor::SetActiveConfigWithConstraints:
- return ToHook<HWC2_PFN_SET_ACTIVE_CONFIG_WITH_CONSTRAINTS>(
- DisplayHook<decltype(&HwcDisplay::SetActiveConfigWithConstraints),
- &HwcDisplay::SetActiveConfigWithConstraints,
- hwc2_config_t, hwc_vsync_period_change_constraints_t *,
- hwc_vsync_period_change_timeline_t *>);
- case HWC2::FunctionDescriptor::SetAutoLowLatencyMode:
- return ToHook<HWC2_PFN_SET_AUTO_LOW_LATENCY_MODE>(
- DisplayHook<decltype(&HwcDisplay::SetAutoLowLatencyMode),
- &HwcDisplay::SetAutoLowLatencyMode, bool>);
- case HWC2::FunctionDescriptor::GetSupportedContentTypes:
- return ToHook<HWC2_PFN_GET_SUPPORTED_CONTENT_TYPES>(
- DisplayHook<decltype(&HwcDisplay::GetSupportedContentTypes),
- &HwcDisplay::GetSupportedContentTypes, uint32_t *,
- uint32_t *>);
- case HWC2::FunctionDescriptor::SetContentType:
- return ToHook<HWC2_PFN_SET_CONTENT_TYPE>(
- DisplayHook<decltype(&HwcDisplay::SetContentType),
- &HwcDisplay::SetContentType, int32_t>);
-#endif
- // Layer functions
- case HWC2::FunctionDescriptor::SetCursorPosition:
- return ToHook<HWC2_PFN_SET_CURSOR_POSITION>(
- LayerHook<decltype(&HwcLayer::SetCursorPosition),
- &HwcLayer::SetCursorPosition, int32_t, int32_t>);
- case HWC2::FunctionDescriptor::SetLayerBlendMode:
- return ToHook<HWC2_PFN_SET_LAYER_BLEND_MODE>(
- LayerHook<decltype(&HwcLayer::SetLayerBlendMode),
- &HwcLayer::SetLayerBlendMode, int32_t>);
- case HWC2::FunctionDescriptor::SetLayerBuffer:
- return ToHook<HWC2_PFN_SET_LAYER_BUFFER>(
- LayerHook<decltype(&HwcLayer::SetLayerBuffer),
- &HwcLayer::SetLayerBuffer, buffer_handle_t, int32_t>);
- case HWC2::FunctionDescriptor::SetLayerColor:
- return ToHook<HWC2_PFN_SET_LAYER_COLOR>(
- LayerHook<decltype(&HwcLayer::SetLayerColor),
- &HwcLayer::SetLayerColor, hwc_color_t>);
- case HWC2::FunctionDescriptor::SetLayerCompositionType:
- return ToHook<HWC2_PFN_SET_LAYER_COMPOSITION_TYPE>(
- LayerHook<decltype(&HwcLayer::SetLayerCompositionType),
- &HwcLayer::SetLayerCompositionType, int32_t>);
- case HWC2::FunctionDescriptor::SetLayerDataspace:
- return ToHook<HWC2_PFN_SET_LAYER_DATASPACE>(
- LayerHook<decltype(&HwcLayer::SetLayerDataspace),
- &HwcLayer::SetLayerDataspace, int32_t>);
- case HWC2::FunctionDescriptor::SetLayerDisplayFrame:
- return ToHook<HWC2_PFN_SET_LAYER_DISPLAY_FRAME>(
- LayerHook<decltype(&HwcLayer::SetLayerDisplayFrame),
- &HwcLayer::SetLayerDisplayFrame, hwc_rect_t>);
- case HWC2::FunctionDescriptor::SetLayerPlaneAlpha:
- return ToHook<HWC2_PFN_SET_LAYER_PLANE_ALPHA>(
- LayerHook<decltype(&HwcLayer::SetLayerPlaneAlpha),
- &HwcLayer::SetLayerPlaneAlpha, float>);
- case HWC2::FunctionDescriptor::SetLayerSidebandStream:
- return ToHook<HWC2_PFN_SET_LAYER_SIDEBAND_STREAM>(
- LayerHook<decltype(&HwcLayer::SetLayerSidebandStream),
- &HwcLayer::SetLayerSidebandStream,
- const native_handle_t *>);
- case HWC2::FunctionDescriptor::SetLayerSourceCrop:
- return ToHook<HWC2_PFN_SET_LAYER_SOURCE_CROP>(
- LayerHook<decltype(&HwcLayer::SetLayerSourceCrop),
- &HwcLayer::SetLayerSourceCrop, hwc_frect_t>);
- case HWC2::FunctionDescriptor::SetLayerSurfaceDamage:
- return ToHook<HWC2_PFN_SET_LAYER_SURFACE_DAMAGE>(
- LayerHook<decltype(&HwcLayer::SetLayerSurfaceDamage),
- &HwcLayer::SetLayerSurfaceDamage, hwc_region_t>);
- case HWC2::FunctionDescriptor::SetLayerTransform:
- return ToHook<HWC2_PFN_SET_LAYER_TRANSFORM>(
- LayerHook<decltype(&HwcLayer::SetLayerTransform),
- &HwcLayer::SetLayerTransform, int32_t>);
- case HWC2::FunctionDescriptor::SetLayerVisibleRegion:
- return ToHook<HWC2_PFN_SET_LAYER_VISIBLE_REGION>(
- LayerHook<decltype(&HwcLayer::SetLayerVisibleRegion),
- &HwcLayer::SetLayerVisibleRegion, hwc_region_t>);
- case HWC2::FunctionDescriptor::SetLayerZOrder:
- return ToHook<HWC2_PFN_SET_LAYER_Z_ORDER>(
- LayerHook<decltype(&HwcLayer::SetLayerZOrder),
- &HwcLayer::SetLayerZOrder, uint32_t>);
- case HWC2::FunctionDescriptor::Invalid:
- default:
- return nullptr;
- }
-}
-
-// static
-int DrmHwcTwo::HookDevOpen(const struct hw_module_t *module, const char *name,
- struct hw_device_t **dev) {
- if (strcmp(name, HWC_HARDWARE_COMPOSER) != 0) {
- ALOGE("Invalid module name- %s", name);
- return -EINVAL;
- }
-
- std::unique_ptr<DrmHwcTwo> ctx(new DrmHwcTwo());
- if (!ctx) {
- ALOGE("Failed to allocate DrmHwcTwo");
- return -ENOMEM;
- }
-
- HWC2::Error err = ctx->Init();
- if (err != HWC2::Error::None) {
- ALOGE("Failed to initialize DrmHwcTwo err=%d\n", err);
- return -EINVAL;
- }
-
- ctx->common.module = (hw_module_t *)module;
- *dev = &ctx.release()->common;
-
- return 0;
-}
} // namespace android
-
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-static struct hw_module_methods_t hwc2_module_methods = {
- .open = android::DrmHwcTwo::HookDevOpen,
-};
-
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-hw_module_t HAL_MODULE_INFO_SYM = {
- .tag = HARDWARE_MODULE_TAG,
- .module_api_version = HARDWARE_MODULE_API_VERSION(2, 0),
- .id = HWC_HARDWARE_MODULE_ID,
- .name = "DrmHwcTwo module",
- .author = "The Android Open Source Project",
- .methods = &hwc2_module_methods,
- .dso = nullptr,
- .reserved = {0},
-};