From 2483cde38826bfe33991deb9f45ffacae38c35e3 Mon Sep 17 00:00:00 2001 From: Pragaspathi Thilagaraj Date: Tue, 21 Sep 2021 15:22:06 +0530 Subject: [PATCH] qcacld-3.0: Kbuild: Enable nested composites on supported QKI kernels KERNEL_SUPPORTS_NESTED_COMPOSITES := y is used to enable nested composite support. The nested composites support is available in all GKI & QKI kernels beginning with 5.10.20, but unfortunately is not available in any upstream kernel. When a QKI kernel is used the flag is not set explicitly on the kernel sources. Current logic sets the flag for GKI kernels only. So extend the logic to set the flag for QKI kernels also. Change-Id: I96aa36628aaf66f194c14f8883674da205220117 CRs-Fixed: 3041134 --- Kbuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Kbuild b/Kbuild index f4ecd946bd..f0b3439029 100644 --- a/Kbuild +++ b/Kbuild @@ -55,7 +55,7 @@ LINUX_CODE := $(call KERNEL_VERSION,$(VERSION),$(PATCHLEVEL),$(SUBLEVEL)) COMPOSITE_CODE := 330260 # hardcoded $(call KERNEL_VERSION,5,10,20) ifeq ($(KERNEL_SUPPORTS_NESTED_COMPOSITES),) #flag is not explicitly present - ifneq ($(findstring gki,$(CONFIG_LOCALVERSION)),) + ifneq ($(findstring gki,$(CONFIG_LOCALVERSION))$(findstring qki,$(CONFIG_LOCALVERSION)),) # GKI kernel ifeq ($(shell test $(LINUX_CODE) -ge $(COMPOSITE_CODE); echo $$?),0) # version >= 5.10.20