Merge 6847a0d8eab22f7a65c22e0e80e2f33296fad07c on remote branch

Change-Id: I812caaa77a8437907af1db6399cc7f5a9b462794

6 files changed, 71 insertions, 16 deletions

diff --git a/sdm/libs/core/display_base.h b/sdm/libs/core/display_base.h
index d18d4a4a..95072483 100644
--- a/sdm/libs/core/display_base.h
+++ b/sdm/libs/core/display_base.h
@@ -63,7 +63,7 @@ class DisplayBase : public DisplayInterface {
   virtual DisplayError GetDisplayState(DisplayState *state);
   virtual DisplayError GetNumVariableInfoConfigs(uint32_t *count);
   virtual DisplayError GetConfig(uint32_t index, DisplayConfigVariableInfo *variable_info);
-  virtual DisplayError GetConfig(DisplayConfigFixedInfo *variable_info);
+  virtual DisplayError GetConfig(DisplayConfigFixedInfo *fixed_info);
   virtual DisplayError GetActiveConfig(uint32_t *index);
   virtual DisplayError GetVSyncState(bool *enabled);
   virtual DisplayError SetDisplayState(DisplayState state, bool teardown,
diff --git a/sdm/libs/core/display_builtin.cpp b/sdm/libs/core/display_builtin.cpp
index 2bd90042..4cdf9d83 100644
--- a/sdm/libs/core/display_builtin.cpp
+++ b/sdm/libs/core/display_builtin.cpp
@@ -1001,4 +1001,23 @@ void DisplayBuiltIn::GetFpsConfig(HWDisplayAttributes *display_attr, HWPanelInfo
   panel_info->transfer_time_us = hw_panel_info_.transfer_time_us;
 }
 
+DisplayError DisplayBuiltIn::GetConfig(DisplayConfigFixedInfo *fixed_info) {
+  lock_guard<recursive_mutex> obj(recursive_mutex_);
+  fixed_info->is_cmdmode = (hw_panel_info_.mode == kModeCommand);
+
+  HWResourceInfo hw_resource_info = HWResourceInfo();
+  hw_info_intf_->GetHWResourceInfo(&hw_resource_info);
+
+  fixed_info->hdr_supported = hw_resource_info.has_hdr;
+  // Populate luminance values only if hdr will be supported on that display
+  fixed_info->max_luminance = fixed_info->hdr_supported ? hw_panel_info_.peak_luminance: 0;
+  fixed_info->average_luminance = fixed_info->hdr_supported ? hw_panel_info_.average_luminance : 0;
+  fixed_info->min_luminance = fixed_info->hdr_supported ?  hw_panel_info_.blackness_level: 0;
+  fixed_info->hdr_eotf = hw_panel_info_.hdr_eotf;
+  fixed_info->hdr_metadata_type_one = hw_panel_info_.hdr_metadata_type_one;
+  fixed_info->partial_update = hw_panel_info_.partial_update;
+
+  return kErrorNone;
+}
+
 }  // namespace sdm
diff --git a/sdm/libs/core/display_builtin.h b/sdm/libs/core/display_builtin.h
index 6da7a87f..6132a939 100644
--- a/sdm/libs/core/display_builtin.h
+++ b/sdm/libs/core/display_builtin.h
@@ -120,6 +120,7 @@ class DisplayBuiltIn : public DisplayBase, HWEventHandler, DppsPropIntf {
   virtual DisplayError SetDynamicDSIClock(uint64_t bit_clk_rate);
   virtual DisplayError GetDynamicDSIClock(uint64_t *bit_clk_rate);
   virtual DisplayError GetSupportedDSIClock(std::vector<uint64_t> *bitclk_rates);
+  virtual DisplayError GetConfig(DisplayConfigFixedInfo *fixed_info);
 
   // Implement the HWEventHandlers
   virtual DisplayError VSync(int64_t timestamp);
diff --git a/sdm/libs/core/drm/hw_info_drm.cpp b/sdm/libs/core/drm/hw_info_drm.cpp
index 3cbb6de0..6cbfba4a 100644
--- a/sdm/libs/core/drm/hw_info_drm.cpp
+++ b/sdm/libs/core/drm/hw_info_drm.cpp
@@ -827,7 +827,7 @@ DisplayError HWInfoDRM::GetDisplaysStatus(HWDisplaysInfo *hw_displays_info) {
         hw_info.display_type = kVirtual;
         break;
       default:
-        DLOGE("Unknown display type = %d on connector id %u.", iter.second.type,
+        DLOGW("Unknown display type = %d on connector id %u.", iter.second.type,
               hw_info.display_id);
         break;
     }
diff --git a/sdm/libs/hwc2/hwc_callbacks.cpp b/sdm/libs/hwc2/hwc_callbacks.cpp
index aec1d327..065a1940 100644
--- a/sdm/libs/hwc2/hwc_callbacks.cpp
+++ b/sdm/libs/hwc2/hwc_callbacks.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, 2019 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2017, 2019-2020 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
@@ -35,6 +35,7 @@
 namespace sdm {
 
 HWC2::Error HWCCallbacks::Hotplug(hwc2_display_t display, HWC2::Connection state) {
+  std::lock_guard<std::mutex> hotplug_lock(hotplug_mutex_);
   if (!hotplug_) {
     return HWC2::Error::NoResources;
   }
@@ -43,6 +44,7 @@ HWC2::Error HWCCallbacks::Hotplug(hwc2_display_t display, HWC2::Connection state
 }
 
 HWC2::Error HWCCallbacks::Refresh(hwc2_display_t display) {
+  std::lock_guard<std::mutex> refresh_lock(refresh_mutex_);
   if (!refresh_) {
     return HWC2::Error::NoResources;
   }
@@ -52,6 +54,7 @@ HWC2::Error HWCCallbacks::Refresh(hwc2_display_t display) {
 }
 
 HWC2::Error HWCCallbacks::Vsync(hwc2_display_t display, int64_t timestamp) {
+  std::lock_guard<std::mutex> vsync_lock(vsync_mutex_);
   if (!vsync_) {
     return HWC2::Error::NoResources;
   }
@@ -61,6 +64,7 @@ HWC2::Error HWCCallbacks::Vsync(hwc2_display_t display, int64_t timestamp) {
 }
 
 HWC2::Error HWCCallbacks::Vsync_2_4(hwc2_display_t display, int64_t timestamp, uint32_t period) {
+  std::lock_guard<std::mutex> vsync_2_4_lock(vsync_2_4_mutex_);
   DTRACE_SCOPED();
   if (!vsync_2_4_) {
     return HWC2::Error::NoResources;
@@ -72,6 +76,8 @@ HWC2::Error HWCCallbacks::Vsync_2_4(hwc2_display_t display, int64_t timestamp, u
 
 HWC2::Error HWCCallbacks::VsyncPeriodTimingChanged(
     hwc2_display_t display, hwc_vsync_period_change_timeline_t *updated_timeline) {
+  std::lock_guard<std::mutex>
+    vsyncPeriodTimingChanged_lock(vsync_period_timing_changed_mutex_);
   DTRACE_SCOPED();
   if (!vsync_period_timing_changed_) {
     return HWC2::Error::NoResources;
@@ -82,6 +88,7 @@ HWC2::Error HWCCallbacks::VsyncPeriodTimingChanged(
 }
 
 HWC2::Error HWCCallbacks::SeamlessPossible(hwc2_display_t display) {
+  std::lock_guard<std::mutex> seamlessPossible_lock(seamless_possible_mutex_);
   DTRACE_SCOPED();
   if (!seamless_possible_) {
     return HWC2::Error::NoResources;
@@ -95,29 +102,48 @@ HWC2::Error HWCCallbacks::Register(HWC2::Callback descriptor, hwc2_callback_data
                                    hwc2_function_pointer_t pointer) {
   switch (descriptor) {
     case HWC2::Callback::Hotplug:
-      hotplug_data_ = callback_data;
-      hotplug_ = reinterpret_cast<HWC2_PFN_HOTPLUG>(pointer);
+      {
+        std::lock_guard<std::mutex> hotplug_lock(hotplug_mutex_);
+        hotplug_data_ = callback_data;
+        hotplug_ = reinterpret_cast<HWC2_PFN_HOTPLUG>(pointer);
+      }
       break;
     case HWC2::Callback::Refresh:
-      refresh_data_ = callback_data;
-      refresh_ = reinterpret_cast<HWC2_PFN_REFRESH>(pointer);
+      {
+        std::lock_guard<std::mutex> refresh_lock(refresh_mutex_);
+        refresh_data_ = callback_data;
+        refresh_ = reinterpret_cast<HWC2_PFN_REFRESH>(pointer);
+      }
       break;
     case HWC2::Callback::Vsync:
-      vsync_data_ = callback_data;
-      vsync_ = reinterpret_cast<HWC2_PFN_VSYNC>(pointer);
+      {
+        std::lock_guard<std::mutex> vsync_lock(vsync_mutex_);
+        vsync_data_ = callback_data;
+        vsync_ = reinterpret_cast<HWC2_PFN_VSYNC>(pointer);
+      }
       break;
     case HWC2::Callback::Vsync_2_4:
-      vsync_2_4_data_ = callback_data;
-      vsync_2_4_ = reinterpret_cast<HWC2_PFN_VSYNC_2_4>(pointer);
+      {
+        std::lock_guard<std::mutex> vsync_2_4_lock(vsync_2_4_mutex_);
+        vsync_2_4_data_ = callback_data;
+        vsync_2_4_ = reinterpret_cast<HWC2_PFN_VSYNC_2_4>(pointer);
+      }
       break;
     case HWC2::Callback::VsyncPeriodTimingChanged:
-      vsync_period_timing_changed_data_ = callback_data;
-      vsync_period_timing_changed_ =
+      {
+        std::lock_guard<std::mutex>
+          vsyncPeriodTimingChanged_lock(vsync_period_timing_changed_mutex_);
+        vsync_period_timing_changed_data_ = callback_data;
+        vsync_period_timing_changed_ =
           reinterpret_cast<HWC2_PFN_VSYNC_PERIOD_TIMING_CHANGED>(pointer);
+      }
       break;
     case HWC2::Callback::SeamlessPossible:
-      seamless_possible_data_ = callback_data;
-      seamless_possible_ = reinterpret_cast<HWC2_PFN_SEAMLESS_POSSIBLE>(pointer);
+      {
+        std::lock_guard<std::mutex> seamlessPossible_lock(seamless_possible_mutex_);
+        seamless_possible_data_ = callback_data;
+        seamless_possible_ = reinterpret_cast<HWC2_PFN_SEAMLESS_POSSIBLE>(pointer);
+      }
       break;
     default:
       return HWC2::Error::BadParameter;
diff --git a/sdm/libs/hwc2/hwc_callbacks.h b/sdm/libs/hwc2/hwc_callbacks.h
index 5e59550b..408cc6b5 100644
--- a/sdm/libs/hwc2/hwc_callbacks.h
+++ b/sdm/libs/hwc2/hwc_callbacks.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, 2019 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2017, 2019-2020 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
@@ -33,6 +33,7 @@
 #define HWC2_INCLUDE_STRINGIFICATION
 #define HWC2_USE_CPP11
 #include <hardware/hwcomposer2.h>
+#include <mutex>
 #undef HWC2_INCLUDE_STRINGIFICATION
 #undef HWC2_USE_CPP11
 
@@ -83,6 +84,14 @@ class HWCCallbacks {
   HWC2_PFN_VSYNC_2_4 vsync_2_4_ = nullptr;
   HWC2_PFN_VSYNC_PERIOD_TIMING_CHANGED vsync_period_timing_changed_ = nullptr;
   HWC2_PFN_SEAMLESS_POSSIBLE seamless_possible_ = nullptr;
+
+  std::mutex hotplug_mutex_;
+  std::mutex refresh_mutex_;
+  std::mutex vsync_mutex_;
+  std::mutex vsync_2_4_mutex_;
+  std::mutex vsync_period_timing_changed_mutex_;
+  std::mutex seamless_possible_mutex_;
+
   hwc2_display_t vsync_source_ = HWC_DISPLAY_PRIMARY;   // hw vsync is active on this display
   std::bitset<kNumDisplays> pending_refresh_;         // Displays waiting to get refreshed
 };