From f3fb038d8dc9c33813b3aec94e9b9a57bfb5f268 Mon Sep 17 00:00:00 2001 From: Felix Kuehling Date: Wed, 22 Jan 2020 14:31:41 +0800 Subject: [PATCH] drm/amdgpu: Fix in-tree build scripts/Makefile.lib isn't found in in-tree build, breaking the test for whether to take the full path of source files. This leads to CGLAGS for float and sse instructions not being applied correctly in the DAL build, which results in build failures. Instead set AMDKCL_KBUILD_TAKE_PATH=1 directly for in-tree builds. Signed-off-by: Felix Kuehling Reviewed-by: Flora Cui Reviewed-by: Feifei Xu --- drivers/gpu/drm/amd/amdgpu/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/Makefile b/drivers/gpu/drm/amd/amdgpu/Makefile index 0579f543bee29..faf4a32e0abe3 100644 --- a/drivers/gpu/drm/amd/amdgpu/Makefile +++ b/drivers/gpu/drm/amd/amdgpu/Makefile @@ -25,14 +25,15 @@ ifeq (,$(BUILD_AS_DKMS)) FULL_AMD_PATH=$(srctree)/$(src)/.. +AMDKCL_KBUILD_TAKE_PATH=1 else FULL_AMD_PATH=$(src)/.. -endif -DISPLAY_FOLDER_NAME=display -FULL_AMD_DISPLAY_PATH = $(FULL_AMD_PATH)/$(DISPLAY_FOLDER_NAME) # commit v5.3-rc4-54-g54b8ae66ae1a # kbuild: change *FLAGS_.o to take the path relative to $(obj) AMDKCL_KBUILD_TAKE_PATH=$(shell grep -q "target-stem" scripts/Makefile.lib && echo "1" || echo "0") +endif +DISPLAY_FOLDER_NAME=display +FULL_AMD_DISPLAY_PATH = $(FULL_AMD_PATH)/$(DISPLAY_FOLDER_NAME) ccflags-y := -I$(FULL_AMD_PATH)/include/asic_reg \ -I$(FULL_AMD_PATH)/include \