sdm: Remove lock in ResourceDefault implementation
No need to hold lock the in ResourceDefault when calling its API's since
the lock is held in CompMgr which serializes the request to RM.
Change-Id: I3ed8bb0d5d741353e076479723a77c638e19785d
Crs-fixed: 2563569
diff --git a/sdm/libs/core/resource_default.cpp b/sdm/libs/core/resource_default.cpp
index f44283b..6abdb99 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 @@
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;
}
diff --git a/sdm/libs/core/resource_default.h b/sdm/libs/core/resource_default.h
index 7b08761..f09f0a8 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 @@
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_;