[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20250402124656.629226-5-jani.nikula@intel.com>
Date: Wed, 2 Apr 2025 15:46:56 +0300
From: Jani Nikula <jani.nikula@...el.com>
To: Linus Torvalds <torvalds@...ux-foundation.org>,
linux-kernel@...r.kernel.org
Cc: jani.nikula@...el.com,
Jason Gunthorpe <jgg@...dia.com>,
Masahiro Yamada <masahiroy@...nel.org>,
David Airlie <airlied@...il.com>,
Simona Vetter <simona.vetter@...ll.ch>,
linux-kbuild@...r.kernel.org,
dri-devel@...ts.freedesktop.org,
intel-xe@...ts.freedesktop.org,
intel-gfx@...ts.freedesktop.org
Subject: [PATCH v2 4/4] drm/xe: switch to generic header check facility
Switch to the generic header check facility, and sunset the copy-pasted
local version.
Keep the header checks gated on CONFIG_DRM_XE_WERROR as before. To be
unified later.
While at it, fix a header missing header guards that was not caught by
the local version.
Reported-by: Linus Torvalds <torvalds@...ux-foundation.org>
Closes: https://lore.kernel.org/r/CAHk-=wjMrqzuUmH-mFbR_46EWEFS=bB=J7h9ABMVy56Vi81PKQ@mail.gmail.com
Fixes: dd08ebf6c352 ("drm/xe: Introduce a new DRM driver for Intel GPUs")
Cc: Masahiro Yamada <masahiroy@...nel.org>
Cc: David Airlie <airlied@...il.com>
Cc: Simona Vetter <simona.vetter@...ll.ch>
Signed-off-by: Jani Nikula <jani.nikula@...el.com>
---
Cc: linux-kbuild@...r.kernel.org
Cc: dri-devel@...ts.freedesktop.org
Cc: intel-xe@...ts.freedesktop.org
Cc: intel-gfx@...ts.freedesktop.org
---
drivers/gpu/drm/xe/Makefile | 10 ++--------
drivers/gpu/drm/xe/xe_pcode_api.h | 4 ++++
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/drivers/gpu/drm/xe/Makefile b/drivers/gpu/drm/xe/Makefile
index 9699b08585f7..2a1854024c84 100644
--- a/drivers/gpu/drm/xe/Makefile
+++ b/drivers/gpu/drm/xe/Makefile
@@ -326,14 +326,8 @@ ifneq ($(CONFIG_DRM_XE_DISPLAY),y)
hdrtest_find_args += -not -path display/\* -not -path compat-i915-headers/\* -not -path xe_display.h
endif
-always-$(CONFIG_DRM_XE_WERROR) += \
- $(patsubst %.h,%.hdrtest, $(shell cd $(src) && find * -name '*.h' $(hdrtest_find_args)))
-
-quiet_cmd_hdrtest = HDRTEST $(patsubst %.hdrtest,%.h,$@)
- cmd_hdrtest = $(CC) -DHDRTEST $(filter-out $(CFLAGS_GCOV), $(c_flags)) -S -o /dev/null -x c /dev/null -include $<; touch $@
-
-$(obj)/%.hdrtest: $(src)/%.h FORCE
- $(call if_changed_dep,hdrtest)
+header-check-$(CONFIG_DRM_XE_WERROR) += \
+ $(shell cd $(src) && find * -name '*.h' $(hdrtest_find_args))
uses_generated_oob := $(addprefix $(obj)/, $(xe-y))
$(uses_generated_oob): $(obj)/generated/xe_wa_oob.h
diff --git a/drivers/gpu/drm/xe/xe_pcode_api.h b/drivers/gpu/drm/xe/xe_pcode_api.h
index 2bae9afdbd35..4fd58b3c0d9a 100644
--- a/drivers/gpu/drm/xe/xe_pcode_api.h
+++ b/drivers/gpu/drm/xe/xe_pcode_api.h
@@ -3,6 +3,9 @@
* Copyright © 2022 Intel Corporation
*/
+#ifndef _XE_PCODE_API_H_
+#define _XE_PCODE_API_H_
+
/* Internal to xe_pcode */
#include "regs/xe_reg_defs.h"
@@ -68,3 +71,4 @@ struct pcode_err_decode {
const char *str;
};
+#endif
--
2.39.5
Powered by blists - more mailing lists