From a1ee4bb25b3bd97c1f46fe2968263b54f0be3c19 Mon Sep 17 00:00:00 2001 From: Daniel Baluta Date: Mon, 17 Aug 2026 15:35:38 +0300 Subject: [PATCH] drm/msm: Guard the QCOM_UBWC_CONFIG select with QCOM_SMEM QCOM_UBWC_CONFIG is about to depend on QCOM_SMEM. Guard the DRM_MSM select with 'if ARCH_QCOM && QCOM_SMEM', and add 'depends on QCOM_SMEM || QCOM_SMEM=n' so a built-in driver is never selected against a missing or modular SMEM. Fixes: 1b445022d1d0 ("soc: qcom: ubwc: Get HBB from SMEM") Reviewed-by: Konrad Dybcio Acked-by: Dmitry Baryshkov Reviewed-by: Dmitry Baryshkov Signed-off-by: Daniel Baluta Tested-by: Nathan Chancellor # build Signed-off-by: Arnd Bergmann --- drivers/gpu/drm/msm/Kconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/msm/Kconfig b/drivers/gpu/drm/msm/Kconfig index 09469d56513b..ed1c4775d1e9 100644 --- a/drivers/gpu/drm/msm/Kconfig +++ b/drivers/gpu/drm/msm/Kconfig @@ -11,6 +11,7 @@ config DRM_MSM depends on QCOM_OCMEM || QCOM_OCMEM=n depends on QCOM_LLCC || QCOM_LLCC=n depends on QCOM_COMMAND_DB || QCOM_COMMAND_DB=n + depends on QCOM_SMEM || QCOM_SMEM=n depends on PM select IOMMU_IO_PGTABLE select QCOM_MDT_LOADER if ARCH_QCOM @@ -22,7 +23,7 @@ config DRM_MSM select TMPFS select QCOM_SCM select QCOM_PAS - select QCOM_UBWC_CONFIG + select QCOM_UBWC_CONFIG if ARCH_QCOM && QCOM_SMEM select WANT_DEV_COREDUMP select SND_SOC_HDMI_CODEC if SND_SOC select SYNC_FILE -- 2.47.3