]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm/xe: Add xe_guc_ads.c to uses_generated_oob
authorNathan Chancellor <nathan@kernel.org>
Wed, 10 Apr 2024 18:16:11 +0000 (11:16 -0700)
committerLucas De Marchi <lucas.demarchi@intel.com>
Wed, 10 Apr 2024 19:19:37 +0000 (12:19 -0700)
A recent change added a use of xe_wa_oob.h without adding the file that
uses it to uses_generated_oob, which means xe_wa_oob.h does not get
properly generated before attempting to build the object file:

    LINK     resolve_btfids
    CC [M]  drivers/gpu/drm/xe/xe_guc_ads.o
  drivers/gpu/drm/xe/xe_guc_ads.c:10:10: fatal error: generated/xe_wa_oob.h: No such file or directory
     10 | #include <generated/xe_wa_oob.h>
        |          ^~~~~~~~~~~~~~~~~~~~~~~

After adding '$(obj)/xe_guc_ads.o' to uses_generated_oob, xe_wa_oob.h is
always generated before building the file, resulting in no errors:

    LINK     resolve_btfids
    HOSTCC  drivers/gpu/drm/xe/xe_gen_wa_oob
    GEN     xe_wa_oob.c xe_wa_oob.h
    CC [M]  drivers/gpu/drm/xe/xe_guc_ads.o

Fixes: c151ff5c9053 ("drm/xe/lnl: Enable GuC Wa_14019882105")
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240410-drm-xe-fix-xe_guc_ads-using-xe_wa_oob-v1-1-441f2d8e5d83@kernel.org
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
drivers/gpu/drm/xe/Makefile

index e106767c9a6e2857159925a5d643adb03657db34..60c90dc918b2a3b91f94e08d1a67156d50bba021 100644 (file)
@@ -49,6 +49,7 @@ $(obj)/generated/%_wa_oob.c $(obj)/generated/%_wa_oob.h: $(obj)/xe_gen_wa_oob \
 uses_generated_oob := \
        $(obj)/xe_gsc.o \
        $(obj)/xe_guc.o \
+       $(obj)/xe_guc_ads.o \
        $(obj)/xe_migrate.o \
        $(obj)/xe_ring_ops.o \
        $(obj)/xe_vm.o \