Skip to content

Commit 5ea4dba

Browse files
arndbdanvet
authored andcommitted
drm/msm/a6xx: add CONFIG_QCOM_LLCC dependency
When LLCC support is in a loadable module, the adreno support cannot be built-in: aarch64-linux-ld: drivers/gpu/drm/msm/adreno/a6xx_gpu.o: in function `a6xx_gpu_init': a6xx_gpu.c:(.text+0xe0): undefined reference to `llcc_slice_getd' a6xx_gpu.c:(.text+0xe0): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `llcc_slice_getd' aarch64-linux-ld: a6xx_gpu.c:(.text+0xec): undefined reference to `llcc_slice_getd' a6xx_gpu.c:(.text+0xec): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `llcc_slice_getd' aarch64-linux-ld: drivers/gpu/drm/msm/adreno/a6xx_gpu.o: in function `a6xx_destroy': a6xx_gpu.c:(.text+0x274): undefined reference to `llcc_slice_putd' a6xx_gpu.c:(.text+0x274): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `llcc_slice_putd' aarch64-linux-ld: a6xx_gpu.c:(.text+0x27c): undefined reference to `llcc_slice_putd' Add a Kconfig dependency that disallows the broken configuration but allows all working ones. Fixes: 474dadb ("drm/msm/a6xx: Add support for using system cache(LLC)") Signed-off-by: Arnd Bergmann <[email protected]> Reported-by: kernel test robot <[email protected]> Reviewed-by: Sai Prakash Ranjan <[email protected]> Signed-off-by: Kees Cook <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Daniel Vetter <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent f611b1e commit 5ea4dba

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

drivers/gpu/drm/msm/Kconfig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ config DRM_MSM
77
depends on IOMMU_SUPPORT
88
depends on OF && COMMON_CLK
99
depends on QCOM_OCMEM || QCOM_OCMEM=n
10+
depends on QCOM_LLCC || QCOM_LLCC=n
11+
depends on QCOM_COMMAND_DB || QCOM_COMMAND_DB=n
1012
select IOMMU_IO_PGTABLE
1113
select QCOM_MDT_LOADER if ARCH_QCOM
1214
select REGULATOR
@@ -15,7 +17,6 @@ config DRM_MSM
1517
select SHMEM
1618
select TMPFS
1719
select QCOM_SCM if ARCH_QCOM
18-
select QCOM_COMMAND_DB if ARCH_QCOM
1920
select WANT_DEV_COREDUMP
2021
select SND_SOC_HDMI_CODEC if SND_SOC
2122
select SYNC_FILE

0 commit comments

Comments
 (0)