sdm: Remove legacy fields from HWResourceInfo struct
After removal of FB, remove deprecated fields from
HWResourceInfo structure.
Change-Id: If41e5dcf411eac6b6703bcab18b3456e4807c59d
CRs-Fixed: 2377986
diff --git a/sdm/include/private/hw_info_types.h b/sdm/include/private/hw_info_types.h
index 96e37ef..8b53429 100644
--- a/sdm/include/private/hw_info_types.h
+++ b/sdm/include/private/hw_info_types.h
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.
+* Copyright (c) 2015-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:
@@ -254,18 +254,12 @@
struct HWResourceInfo {
uint32_t hw_version = 0;
- uint32_t hw_revision = 0;
uint32_t num_dma_pipe = 0;
uint32_t num_vig_pipe = 0;
uint32_t num_rgb_pipe = 0;
uint32_t num_cursor_pipe = 0;
uint32_t num_blending_stages = 0;
uint32_t num_solidfill_stages = 0;
- uint32_t num_control = 0;
- uint32_t num_mixer_to_disp = 0;
- uint32_t smp_total = 0;
- uint32_t smp_size = 0;
- uint32_t num_smp_per_pipe = 0;
uint32_t max_scale_up = 1;
uint32_t max_scale_down = 1;
uint64_t max_bandwidth_low = 0;
@@ -285,10 +279,8 @@
uint32_t extra_fudge_factor = 0;
uint32_t amortizable_threshold = 0;
uint32_t system_overhead_lines = 0;
- bool has_bwc = false;
bool has_ubwc = false;
bool has_decimation = false;
- bool has_macrotile = false;
bool has_non_scalar_rgb = false;
bool is_src_split = false;
bool has_dyn_bw_support = false;
@@ -303,7 +295,6 @@
FormatsMap supported_formats_map;
HWRotatorInfo hw_rot_info;
HWDestScalarInfo hw_dest_scalar_info;
- bool has_avr = false;
bool has_hdr = false;
SmartDMARevision smart_dma_rev = SmartDMARevision::V1;
float ib_fudge_factor = 1.0f;
diff --git a/sdm/libs/core/drm/hw_info_drm.cpp b/sdm/libs/core/drm/hw_info_drm.cpp
index ffc2002..06920ba 100644
--- a/sdm/libs/core/drm/hw_info_drm.cpp
+++ b/sdm/libs/core/drm/hw_info_drm.cpp
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.
+* Copyright (c) 2017-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
@@ -201,18 +201,11 @@
hw_resource->has_concurrent_writeback = false;
hw_resource->hw_version = SDEVERSION(4, 0, 1);
- // TODO(user): On FB driver hw_revision comprises of major version, minor version and hw_revision.
- // On DRM driver, hw_revision is deprecated and hw_version comprises major version, minor version
- // and hw_revision information. Since QDCM uses hw_revision variable populate hw_revision with
- // hw_version. Remove hw_revision variable when FB code is deperecated.
- hw_resource->hw_revision = SDEVERSION(4, 0, 1);
// TODO(user): Deprecate
hw_resource->max_mixer_width = 2560;
hw_resource->writeback_index = 0;
- hw_resource->has_bwc = false;
hw_resource->has_ubwc = true;
- hw_resource->has_macrotile = true;
hw_resource->separate_rotator = true;
hw_resource->has_non_scalar_rgb = false;
@@ -307,11 +300,6 @@
hw_resource->max_bandwidth_high = info.max_bandwidth_high / kKiloUnit;
hw_resource->max_sde_clk = info.max_sde_clk;
hw_resource->hw_version = info.hw_version;
- // TODO(user): On FB driver hw_revision comprises of major version, minor version and hw_revision.
- // On DRM driver, hw_revision is deprecated and hw_version comprises major version, minor version
- // and hw_revision information. Since QDCM uses hw_revision variable populate hw_revision with
- // hw_version. Remove hw_revision variable when FB code is deperecated.
- hw_resource->hw_revision = info.hw_version;
std::vector<LayerBufferFormat> sdm_format;
for (auto &it : info.comp_ratio_rt_map) {
diff --git a/sdm/libs/core/fb/hw_info.cpp b/sdm/libs/core/fb/hw_info.cpp
index e761fc5..b076aad 100644
--- a/sdm/libs/core/fb/hw_info.cpp
+++ b/sdm/libs/core/fb/hw_info.cpp
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.
+* Copyright (c) 2015-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:
@@ -113,7 +113,7 @@
// parse the line and update information accordingly
if (!ParseString(line.c_str(), tokens, max_count, ":, =\n", &token_count)) {
if (!strncmp(tokens[0], "hw_rev", strlen("hw_rev"))) {
- hw_resource_->hw_revision = UINT32(atoi(tokens[1])); // HW Rev, v1/v2
+ hw_resource_->hw_version = UINT32(atoi(tokens[1])); // HW Rev, v1/v2
} else if (!strncmp(tokens[0], "pipe_count", strlen("pipe_count"))) {
uint32_t pipe_count = UINT8(atoi(tokens[1]));
diff --git a/sdm/libs/core/resource_default.cpp b/sdm/libs/core/resource_default.cpp
index f44283b..7686caa 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:
@@ -110,7 +110,7 @@
src_pipes_[i].priority = INT(i);
}
- DLOGI("hw_rev=%x, DMA=%d RGB=%d VIG=%d", hw_res_info_.hw_revision, hw_res_info_.num_dma_pipe,
+ DLOGI("hw_ver=%x, DMA=%d RGB=%d VIG=%d", hw_res_info_.hw_version, hw_res_info_.num_dma_pipe,
hw_res_info_.num_rgb_pipe, hw_res_info_.num_vig_pipe);
if (hw_res_info_.max_scale_down < 1 || hw_res_info_.max_scale_up < 1) {
