From patchwork Tue Apr 1 12:18:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 14034750 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 60753C36018 for ; Tue, 1 Apr 2025 12:18:55 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B930110E328; Tue, 1 Apr 2025 12:18:54 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="Gqz9HYhp"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.7]) by gabe.freedesktop.org (Postfix) with ESMTPS id 95F8710E324; Tue, 1 Apr 2025 12:18:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1743509934; x=1775045934; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=qMks4yyxcsdFFFFIp4ZE81kxinfaQlXtFyDSszriyh8=; b=Gqz9HYhpk8/esCDqJshtexCTCqzz/PPlLQ2C7b8SP4vM9DnUOO6ZPyZP hKAfdoeaycgI3tZic3TyzFQ/775kM6fz/nNDZLzXU+OcWdNEx2IGU2JjN n1OnNR1ojT4VswzVqzyi/thfQ62upnXnIJt/R/vdDBaWZYKiFUY32N3yB U/IWD1rxALkWP2hXov9xszvOwmEIpow+UvyXOP7dm9hSF1jotVlbSoIE2 XCscqSREHs+tBCfokgmpNyW9f6OrvOfnqVEfg5AH8q5nAiAdXuWDhT8zv He3viklPzwcbT1mJsV08N/n+GmqcIlM+HIMji+OpQBLg2Mn6ACMw9VXy6 g==; X-CSE-ConnectionGUID: 9J0Lm5YNRmikPtYiGfIQJQ== X-CSE-MsgGUID: whEOZzrCQVOO++bWTujV1w== X-IronPort-AV: E=McAfee;i="6700,10204,11391"; a="70186946" X-IronPort-AV: E=Sophos;i="6.14,293,1736841600"; d="scan'208";a="70186946" Received: from orviesa004.jf.intel.com ([10.64.159.144]) by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Apr 2025 05:18:53 -0700 X-CSE-ConnectionGUID: FLKO6xFIRkSTSCD4li7oKw== X-CSE-MsgGUID: /zPIWQYITWqWdiJYY+cBCA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,293,1736841600"; d="scan'208";a="131373417" Received: from ncintean-mobl1.ger.corp.intel.com (HELO localhost) ([10.245.246.7]) by orviesa004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Apr 2025 05:18:49 -0700 From: Jani Nikula To: Linus Torvalds , linux-kernel@vger.kernel.org Cc: jani.nikula@intel.com, Masahiro Yamada , David Airlie , Daniel Vetter , linux-kbuild@vger.kernel.org, dri-devel@lists.freedesktop.org, intel-xe@lists.freedesktop.org, intel-gfx@lists.freedesktop.org Subject: [PATCH 1/5] drm: place header test files in .hdrtest subdirectories Date: Tue, 1 Apr 2025 15:18:26 +0300 Message-Id: <20250401121830.21696-2-jani.nikula@intel.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250401121830.21696-1-jani.nikula@intel.com> References: <20250401121830.21696-1-jani.nikula@intel.com> MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" The header tests track whether headers have been checked using empty *.hdrtest files in the build tree. This pollutes the build directories, as the files live in the same "name space" as the real output files, messing with TAB completion among other things. Hide the disgusting turds by placing them in .hdrtest subdirectories. Change the quiet command output to simply $< instead of trying to decode roughly the same from the increasingly complicated $@. Note that it would be somewhat nicer to have the basename of the .hdrtest files be dot-prefixed instead of using subdirectories. However, it's challenging to come up with a pattern rule for that, as we can list headers to test in the subdirectories of $(src) too, without requiring Makefiles and kbuild to descend to each of them. Reported-by: Linus Torvalds Closes: https://lore.kernel.org/r/CAHk-=wjMrqzuUmH-mFbR_46EWEFS=bB=J7h9ABMVy56Vi81PKQ@mail.gmail.com Fixes: 62ae45687e43 ("drm: ensure drm headers are self-contained and pass kernel-doc") Cc: Masahiro Yamada Cc: David Airlie Cc: Daniel Vetter Signed-off-by: Jani Nikula --- Cc: linux-kbuild@vger.kernel.org Cc: dri-devel@lists.freedesktop.org Cc: intel-xe@lists.freedesktop.org Cc: intel-gfx@lists.freedesktop.org --- drivers/gpu/drm/Makefile | 6 +++--- include/drm/Makefile | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile index ed54a546bbe2..1666ea55bd24 100644 --- a/drivers/gpu/drm/Makefile +++ b/drivers/gpu/drm/Makefile @@ -230,14 +230,14 @@ hdrtest-files := \ $(shell cd $(src) && find display lib -name '*.h') always-$(CONFIG_DRM_HEADER_TEST) += \ - $(patsubst %.h,%.hdrtest, $(hdrtest-files)) + $(patsubst %.h,.hdrtest/%.hdrtest, $(hdrtest-files)) # Include the header twice to detect missing include guard. -quiet_cmd_hdrtest = HDRTEST $(patsubst %.hdrtest,%.h,$@) +quiet_cmd_hdrtest = HDRTEST $< cmd_hdrtest = \ $(CC) $(c_flags) -fsyntax-only -x c /dev/null -include $< -include $<; \ $(srctree)/scripts/kernel-doc -none $(if $(CONFIG_WERROR)$(CONFIG_DRM_WERROR),-Werror) $<; \ touch $@ -$(obj)/%.hdrtest: $(src)/%.h FORCE +$(obj)/.hdrtest/%.hdrtest: $(src)/%.h FORCE $(call if_changed_dep,hdrtest) diff --git a/include/drm/Makefile b/include/drm/Makefile index a7bd15d2803e..a7593987909b 100644 --- a/include/drm/Makefile +++ b/include/drm/Makefile @@ -5,14 +5,14 @@ hdrtest-files := \ $(shell cd $(src) && find * -name '*.h' 2>/dev/null) always-$(CONFIG_DRM_HEADER_TEST) += \ - $(patsubst %.h,%.hdrtest, $(hdrtest-files)) + $(patsubst %.h,.hdrtest/%.hdrtest, $(hdrtest-files)) # Include the header twice to detect missing include guard. -quiet_cmd_hdrtest = HDRTEST $(patsubst %.hdrtest,%.h,$@) +quiet_cmd_hdrtest = HDRTEST $< cmd_hdrtest = \ $(CC) $(c_flags) -fsyntax-only -x c /dev/null -include $< -include $<; \ $(srctree)/scripts/kernel-doc -none $(if $(CONFIG_WERROR)$(CONFIG_DRM_WERROR),-Werror) $<; \ touch $@ -$(obj)/%.hdrtest: $(src)/%.h FORCE +$(obj)/.hdrtest/%.hdrtest: $(src)/%.h FORCE $(call if_changed_dep,hdrtest) From patchwork Tue Apr 1 12:18:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 14034751 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 62DD9C36018 for ; Tue, 1 Apr 2025 12:19:02 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C163110E374; Tue, 1 Apr 2025 12:19:01 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="e96vg1qO"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.7]) by gabe.freedesktop.org (Postfix) with ESMTPS id 701FD10E2DE; Tue, 1 Apr 2025 12:19:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1743509940; x=1775045940; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=jT6ExL+POLRIZkDCDeOJqvP819AIWXO6Td1/S/GF2sE=; b=e96vg1qOnf+yI08bnplalZT5109ylK+NHpEgbclOLcYu+xFzKooLupgj D3gzRC7tGTjd56ZVvKTg5QvnIOpILeDfhgGHzH6zr4OWCwcT4nB0+58QD WMi1e4j8ZZV1MTE1EMJaxohYXNkvWmmWog//J8Kd22jicHT24cc6lEbVi g8OQ03V3wFnl0WqmaTw/pivypKQzVnwoECoLySwH1tRESQDqN4tj6izLR I0LVbzU2KSfas4CIRwKzAQAQiR5UkZqJzT/IN9I4Ag7iRI+N+ew9LWktq VzUD+ZUtcOl+jHXs0YDGKP/xLnNZdKp0+sjz+MESC/o2FKh8jHaPLit4w A==; X-CSE-ConnectionGUID: gdfcxY9YRFi4yWeYBcvF3A== X-CSE-MsgGUID: k9GDYq5DQj+/NvPYI2xTHg== X-IronPort-AV: E=McAfee;i="6700,10204,11391"; a="70186967" X-IronPort-AV: E=Sophos;i="6.14,293,1736841600"; d="scan'208";a="70186967" Received: from orviesa004.jf.intel.com ([10.64.159.144]) by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Apr 2025 05:19:00 -0700 X-CSE-ConnectionGUID: 2eNsLzwHTH2xvgeR6joxnA== X-CSE-MsgGUID: 0OVOkFVaQSKzuJtY65XBNw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,293,1736841600"; d="scan'208";a="131373437" Received: from ncintean-mobl1.ger.corp.intel.com (HELO localhost) ([10.245.246.7]) by orviesa004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Apr 2025 05:18:56 -0700 From: Jani Nikula To: Linus Torvalds , linux-kernel@vger.kernel.org Cc: jani.nikula@intel.com, Lucas De Marchi , Masahiro Yamada , David Airlie , Daniel Vetter , linux-kbuild@vger.kernel.org, dri-devel@lists.freedesktop.org, intel-xe@lists.freedesktop.org, intel-gfx@lists.freedesktop.org Subject: [PATCH 2/5] drm/xe: place header test files in .hdrtest subdirectories Date: Tue, 1 Apr 2025 15:18:27 +0300 Message-Id: <20250401121830.21696-3-jani.nikula@intel.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250401121830.21696-1-jani.nikula@intel.com> References: <20250401121830.21696-1-jani.nikula@intel.com> MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" The header tests track whether headers have been checked using empty *.hdrtest files in the build tree. This pollutes the build directories, as the files live in the same "name space" as the real output files, messing with TAB completion among other things. Hide the disgusting turds by placing them in .hdrtest subdirectories. Change the quiet command output to simply $< instead of trying to decode roughly the same from the increasingly complicated $@. Note that it would be somewhat nicer to have the basename of the .hdrtest files be dot-prefixed instead of using subdirectories. However, it's challenging to come up with a pattern rule for that, as we can list headers to test in the subdirectories of $(src) too, without requiring Makefiles and kbuild to descend to each of them. Reported-by: Linus Torvalds 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: Lucas De Marchi Cc: Masahiro Yamada Cc: David Airlie Cc: Daniel Vetter Signed-off-by: Jani Nikula --- Cc: linux-kbuild@vger.kernel.org Cc: dri-devel@lists.freedesktop.org Cc: intel-xe@lists.freedesktop.org Cc: intel-gfx@lists.freedesktop.org --- drivers/gpu/drm/xe/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/xe/Makefile b/drivers/gpu/drm/xe/Makefile index 9699b08585f7..2029c3b5aa5c 100644 --- a/drivers/gpu/drm/xe/Makefile +++ b/drivers/gpu/drm/xe/Makefile @@ -327,12 +327,12 @@ ifneq ($(CONFIG_DRM_XE_DISPLAY),y) endif always-$(CONFIG_DRM_XE_WERROR) += \ - $(patsubst %.h,%.hdrtest, $(shell cd $(src) && find * -name '*.h' $(hdrtest_find_args))) + $(patsubst %.h,.hdrtest/%.hdrtest, $(shell cd $(src) && find * -name '*.h' $(hdrtest_find_args))) -quiet_cmd_hdrtest = HDRTEST $(patsubst %.hdrtest,%.h,$@) +quiet_cmd_hdrtest = HDRTEST $< 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 +$(obj)/.hdrtest/%.hdrtest: $(src)/%.h FORCE $(call if_changed_dep,hdrtest) uses_generated_oob := $(addprefix $(obj)/, $(xe-y)) From patchwork Tue Apr 1 12:18:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 14034752 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0E65EC36018 for ; Tue, 1 Apr 2025 12:19:09 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7830810E56C; Tue, 1 Apr 2025 12:19:08 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="H3Mwxk9q"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.7]) by gabe.freedesktop.org (Postfix) with ESMTPS id 49D4710E324; Tue, 1 Apr 2025 12:19:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1743509947; x=1775045947; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=kqy+pDKqPTt6DnS1U2G2+KSZGBj9TgpE+/PhWyhKPZM=; b=H3Mwxk9qS998qpX3wwlohRO9JQDJr0nBzMR7x/LrojsPnRb4EZBj1yf2 Q1gTKBHJrw6zw0xKWhEWMX7iWN2GEjZP9wtTsEK+RZipP6lxdehgYEJaR WLZbu2lmb/KkdX62/plS+Gr6XLRoHg13Ja1eSTx81LjMlSYWEsZp24P5m 9DJUVM/qS3iX+FVi47Il85UGk3kpDjhPaqJ2ZmRPMhRjDMZI852WhS1pl JMBNBCTCClNVdditQrelz2pKCF3B56+K3UHeQ3XZH27pKr0IeXC2KSnTo W521ZXxxrrzXxNV4IITlvaIes0uNzUAbWeocM+aVtl2EvyhrXrDgBYJkh Q==; X-CSE-ConnectionGUID: xQm8lu2TQeeR+miIkuXKfQ== X-CSE-MsgGUID: JDSIhMj9RP+rrrJe14iEwg== X-IronPort-AV: E=McAfee;i="6700,10204,11391"; a="70186981" X-IronPort-AV: E=Sophos;i="6.14,293,1736841600"; d="scan'208";a="70186981" Received: from orviesa004.jf.intel.com ([10.64.159.144]) by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Apr 2025 05:19:07 -0700 X-CSE-ConnectionGUID: ZEI6qYuTQtOOhUT4okRwJQ== X-CSE-MsgGUID: qydX8mSjSjyTNh1ep3pLzQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,293,1736841600"; d="scan'208";a="131373448" Received: from ncintean-mobl1.ger.corp.intel.com (HELO localhost) ([10.245.246.7]) by orviesa004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Apr 2025 05:19:03 -0700 From: Jani Nikula To: Linus Torvalds , linux-kernel@vger.kernel.org Cc: jani.nikula@intel.com, Masahiro Yamada , David Airlie , Daniel Vetter , linux-kbuild@vger.kernel.org, dri-devel@lists.freedesktop.org, intel-xe@lists.freedesktop.org, intel-gfx@lists.freedesktop.org Subject: [PATCH 3/5] drm/i915: place header test files in .hdrtest subdirectories Date: Tue, 1 Apr 2025 15:18:28 +0300 Message-Id: <20250401121830.21696-4-jani.nikula@intel.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250401121830.21696-1-jani.nikula@intel.com> References: <20250401121830.21696-1-jani.nikula@intel.com> MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" The header tests track whether headers have been checked using empty *.hdrtest files in the build tree. This pollutes the build directories, as the files live in the same "name space" as the real output files, messing with TAB completion among other things. Hide the disgusting turds by placing them in .hdrtest subdirectories. Change the quiet command output to simply $< instead of trying to decode roughly the same from the increasingly complicated $@. Note that it would be somewhat nicer to have the basename of the .hdrtest files be dot-prefixed instead of using subdirectories. However, it's challenging to come up with a pattern rule for that, as we can list headers to test in the subdirectories of $(src) too, without requiring Makefiles and kbuild to descend to each of them. Reported-by: Linus Torvalds Closes: https://lore.kernel.org/r/CAHk-=wjMrqzuUmH-mFbR_46EWEFS=bB=J7h9ABMVy56Vi81PKQ@mail.gmail.com Fixes: c6d4a099a240 ("drm/i915: reimplement header test feature") Cc: Masahiro Yamada Cc: David Airlie Cc: Daniel Vetter Signed-off-by: Jani Nikula --- Cc: linux-kbuild@vger.kernel.org Cc: dri-devel@lists.freedesktop.org Cc: intel-xe@lists.freedesktop.org Cc: intel-gfx@lists.freedesktop.org --- drivers/gpu/drm/i915/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile index ed05b131ed3a..a8ffe5c74962 100644 --- a/drivers/gpu/drm/i915/Makefile +++ b/drivers/gpu/drm/i915/Makefile @@ -418,12 +418,12 @@ no-header-test := \ display/intel_vbt_defs.h always-$(CONFIG_DRM_I915_WERROR) += \ - $(patsubst %.h,%.hdrtest, $(filter-out $(no-header-test), \ + $(patsubst %.h,.hdrtest/%.hdrtest, $(filter-out $(no-header-test), \ $(shell cd $(src) && find * -name '*.h'))) -quiet_cmd_hdrtest = HDRTEST $(patsubst %.hdrtest,%.h,$@) +quiet_cmd_hdrtest = HDRTEST $< cmd_hdrtest = $(CC) $(filter-out $(CFLAGS_GCOV), $(c_flags)) -S -o /dev/null -x c /dev/null -include $<; \ $(srctree)/scripts/kernel-doc -none -Werror $<; touch $@ -$(obj)/%.hdrtest: $(src)/%.h FORCE +$(obj)/.hdrtest/%.hdrtest: $(src)/%.h FORCE $(call if_changed_dep,hdrtest) From patchwork Tue Apr 1 12:18:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 14034753 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A6E7FC36018 for ; Tue, 1 Apr 2025 12:19:15 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 138DF10E57D; Tue, 1 Apr 2025 12:19:15 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="lcIqLApK"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.18]) by gabe.freedesktop.org (Postfix) with ESMTPS id B412310E2DE; Tue, 1 Apr 2025 12:19:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1743509954; x=1775045954; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=TFzN17CpzAgXFVrWu0W8hh/yV1WzMbFtltLzk/8/ZTQ=; b=lcIqLApKKmK0Z5o4jOXwd7flIhTmcIC6dSum4kbjVJt/UuLdwhIHY3gY qBYs8+Gi5XnfJtoiLheJvuOp5tRCOPUhSu6R0KkmxRtzQXN3CSG4+NKdF kOxOUQNSpGONoq5tKSqv7b/7Z5sZigytuaqR1NcVk5gnHq+SgbjpsI8Iz Z1je3ZP+PjEmLgsW7he1Z3E7FyksIlZjyYOmQwrAWXuDXa7intVJU/lJe BCom/HRvrRyGI3+jdglwH9/nKH0lfwuRiVE0TMv9THKKqmMfY3Mm0lcl8 hjMqbWIJVXcpT0R6bBOidvaLTRWZj5hd4aoxKTJfq7OX5wbPBh7QZZrgj w==; X-CSE-ConnectionGUID: siBkG9mlSWa9NXRuXbD/YQ== X-CSE-MsgGUID: 4xzuUe5uQYio65tkpLQ6+A== X-IronPort-AV: E=McAfee;i="6700,10204,11391"; a="44981737" X-IronPort-AV: E=Sophos;i="6.14,293,1736841600"; d="scan'208";a="44981737" Received: from fmviesa001.fm.intel.com ([10.60.135.141]) by orvoesa110.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Apr 2025 05:19:13 -0700 X-CSE-ConnectionGUID: uuGqDkIjS5imSGGyJCXT/A== X-CSE-MsgGUID: QrIX/9gaTQGGnEU7Cm054Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,293,1736841600"; d="scan'208";a="157365129" Received: from ncintean-mobl1.ger.corp.intel.com (HELO localhost) ([10.245.246.7]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Apr 2025 05:19:10 -0700 From: Jani Nikula To: Linus Torvalds , linux-kernel@vger.kernel.org Cc: jani.nikula@intel.com, Masahiro Yamada , David Airlie , Daniel Vetter , linux-kbuild@vger.kernel.org, dri-devel@lists.freedesktop.org, intel-xe@lists.freedesktop.org, intel-gfx@lists.freedesktop.org Subject: [PATCH 4/5] kbuild: hdrtest: place header test files in .hdrtest subdirectories Date: Tue, 1 Apr 2025 15:18:29 +0300 Message-Id: <20250401121830.21696-5-jani.nikula@intel.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250401121830.21696-1-jani.nikula@intel.com> References: <20250401121830.21696-1-jani.nikula@intel.com> MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" The header tests track whether headers have been checked using empty *.hdrtest files in the build tree. This pollutes the build directories, as the files live in the same "name space" as the real output files, messing with TAB completion among other things. Hide the disgusting turds by placing them in .hdrtest subdirectories. Note that it would be somewhat nicer to have the basename of the .hdrtest files be dot-prefixed instead of using subdirectories. However, it's challenging to come up with a pattern rule for that, as we can list headers to test in the subdirectories of $(src) too, without requiring Makefiles and kbuild to descend to each of them. Reported-by: Linus Torvalds Closes: https://lore.kernel.org/r/CAHk-=wjMrqzuUmH-mFbR_46EWEFS=bB=J7h9ABMVy56Vi81PKQ@mail.gmail.com Fixes: fcbb8461fd23 ("kbuild: remove header compile test") Cc: Masahiro Yamada Cc: David Airlie Cc: Daniel Vetter Signed-off-by: Jani Nikula --- Cc: linux-kbuild@vger.kernel.org Cc: dri-devel@lists.freedesktop.org Cc: intel-xe@lists.freedesktop.org Cc: intel-gfx@lists.freedesktop.org --- usr/include/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr/include/Makefile b/usr/include/Makefile index e3d6b03527fe..4fb574fd3fec 100644 --- a/usr/include/Makefile +++ b/usr/include/Makefile @@ -71,7 +71,7 @@ endif # asm-generic/*.h is used by asm/*.h, and should not be included directly no-header-test += asm-generic/% -always-y := $(patsubst $(obj)/%.h,%.hdrtest, $(shell find $(obj) -name '*.h' 2>/dev/null)) +always-y := $(patsubst $(obj)/%.h,.hdrtest/%.hdrtest, $(shell find $(obj) -name '*.h' 2>/dev/null)) # Include the header twice to detect missing include guard. quiet_cmd_hdrtest = HDRTEST $< @@ -81,7 +81,7 @@ quiet_cmd_hdrtest = HDRTEST $< $(PERL) $(src)/headers_check.pl $(obj) $<; \ touch $@ -$(obj)/%.hdrtest: $(obj)/%.h FORCE +$(obj)/.hdrtest/%.hdrtest: $(obj)/%.h FORCE $(call if_changed_dep,hdrtest) # Since GNU Make 4.3, $(patsubst $(obj)/%/,%,$(wildcard $(obj)/*/)) works. From patchwork Tue Apr 1 12:18:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 14034754 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 13950C3601B for ; Tue, 1 Apr 2025 12:19:22 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5EEE810E586; Tue, 1 Apr 2025 12:19:21 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="jbX1VpJy"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.18]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2158110E324; Tue, 1 Apr 2025 12:19:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1743509960; x=1775045960; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=k+JFvSQ26FarxrRAOquTbPWkCD8Pzve2Gh9zf2uf7Ew=; b=jbX1VpJy3JZalOIPMZ67A88AXrC4zSXIw0WCCsV+MigyAVAtRAmzwObw dO6eEyDy4M/C7IPtS+T4ysDSZ4UHU65sTA8KqvOPZk8KlyulBmL+rvfOT k2wcr/Rfy1ilyFBT2Dg7sgupFvjjOcm5irmvETIMclu/hZuHwd9OSkrsw ve7MaWvdlAbQCD2cfPpU1cAzCONKdnYkpxjFL3CGKnrToeIPm2nglXfLL +u6fNXulV3Vq2wfh9QTfnaObbe1FZJBu6eiLW1axJy5fVkf0/k5uMBUQ7 117LWJZ7jXu2gkY30uzG2fzhgTBQUpeoUlC4T2XtAXBnos9BJTjeS9eNq A==; X-CSE-ConnectionGUID: ikfUYhJ8RpytRKosldXKxQ== X-CSE-MsgGUID: DhiDsMAwSvSxQKcnbJMlmA== X-IronPort-AV: E=McAfee;i="6700,10204,11391"; a="44981762" X-IronPort-AV: E=Sophos;i="6.14,293,1736841600"; d="scan'208";a="44981762" Received: from fmviesa001.fm.intel.com ([10.60.135.141]) by orvoesa110.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Apr 2025 05:19:20 -0700 X-CSE-ConnectionGUID: O3fed8/ISRavwWB0+7AiGA== X-CSE-MsgGUID: X3cpC3b2Skq3VReLpCGmUQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,293,1736841600"; d="scan'208";a="157365168" Received: from ncintean-mobl1.ger.corp.intel.com (HELO localhost) ([10.245.246.7]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Apr 2025 05:19:16 -0700 From: Jani Nikula To: Linus Torvalds , linux-kernel@vger.kernel.org Cc: jani.nikula@intel.com, Masahiro Yamada , David Airlie , Daniel Vetter , linux-kbuild@vger.kernel.org, dri-devel@lists.freedesktop.org, intel-xe@lists.freedesktop.org, intel-gfx@lists.freedesktop.org Subject: [PATCH 5/5] drm: add config option for extra build-time checks Date: Tue, 1 Apr 2025 15:18:30 +0300 Message-Id: <20250401121830.21696-6-jani.nikula@intel.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250401121830.21696-1-jani.nikula@intel.com> References: <20250401121830.21696-1-jani.nikula@intel.com> MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" The DRM subsystem contains additional build-time checks, primarily aimed at DRM developers and CI systems. The checks may be overzealous. They may slow down or fail the build altogether. They may create excessive dependency files in the build tree. They should not be enabled for regular builds, and certainly not forced on unsuspecting developers running an allyesconfig or allmodconfig build. Add config DRM_DISABLE_EXTRA_BUILD_CHECKS, enabled by default as well as by allyesconfig/allmodconfig, hiding the extra checks from anyone but people who intentionally opt-in for the checks. For example, to enable header tests: $ scripts/config --disable CONFIG_DRM_DISABLE_EXTRA_BUILD_CHECKS --enable CONFIG_DRM_HEADER_TEST $ make olddefconfig Reported-by: Linus Torvalds Closes: https://lore.kernel.org/r/CAHk-=wjcdfrDTjzm6J6T-3fxtVyBG7a_0BXc2=mgOuM6KPFnCg@mail.gmail.com Fixes: 62ae45687e43 ("drm: ensure drm headers are self-contained and pass kernel-doc") Cc: Masahiro Yamada Cc: David Airlie Cc: Daniel Vetter Signed-off-by: Jani Nikula --- Cc: linux-kbuild@vger.kernel.org Cc: dri-devel@lists.freedesktop.org Cc: intel-xe@lists.freedesktop.org Cc: intel-gfx@lists.freedesktop.org --- drivers/gpu/drm/Kconfig | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig index 2cba2b6ebe1c..5a3fce9ef998 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig @@ -489,9 +489,26 @@ config DRM_PRIVACY_SCREEN bool default n +# Reversed option to disable on allyesconfig/allmodconfig builds +config DRM_DISABLE_EXTRA_BUILD_CHECKS + bool "Disable DRM subsystem extra build-time checks" + default y + help + The DRM subsystem contains additional build-time checks, primarily + aimed at DRM developers and CI systems. The checks may be + overzealous. They may slow down or fail the build altogether. They may + create excessive dependency files in the tree. They should not be + enabled for regular builds, and thus they are disabled by default. + +# Proxy config to allow simple "depends on DRM_EXTRA_BUILD_CHECKS" +config DRM_EXTRA_BUILD_CHECKS + bool + depends on DRM && EXPERT && DRM_DISABLE_EXTRA_BUILD_CHECKS=n + default !DRM_DISABLE_EXTRA_BUILD_CHECKS + config DRM_WERROR bool "Compile the drm subsystem with warnings as errors" - depends on DRM && EXPERT + depends on DRM_EXTRA_BUILD_CHECKS depends on !WERROR default n help @@ -505,7 +522,7 @@ config DRM_WERROR config DRM_HEADER_TEST bool "Ensure DRM headers are self-contained and pass kernel-doc" - depends on DRM && EXPERT && BROKEN + depends on DRM_EXTRA_BUILD_CHECKS default n help Ensure the DRM subsystem headers both under drivers/gpu/drm and