From c9b3e866bba3f7ca6a3d49e7d7c62d163a0f75f8 Mon Sep 17 00:00:00 2001 From: Yashwanth Date: Wed, 18 Mar 2020 16:56:43 +0530 Subject: [PATCH] disp: msm: sde: add ubwc entries to crtc only if supported In few targets, ubwc might not be supported. In those cases, ubwc properties should not be added to crtc. Change-Id: I57d295fca018239ae3695657963d8162d6a50df5 Signed-off-by: Yashwanth Signed-off-by: Veera Sundaram Sankaran --- msm/sde/sde_crtc.c | 11 +++++++---- msm/sde/sde_hw_catalog.c | 6 +++--- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/msm/sde/sde_crtc.c b/msm/sde/sde_crtc.c index 64f09761b5..91a23d66f2 100644 --- a/msm/sde/sde_crtc.c +++ b/msm/sde/sde_crtc.c @@ -5018,13 +5018,16 @@ static void sde_crtc_setup_capabilities_blob(struct sde_kms_info *info, if (catalog->qseed_type == SDE_SSPP_SCALER_QSEED3LITE) sde_kms_info_add_keystr(info, "qseed_type", "qseed3lite"); - sde_kms_info_add_keyint(info, "UBWC version", catalog->ubwc_version); - sde_kms_info_add_keyint(info, "UBWC macrotile_mode", + if (catalog->ubwc_version) { + sde_kms_info_add_keyint(info, "UBWC version", + catalog->ubwc_version); + sde_kms_info_add_keyint(info, "UBWC 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); - sde_kms_info_add_keyint(info, "UBWC swizzle", + sde_kms_info_add_keyint(info, "UBWC swizzle", catalog->mdp[0].ubwc_swizzle); + } if (of_fdt_get_ddrtype() == LP_DDR4_TYPE) sde_kms_info_add_keystr(info, "DDR version", "DDR4"); diff --git a/msm/sde/sde_hw_catalog.c b/msm/sde/sde_hw_catalog.c index 3c21870b3a..1734882fb8 100644 --- a/msm/sde/sde_hw_catalog.c +++ b/msm/sde/sde_hw_catalog.c @@ -50,8 +50,8 @@ */ #define DEFAULT_SDE_HIGHEST_BANK_BIT 0x02 -/* default ubwc version */ -#define DEFAULT_SDE_UBWC_VERSION SDE_HW_UBWC_VER_10 +/* No UBWC */ +#define DEFAULT_SDE_UBWC_NONE 0x0 /* default ubwc static config register value */ #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] ? 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] ? PROP_VALUE_ACCESS(props->values, BANK_BIT, 0) :