samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "disp: msm: sde: add ubwc entries to crtc only if supported"

Browse Source
This commit is contained in:
qctecmdr
2020-05-25 10:52:49 -07:00
committed by Gerrit - the friendly Code Review server
parent ca2f69fe8c c9b3e866bb
commit fc44cf529b
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
msm/sde/sde_crtc.c
View File

@@ -5134,13 +5134,16 @@ static void sde_crtc_setup_capabilities_blob(struct sde_kms_info *info,
if (catalog->qseed_type == SDE_SSPP_SCALER_QSEED3LITE) if (catalog->qseed_type == SDE_SSPP_SCALER_QSEED3LITE)
sde_kms_info_add_keystr(info, "qseed_type", "qseed3lite"); sde_kms_info_add_keystr(info, "qseed_type", "qseed3lite");
sde_kms_info_add_keyint(info, "UBWC version", catalog->ubwc_version); if (catalog->ubwc_version) {
sde_kms_info_add_keyint(info, "UBWC macrotile_mode", sde_kms_info_add_keyint(info, "UBWC version",
catalog->ubwc_version);
sde_kms_info_add_keyint(info, "UBWC macrotile_mode",
catalog->macrotile_mode); catalog->macrotile_mode);
sde_kms_info_add_keyint(info, "UBWC highest banking bit", sde_kms_info_add_keyint(info, "UBWC highest banking bit",
catalog->mdp[0].highest_bank_bit); catalog->mdp[0].highest_bank_bit);
sde_kms_info_add_keyint(info, "UBWC swizzle", sde_kms_info_add_keyint(info, "UBWC swizzle",
catalog->mdp[0].ubwc_swizzle); catalog->mdp[0].ubwc_swizzle);
}
if (of_fdt_get_ddrtype() == LP_DDR4_TYPE) if (of_fdt_get_ddrtype() == LP_DDR4_TYPE)
sde_kms_info_add_keystr(info, "DDR version", "DDR4"); sde_kms_info_add_keystr(info, "DDR version", "DDR4");

6
msm/sde/sde_hw_catalog.c
View File

@@ -50,8 +50,8 @@
*/ */
#define DEFAULT_SDE_HIGHEST_BANK_BIT 0x02 #define DEFAULT_SDE_HIGHEST_BANK_BIT 0x02
/* default ubwc version */ /* No UBWC */
#define DEFAULT_SDE_UBWC_VERSION SDE_HW_UBWC_VER_10 #define DEFAULT_SDE_UBWC_NONE 0x0
/* default ubwc static config register value */ /* default ubwc static config register value */
#define DEFAULT_SDE_UBWC_STATIC 0x0 #define DEFAULT_SDE_UBWC_STATIC 0x0
@@ -3654,7 +3654,7 @@ static void _sde_top_parse_dt_helper(struct sde_mdss_cfg *cfg,
cfg->ubwc_version = props->exists[UBWC_VERSION] ? cfg->ubwc_version = props->exists[UBWC_VERSION] ?
SDE_HW_UBWC_VER(PROP_VALUE_ACCESS(props->values, SDE_HW_UBWC_VER(PROP_VALUE_ACCESS(props->values,
UBWC_VERSION, 0)) : DEFAULT_SDE_UBWC_VERSION; UBWC_VERSION, 0)) : DEFAULT_SDE_UBWC_NONE;
cfg->mdp[0].highest_bank_bit = props->exists[BANK_BIT] ? cfg->mdp[0].highest_bank_bit = props->exists[BANK_BIT] ?
PROP_VALUE_ACCESS(props->values, BANK_BIT, 0) : PROP_VALUE_ACCESS(props->values, BANK_BIT, 0) :