commit bb1bd658004a59284f27d4a063a8b936529321c9
author qctecmdr <qctecmdr@localhost> Wed Nov 20 10:06:48 2019 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Nov 20 10:06:48 2019 -0800
tree c87a8077115791469219629955b4a138c4220022
parent 3751d1d58c5ea62da38bee9d7c6bd7d6244b8b65
parent 593582595d22560d0e96318c7a266276eb72f084

Merge "sdm: Remove lock in ResourceDefault implementation"

sdm/libs/core/resource_default.cpp

diff --git a/sdm/libs/core/resource_default.cpp b/sdm/libs/core/resource_default.cpp
index 7686caa..a66a003 100644
--- a/sdm/libs/core/resource_default.cpp
+++ b/sdm/libs/core/resource_default.cpp
@@ -195,8 +195,6 @@
                                                  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::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 @@
 }
 
 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 @@
 }
 
 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 @@
 }
 
 DisplayError ResourceDefault::SetMaxMixerStages(Handle display_ctx, uint32_t max_mixer_stages) {
-  SCOPE_LOCK(locker_);
-
   return kErrorNone;
 }
 

sdm/libs/core/resource_default.h

diff --git a/sdm/libs/core/resource_default.h b/sdm/libs/core/resource_default.h
index ead2ae6..d51008b 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:
@@ -143,7 +143,6 @@
   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_;