commit d9dccf57b164bf7491e40656efd3450088c282ce
author qctecmdr <qctecmdr@localhost> Wed Apr 01 01:16:15 2020 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Apr 01 01:16:15 2020 -0700
tree fa7cd7c7f85c9245c3bb5d93972c14197d480579
parent 7d95d30f199cbc779592e8508bf1a8ba2c2657d2
parent 5a00554e45f6e7ccca384e179753f1f69920ac13

Merge "sdm: Add support to parse ubwc version."

libdrmutils/drm_interface.h

diff --git a/libdrmutils/drm_interface.h b/libdrmutils/drm_interface.h
index 1fecf77..f7f6bdc 100644
--- a/libdrmutils/drm_interface.h
+++ b/libdrmutils/drm_interface.h
@@ -531,6 +531,7 @@
   uint32_t mnoc_bus_width;
   bool use_baselayer_for_stage = false;
   bool has_micro_idle = false;
+  uint32_t ubwc_version = 1;
 };
 
 enum struct DRMPlaneType {

sde-drm/drm_crtc.cpp

diff --git a/sde-drm/drm_crtc.cpp b/sde-drm/drm_crtc.cpp
index 1760337..69f9828 100644
--- a/sde-drm/drm_crtc.cpp
+++ b/sde-drm/drm_crtc.cpp
@@ -368,6 +368,7 @@
   string limit_constraint = "limit_usecase=";
   string limit_value = "limit_value=";
   string use_baselayer_for_stage = "use_baselayer_for_stage=";
+  string ubwc_version = "UBWC version=";
 
   while (std::getline(stream, line)) {
     if (line.find(max_blendstages) != string::npos) {
@@ -482,6 +483,8 @@
     } else if (line.find(use_baselayer_for_stage) != string::npos) {
       crtc_info_.use_baselayer_for_stage =
                          std::stoi(string(line, use_baselayer_for_stage.length()));
+    } else if (line.find(ubwc_version) != string::npos) {
+      crtc_info_.ubwc_version = (std::stoi(string(line, ubwc_version.length()))) >> 28;
     }
   }
   drmModeFreePropertyBlob(blob);

sdm/include/private/hw_info_types.h

diff --git a/sdm/include/private/hw_info_types.h b/sdm/include/private/hw_info_types.h
index df581c2..a11484a 100644
--- a/sdm/include/private/hw_info_types.h
+++ b/sdm/include/private/hw_info_types.h
@@ -349,6 +349,7 @@
   uint32_t mnoc_bus_width = 32;
   bool use_baselayer_for_stage = false;
   bool has_micro_idle = false;
+  uint32_t ubwc_version = 1;
 };
 
 struct HWSplitInfo {

sdm/libs/core/drm/hw_info_drm.cpp

diff --git a/sdm/libs/core/drm/hw_info_drm.cpp b/sdm/libs/core/drm/hw_info_drm.cpp
index 50489d5..9f5331d 100644
--- a/sdm/libs/core/drm/hw_info_drm.cpp
+++ b/sdm/libs/core/drm/hw_info_drm.cpp
@@ -344,6 +344,7 @@
   hw_resource->num_mnocports = info.num_mnocports ? info.num_mnocports : 2;
   hw_resource->mnoc_bus_width = info.mnoc_bus_width ? info.mnoc_bus_width : 32;
   hw_resource->use_baselayer_for_stage = info.use_baselayer_for_stage;
+  hw_resource->ubwc_version = info.ubwc_version;
 }
 
 void HWInfoDRM::GetHWPlanesInfo(HWResourceInfo *hw_resource) {