LineageOS/android_vendor_qcom_opensource_display-commonsys-intf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Populate minimum ib limit" and populate hw_version.

Browse Source 
1. This reverts commit b44863291e.
2. Populate hw_version information from CRTC info

Change-Id: I30445c8b93dd6fec49d5984763b464c4efcdb886
CRs-Fixed: 2121347
This commit is contained in:
Ramkumar Radhakrishnan
2017-10-03 11:21:18 -07:00
parent d3d064e89b
commit 2389c6b3c3
4 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libdrmutils/drm_interface.h
View File

@@ -378,9 +378,6 @@ struct DRMCrtcInfo {
CompRatioMap comp_ratio_rt_map; CompRatioMap comp_ratio_rt_map;
CompRatioMap comp_ratio_nrt_map; CompRatioMap comp_ratio_nrt_map;
uint32_t hw_version; uint32_t hw_version;
uint64_t min_core_ib;
uint64_t min_llcc_ib;
uint64_t min_dram_ib;
uint32_t dest_scaler_count = 0; uint32_t dest_scaler_count = 0;
uint32_t max_dest_scaler_input_width = 0; uint32_t max_dest_scaler_input_width = 0;
uint32_t max_dest_scaler_output_width = 0; uint32_t max_dest_scaler_output_width = 0;

7
sdm/include/private/hw_info_types.h
View File

@@ -39,8 +39,10 @@ using std::string;
const int kMaxSDELayers = 16; // Maximum number of layers that can be handled by MDP5 hardware const int kMaxSDELayers = 16; // Maximum number of layers that can be handled by MDP5 hardware
// in a given layer stack. // in a given layer stack.
#define MAX_PLANES 4 #define MAX_PLANES 4
#define MAX_DETAIL_ENHANCE_CURVE 3 #define MAX_DETAIL_ENHANCE_CURVE 3
#define MAJOR 28
#define MINOR 16
#define SDEVERSION(major, minor, hw_rev) ((major) << MAJOR) | ((minor) << MINOR) | (hw_rev)
enum HWDeviceType { enum HWDeviceType {
kDevicePrimary, kDevicePrimary,
@@ -226,9 +228,6 @@ struct HWResourceInfo {
CompRatioMap comp_ratio_nrt_map; CompRatioMap comp_ratio_nrt_map;
uint32_t cache_size = 0; // cache size in bytes uint32_t cache_size = 0; // cache size in bytes
HWQseedStepVersion pipe_qseed3_version = kQseed3v2; // only valid when has_qseed3=true HWQseedStepVersion pipe_qseed3_version = kQseed3v2; // only valid when has_qseed3=true
uint64_t min_core_ib_kbps = 0;
uint64_t min_llcc_ib_kbps = 0;
uint64_t min_dram_ib_kbps = 0;
void Reset() { *this = HWResourceInfo(); } void Reset() { *this = HWResourceInfo(); }
}; };

7
sdm/libs/core/drm/hw_info_drm.cpp
View File

@@ -193,7 +193,7 @@ DisplayError HWInfoDRM::GetHWResourceInfo(HWResourceInfo *hw_resource) {
hw_resource->has_concurrent_writeback = false; hw_resource->has_concurrent_writeback = false;
hw_resource->has_hdr = true; hw_resource->has_hdr = true;
hw_resource->hw_version = kHWMdssVersion5; hw_resource->hw_version = SDEVERSION(4, 0, 1);
hw_resource->hw_revision = 0; hw_resource->hw_revision = 0;
// TODO(user): Deprecate // TODO(user): Deprecate
@@ -286,10 +286,7 @@ void HWInfoDRM::GetSystemInfo(HWResourceInfo *hw_resource) {
hw_resource->max_bandwidth_low = info.max_bandwidth_low / kKiloUnit; hw_resource->max_bandwidth_low = info.max_bandwidth_low / kKiloUnit;
hw_resource->max_bandwidth_high = info.max_bandwidth_high / kKiloUnit; hw_resource->max_bandwidth_high = info.max_bandwidth_high / kKiloUnit;
hw_resource->max_sde_clk = info.max_sde_clk; hw_resource->max_sde_clk = info.max_sde_clk;
hw_resource->hw_revision = info.hw_version; hw_resource->hw_version = info.hw_version;
hw_resource->min_core_ib_kbps = info.min_core_ib / kKiloUnit;
hw_resource->min_llcc_ib_kbps = info.min_llcc_ib / kKiloUnit;
hw_resource->min_dram_ib_kbps = info.min_dram_ib / kKiloUnit;
std::vector<LayerBufferFormat> sdm_format; std::vector<LayerBufferFormat> sdm_format;
for (auto &it : info.comp_ratio_rt_map) { for (auto &it : info.comp_ratio_rt_map) {

2
sdm/libs/core/drm/hw_info_drm.h
View File

@@ -67,8 +67,6 @@ class HWInfoDRM: public HWInfoInterface {
sde_drm::DRMManagerInterface *drm_mgr_intf_ = {}; sde_drm::DRMManagerInterface *drm_mgr_intf_ = {};
bool default_mode_ = false; bool default_mode_ = false;
// TODO(user): Read Mdss version from the driver
static const int kHWMdssVersion5 = 500; // MDSS_V5
static const int kMaxStringLength = 1024; static const int kMaxStringLength = 1024;
static const int kKiloUnit = 1000; static const int kKiloUnit = 1000;