On Mon, Feb 26, 2024 at 7:49 PM Dmitry Baryshkov <dmitry.baryshkov@xxxxxxxxxx> wrote: > Could you please specify how you tried to compile the code? I can see > warnings from headrgen2, but I'm really puzzled by the errors from the > MSM driver itself. I applied this patch set onto v6.8-rc6. masahiro@zoe:~/ref/linux(testing7)$ git log --oneline -15 40eb59f162cc (HEAD -> testing7) drm/msm: sync shipped headers database ae850f45f243 drm/msm: tie regeneration of shipped headers 45401d4034ef drm/msm: import XML registers database 491e4d41308e drm/msm/headergen: generate _shipped files 6766c628c097 drm/msm/headergen: don't output full file paths e48e9a8eaf21 drm/msm/headergen: use asprintf instead of custom aprintf b12d6fb5d2a0 drm/msm/headergen: import source files from freedreno/envytools 4699358f5c5b drm/msm: use _shipped suffix for all xml.h files 295fcf923852 drm/msm/dsi: drop mmss_cc.xml.h a15c0faba637 drm/msm/hdmi: drop qfprom.xml.h 6811afe14414 drm/msm/mdp5: add writeback block bases feee4929582e kbuild: create destination directory for _shipped handling d206a76d7d27 (tag: v6.8-rc6, origin/master, origin/HEAD, master) Linux 6.8-rc6 e231dbd452a7 Merge tag 'bcachefs-2024-02-25' of https://evilpiepirate.org/git/bcachefs 5197728f8182 bcachefs: fix bch2_save_backtrace() I see the build errors with arm64 defconfig. [build step] $ git clean -fdx $ make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- defconfig $ make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- -j$(nproc) As I commented in 05/12, -I$(srctree)/$(src) is lost. I was able to build it with the following fix-up. --- a/drivers/gpu/drm/msm/Makefile +++ b/drivers/gpu/drm/msm/Makefile @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 ccflags-y := -I $(srctree)/$(src) -ccflags-y := -I $(obj)/registers +ccflags-y += -I $(obj)/registers ccflags-y += -I $(srctree)/$(src)/disp/dpu1 ccflags-$(CONFIG_DRM_MSM_DSI) += -I $(srctree)/$(src)/dsi ccflags-$(CONFIG_DRM_MSM_DP) += -I $(srctree)/$(src)/dp Better fixes would be to use #include "" properly. It should be relative to the source file. diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gmu.h b/drivers/gpu/drm/msm/adreno/a6xx_gmu.h index 592b296aab22..cf878490abd0 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gmu.h +++ b/drivers/gpu/drm/msm/adreno/a6xx_gmu.h @@ -9,7 +9,7 @@ #include <linux/interrupt.h> #include <linux/notifier.h> #include <linux/soc/qcom/qcom_aoss.h> -#include "msm_drv.h" +#include "../msm_drv.h" #include "a6xx_hfi.h" struct a6xx_gmu_bo { diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c index c9c55e2ea584..3a109453db31 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c @@ -2,9 +2,9 @@ /* Copyright (c) 2017-2019 The Linux Foundation. All rights reserved. */ -#include "msm_gem.h" -#include "msm_mmu.h" -#include "msm_gpu_trace.h" +#include "../msm_gem.h" +#include "../msm_mmu.h" +#include "../msm_gpu_trace.h" #include "a6xx_gpu.h" #include "a6xx_gmu.xml.h" diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.h b/drivers/gpu/drm/msm/adreno/adreno_gpu.h index bc14df96feb0..007788bf38ce 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.h +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.h @@ -12,7 +12,7 @@ #include <linux/firmware.h> #include <linux/iopoll.h> -#include "msm_gpu.h" +#include "../msm_gpu.h" #include "adreno_common.xml.h" #include "adreno_pm4.xml.h" -- Best Regards Masahiro Yamada
