Skip to content

Commit f3fb038

Browse files
fxkamdfcui-amd
authored andcommitted
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 <[email protected]> Reviewed-by: Flora Cui <[email protected]> Reviewed-by: Feifei Xu <[email protected]>
1 parent 024c622 commit f3fb038

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

drivers/gpu/drm/amd/amdgpu/Makefile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,15 @@
2525

2626
ifeq (,$(BUILD_AS_DKMS))
2727
FULL_AMD_PATH=$(srctree)/$(src)/..
28+
AMDKCL_KBUILD_TAKE_PATH=1
2829
else
2930
FULL_AMD_PATH=$(src)/..
30-
endif
31-
DISPLAY_FOLDER_NAME=display
32-
FULL_AMD_DISPLAY_PATH = $(FULL_AMD_PATH)/$(DISPLAY_FOLDER_NAME)
3331
# commit v5.3-rc4-54-g54b8ae66ae1a
3432
# kbuild: change *FLAGS_<basetarget>.o to take the path relative to $(obj)
3533
AMDKCL_KBUILD_TAKE_PATH=$(shell grep -q "target-stem" scripts/Makefile.lib && echo "1" || echo "0")
34+
endif
35+
DISPLAY_FOLDER_NAME=display
36+
FULL_AMD_DISPLAY_PATH = $(FULL_AMD_PATH)/$(DISPLAY_FOLDER_NAME)
3637

3738
ccflags-y := -I$(FULL_AMD_PATH)/include/asic_reg \
3839
-I$(FULL_AMD_PATH)/include \

0 commit comments

Comments
 (0)