diff options
author | Cyan_Hsieh <cyanhsieh@google.com> | 2019-12-04 12:06:28 +0800 |
---|---|---|
committer | Cyan_Hsieh <cyanhsieh@google.com> | 2019-12-12 12:40:44 +0800 |
commit | 8563e04c08483bdeb5a8b789649a07191a6271d8 (patch) | |
tree | b3b6119adca48fb6db77450d56f5ab792ca45013 | |
parent | 604f8c6c0a1b6e5ff8db7c99cc4472dc883f1f42 (diff) | |
parent | 8c6b60b935bea080f8fe90d97d7237f14835e34f (diff) | |
download | display-8563e04c08483bdeb5a8b789649a07191a6271d8.tar.gz |
Merge remote-tracking branch 'goog/qcom/release/LA.UM.8.1.C9.09.00.00.518.343' into qt-qpr1-dev
Bug: 145572601
Change-Id: I0a35aff59ba9e4a874e5a57ad59eca69985c75bf
-rw-r--r-- | Android.bp | 1 | ||||
-rw-r--r-- | common.mk | 2 | ||||
-rw-r--r-- | gpu_tonemapper/Android.mk | 2 | ||||
-rw-r--r-- | libdebug/Android.mk | 2 | ||||
-rw-r--r-- | libdrmutils/Android.mk | 2 | ||||
-rw-r--r-- | sdm/libs/core/resource_default.cpp | 17 | ||||
-rw-r--r-- | sdm/libs/core/resource_default.h | 3 | ||||
-rw-r--r-- | sdm/libs/hwc2/Android.mk | 2 |
8 files changed, 7 insertions, 24 deletions
@@ -13,7 +13,6 @@ cc_defaults { "-Wconversion", "-Wall", "-Werror", - "-std=c++14", ], shared_libs: [ "liblog", @@ -3,7 +3,7 @@ display_top := $(call my-dir) #Common C flags common_flags := -Wno-missing-field-initializers -common_flags += -Wconversion -Wall -Werror -std=c++14 +common_flags += -Wconversion -Wall -Werror common_flags += -DUSE_GRALLOC1 ifeq ($(TARGET_IS_HEADLESS), true) common_flags += -DTARGET_HEADLESS diff --git a/gpu_tonemapper/Android.mk b/gpu_tonemapper/Android.mk index 61b134f4..fd34da98 100644 --- a/gpu_tonemapper/Android.mk +++ b/gpu_tonemapper/Android.mk @@ -17,7 +17,7 @@ LOCAL_SHARED_LIBRARIES := libEGL libGLESv2 libGLESv3 libui libutils liblog LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr LOCAL_CFLAGS := $(version_flag) -Wno-missing-field-initializers -Wall \ - -Wno-unused-parameter -std=c++11 -DLOG_TAG=\"GPU_TONEMAPPER\" + -Wno-unused-parameter -DLOG_TAG=\"GPU_TONEMAPPER\" LOCAL_SRC_FILES := TonemapFactory.cpp \ glengine.cpp \ diff --git a/libdebug/Android.mk b/libdebug/Android.mk index e975a22a..3ed33949 100644 --- a/libdebug/Android.mk +++ b/libdebug/Android.mk @@ -5,7 +5,7 @@ LOCAL_MODULE := libdisplaydebug LOCAL_VENDOR_MODULE := true LOCAL_MODULE_TAGS := optional LOCAL_SHARED_LIBRARIES := libdl -LOCAL_CFLAGS := -DLOG_TAG=\"SDM\" -Wall -std=c++11 -Werror -fno-operator-names +LOCAL_CFLAGS := -DLOG_TAG=\"SDM\" -Wall -Werror -fno-operator-names LOCAL_CLANG := true LOCAL_SRC_FILES := debug_handler.cpp LOCAL_COPY_HEADERS_TO := qcom/display diff --git a/libdrmutils/Android.mk b/libdrmutils/Android.mk index 97c052b1..172233f9 100644 --- a/libdrmutils/Android.mk +++ b/libdrmutils/Android.mk @@ -8,7 +8,7 @@ LOCAL_C_INCLUDES := external/libdrm \ $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include LOCAL_HEADER_LIBRARIES := display_headers LOCAL_SHARED_LIBRARIES := libdrm libdl libdisplaydebug -LOCAL_CFLAGS := -DLOG_TAG=\"DRMUTILS\" -Wall -std=c++11 -Werror -fno-operator-names +LOCAL_CFLAGS := -DLOG_TAG=\"DRMUTILS\" -Wall -Werror -fno-operator-names LOCAL_CLANG := true LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr LOCAL_SRC_FILES := drm_master.cpp drm_res_mgr.cpp drm_lib_loader.cpp diff --git a/sdm/libs/core/resource_default.cpp b/sdm/libs/core/resource_default.cpp index f44283b7..6abdb990 100644 --- a/sdm/libs/core/resource_default.cpp +++ b/sdm/libs/core/resource_default.cpp @@ -1,5 +1,5 @@ /* -* Copyright (c) 2014-2016, 2018, The Linux Foundation. All rights reserved. +* Copyright (c) 2014-2016, 2018-2019, The Linux Foundation. All rights reserved. * * Redistribution and use in source and binary forms, with or without modification, are permitted * provided that the following conditions are met: @@ -195,8 +195,6 @@ DisplayError ResourceDefault::ReconfigureDisplay(Handle display_ctx, const HWDisplayAttributes &display_attributes, const HWPanelInfo &hw_panel_info, const HWMixerAttributes &mixer_attributes) { - SCOPE_LOCK(locker_); - DisplayResourceContext *display_resource_ctx = reinterpret_cast<DisplayResourceContext *>(display_ctx); @@ -207,14 +205,10 @@ DisplayError ResourceDefault::ReconfigureDisplay(Handle display_ctx, } DisplayError ResourceDefault::Start(Handle display_ctx) { - locker_.Lock(); - return kErrorNone; } DisplayError ResourceDefault::Stop(Handle display_ctx, HWLayers *hw_layers) { - locker_.Unlock(); - return kErrorNone; } @@ -323,19 +317,14 @@ CleanupOnError: } DisplayError ResourceDefault::PostPrepare(Handle display_ctx, HWLayers *hw_layers) { - SCOPE_LOCK(locker_); - return kErrorNone; } DisplayError ResourceDefault::Commit(Handle display_ctx, HWLayers *hw_layers) { - SCOPE_LOCK(locker_); - return kErrorNone; } DisplayError ResourceDefault::PostCommit(Handle display_ctx, HWLayers *hw_layers) { - SCOPE_LOCK(locker_); DisplayResourceContext *display_resource_ctx = reinterpret_cast<DisplayResourceContext *>(display_ctx); HWBlockType hw_block_type = display_resource_ctx->hw_block_type; @@ -363,8 +352,6 @@ DisplayError ResourceDefault::PostCommit(Handle display_ctx, HWLayers *hw_layers } void ResourceDefault::Purge(Handle display_ctx) { - SCOPE_LOCK(locker_); - DisplayResourceContext *display_resource_ctx = reinterpret_cast<DisplayResourceContext *>(display_ctx); HWBlockType hw_block_type = display_resource_ctx->hw_block_type; @@ -378,8 +365,6 @@ void ResourceDefault::Purge(Handle display_ctx) { } DisplayError ResourceDefault::SetMaxMixerStages(Handle display_ctx, uint32_t max_mixer_stages) { - SCOPE_LOCK(locker_); - return kErrorNone; } diff --git a/sdm/libs/core/resource_default.h b/sdm/libs/core/resource_default.h index 7b087615..f09f0a8e 100644 --- a/sdm/libs/core/resource_default.h +++ b/sdm/libs/core/resource_default.h @@ -1,5 +1,5 @@ /* -* Copyright (c) 2014 - 2018, The Linux Foundation. All rights reserved. +* Copyright (c) 2014 - 2019, The Linux Foundation. All rights reserved. * * Redistribution and use in source and binary forms, with or without modification, are permitted * provided that the following conditions are met: @@ -142,7 +142,6 @@ class ResourceDefault : public ResourceInterface { DisplayError CalculateDecimation(float downscale, uint8_t *decimation); DisplayError GetScaleLutConfig(HWScaleLutInfo *lut_info); - Locker locker_; HWResourceInfo hw_res_info_; HWBlockContext hw_block_ctx_[kHWBlockMax]; std::vector<SourcePipe> src_pipes_; diff --git a/sdm/libs/hwc2/Android.mk b/sdm/libs/hwc2/Android.mk index 3a7c9bdd..a000b634 100644 --- a/sdm/libs/hwc2/Android.mk +++ b/sdm/libs/hwc2/Android.mk @@ -14,7 +14,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps) LOCAL_HEADER_LIBRARIES := display_headers LOCAL_CFLAGS := -Wno-missing-field-initializers -Wno-unused-parameter \ - -std=c++11 -fcolor-diagnostics\ + -fcolor-diagnostics\ -DLOG_TAG=\"SDM\" $(common_flags) LOCAL_CLANG := true |