From 6bdfd86ef1e34f6dd067fff868ebee1ea2597a1c Mon Sep 17 00:00:00 2001 From: Salendarsingh Gaud Date: Thu, 3 Sep 2026 09:08:45 +0530 Subject: [PATCH 1/2] platform: drop obsolete UBWC config members The kernel qcom_ubwc_cfg_data definition now derives decoder version, swizzle, bank spreading, and macrotile mode from the encoder version, highest bank bit, and flags. Drop the removed initializer fields so the out-of-tree Iris driver builds against current kernel headers. Use UBWC_3_1 for Kodiak to preserve the previous macrotile_mode=true behavior with the helper-derived representation. Signed-off-by: Salendarsingh Gaud --- driver/platform/kodiak/src/kodiak.c | 6 +----- driver/platform/monaco/src/monaco.c | 4 ---- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/driver/platform/kodiak/src/kodiak.c b/driver/platform/kodiak/src/kodiak.c index 451dacd9..a5dbb656 100644 --- a/driver/platform/kodiak/src/kodiak.c +++ b/driver/platform/kodiak/src/kodiak.c @@ -2292,12 +2292,8 @@ static struct msm_platform_inst_cap_dependency instance_cap_dependency_data_kodi /* Default UBWC config for LPDDR4 */ static const struct qcom_ubwc_cfg_data ubwc_config_kodiak = { - .ubwc_enc_version = UBWC_3_0, - .ubwc_dec_version = UBWC_4_0, - .ubwc_swizzle = UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, + .ubwc_enc_version = UBWC_3_1, .highest_bank_bit = 14, - .ubwc_bank_spread = true, - .macrotile_mode = true, }; static struct msm_vidc_format_capability format_data_kodiak = { diff --git a/driver/platform/monaco/src/monaco.c b/driver/platform/monaco/src/monaco.c index 82a5e03b..fa6a40dd 100644 --- a/driver/platform/monaco/src/monaco.c +++ b/driver/platform/monaco/src/monaco.c @@ -1814,11 +1814,7 @@ static struct msm_platform_inst_cap_dependency instance_cap_dependency_data_mona /* Default UBWC config for LPDDR5 */ static const struct qcom_ubwc_cfg_data ubwc_config_monaco = { .ubwc_enc_version = UBWC_4_0, - .ubwc_dec_version = UBWC_4_0, - .ubwc_swizzle = UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit = 16, - .ubwc_bank_spread = true, - .macrotile_mode = true, }; static struct msm_vidc_format_capability format_data_monaco = { From 7f9312862813484c8235944d161258ef7b032437 Mon Sep 17 00:00:00 2001 From: Salendarsingh Gaud Date: Thu, 3 Sep 2026 09:08:55 +0530 Subject: [PATCH 2/2] firmware: use exported PAS availability helper The kernel PAS abstraction no longer exposes qcom_pas_is_tee_backed() to external modules. Use the exported qcom_pas_is_available() helper for the OP-TEE PAS path so the driver builds against current kernel headers. Signed-off-by: Salendarsingh Gaud --- driver/vidc/src/firmware.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/driver/vidc/src/firmware.c b/driver/vidc/src/firmware.c index 38275768..fc23a947 100644 --- a/driver/vidc/src/firmware.c +++ b/driver/vidc/src/firmware.c @@ -403,7 +403,7 @@ int fw_load(struct msm_vidc_core *core) * failure is expected. Only treat it as fatal when OP-TEE is * not on the bus. */ - if (qcom_pas_is_tee_backed()) { + if (qcom_pas_is_available()) { d_vpr_h("%s: scm_mem_protect failed %d; OP-TEE PAS in use, ignoring\n", __func__, rc); return 0;