commit 2fb0851edbf244288b69b731521f64a99b29b3f5
author Padmanabhan Komanduru <pkomandu@codeaurora.org> Tue May 05 21:02:34 2020 +0530
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Jun 05 02:55:15 2020 -0700
tree 37efaafe15e569421e5e32a0d5321286beb4ce10
parent 0d003b1d299ebae53aa41f2b6d6d1f1e47abfab9

composer: fix the signature to getDebugProperty/getSupportedDsiBitClks

Change-Id: Ie3a2b5cc7bc06073681dbf7701caad09f2e9a522
CRs-Fixed: 2686393

sdm/libs/hwc2/hwc_session.h

diff --git a/sdm/libs/hwc2/hwc_session.h b/sdm/libs/hwc2/hwc_session.h
index e749f7d..af5c3d2 100644
--- a/sdm/libs/hwc2/hwc_session.h
+++ b/sdm/libs/hwc2/hwc_session.h
@@ -274,11 +274,14 @@
     virtual int IsHDRSupported(uint32_t disp_id, bool *supported);
     virtual int IsWCGSupported(uint32_t disp_id, bool *supported);
     virtual int SetLayerAsMask(uint32_t disp_id, uint64_t layer_id);
-    virtual int GetDebugProperty(const std::string prop_name, std::string value);
+    virtual int GetDebugProperty(const std::string prop_name, std::string value) {return -EINVAL;}
+    virtual int GetDebugProperty(const std::string prop_name, std::string *value);
     virtual int GetActiveBuiltinDisplayAttributes(DisplayConfig::Attributes *attr);
     virtual int SetPanelLuminanceAttributes(uint32_t disp_id, float min_lum, float max_lum);
     virtual int IsBuiltInDisplay(uint32_t disp_id, bool *is_builtin);
-    virtual int GetSupportedDSIBitClks(uint32_t disp_id, std::vector<uint64_t> bit_clks);
+    virtual int GetSupportedDSIBitClks(uint32_t disp_id,
+                                       std::vector<uint64_t> bit_clks) {return -EINVAL;}
+    virtual int GetSupportedDSIBitClks(uint32_t disp_id, std::vector<uint64_t> *bit_clks);
     virtual int GetDSIClk(uint32_t disp_id, uint64_t *bit_clk);
     virtual int SetDSIClk(uint32_t disp_id, uint64_t bit_clk);
     virtual int SetCWBOutputBuffer(uint32_t disp_id, const DisplayConfig::Rect rect,

sdm/libs/hwc2/hwc_session_services.cpp

diff --git a/sdm/libs/hwc2/hwc_session_services.cpp b/sdm/libs/hwc2/hwc_session_services.cpp
index 1115eb8..99cfd45 100644
--- a/sdm/libs/hwc2/hwc_session_services.cpp
+++ b/sdm/libs/hwc2/hwc_session_services.cpp
@@ -752,14 +752,14 @@
 }
 
 int HWCSession::DisplayConfigImpl::GetDebugProperty(const std::string prop_name,
-                                                    std::string value) {
+                                                    std::string *value) {
   std::string vendor_prop_name = DISP_PROP_PREFIX;
   int error = -EINVAL;
   char val[64] = {};
 
   vendor_prop_name += prop_name.c_str();
   if (HWCDebugHandler::Get()->GetProperty(vendor_prop_name.c_str(), val) == kErrorNone) {
-    value = val;
+    *value = val;
     error = 0;
   }
 
@@ -833,13 +833,13 @@
 }
 
 int HWCSession::DisplayConfigImpl::GetSupportedDSIBitClks(uint32_t disp_id,
-                                                          std::vector<uint64_t> bit_clks) {
+                                                          std::vector<uint64_t> *bit_clks) {
   SCOPE_LOCK(hwc_session_->locker_[disp_id]);
   if (!hwc_session_->hwc_display_[disp_id]) {
     return -EINVAL;
   }
 
-  hwc_session_->hwc_display_[disp_id]->GetSupportedDSIClock(&bit_clks);
+  hwc_session_->hwc_display_[disp_id]->GetSupportedDSIClock(bit_clks);
   return 0;
 }