From patchwork Fri Oct 6 12:34:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 13411405 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 B4310E81DEE for ; Fri, 6 Oct 2023 12:35:15 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1FC5110E4DB; Fri, 6 Oct 2023 12:35:15 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1028910E4E3 for ; Fri, 6 Oct 2023 12:35:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1696595712; x=1728131712; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=q4EzDI6ZeA5w3ss3pfzuzwJk0z1vBLt7SaDPCVeKFQY=; b=b3b4uJnzZIPnSQqeXUa+5qgoM/Gjn5dhRNzbI/VN/ioogqg90pw/S5CG vAEdm8rV5OggGta6IHH+SnojpxpD/EcdS0swtMKq4nOd4KSlosdj+H33X OMX2yYVEi660Q6IXg3F/ud1Hp271/m5zIOC3ssgz/yVl7ueEuB2RrfoYb z6hwHw5iwboe2rxhgBLdkPjJLPBYcgu2Ck5Y0FCqnqt9aqsgE93HZbFgn I7Fz2le1T4iA+ye7iJT6eUfLsCHIHIzFd/RJJSOYsWhpGYeDsGhWIhRjf RN/97e2fn0N2k03CJrQC1qiC6drseIOA01xb6XnCE91cHPw7f3fvuTqCa Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10854"; a="386564242" X-IronPort-AV: E=Sophos;i="6.03,204,1694761200"; d="scan'208";a="386564242" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Oct 2023 05:35:11 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10854"; a="875930228" X-IronPort-AV: E=Sophos;i="6.03,204,1694761200"; d="scan'208";a="875930228" Received: from lvroom-mobl2.ger.corp.intel.com (HELO localhost) ([10.252.41.239]) by orsmga004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Oct 2023 05:35:08 -0700 From: Jani Nikula To: intel-gfx@lists.freedesktop.org Date: Fri, 6 Oct 2023 15:34:47 +0300 Message-Id: X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Subject: [Intel-gfx] [PATCH 2/2] drm/i915: enable W=1 warnings by default X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Arnd Bergmann , linux-kbuild@vger.kernel.org, jani.nikula@intel.com, Masahiro Yamada , Nick Desaulniers , Nathan Chancellor Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" We enable a bunch more compiler warnings than the kernel defaults. However, they've drifted to become a unique set of warnings, and have increasingly fallen behind from the W=1 set. Align with the W=1 warnings from scripts/Makefile.extrawarn for clarity, by copy-pasting them with s/KBUILD_CFLAGS/subdir-ccflags-y/ to make it easier to compare in the future. Cc: Arnd Bergmann Cc: Nick Desaulniers Cc: Nathan Chancellor Cc: Masahiro Yamada Signed-off-by: Jani Nikula Reviewed-by: Nathan Chancellor --- An alternative or future option would be to have Makefile.extrawarn assign W=1 etc. flags to intermediate variables, say KBUILD_CFLAGS_W1, like this: KBUILD_CFLAGS_W1 += -Wextra -Wunused -Wno-unused-parameter etc... export KBUILD_CFLAGS_W1 ifneq ($(findstring 1, $(KBUILD_EXTRA_WARN)),) KBUILD_CFLAGS += $(KBUILD_CFLAGS_W1) else etc... and then drivers and subsystems could simply use: subdir-ccflags-y += $(KBUILD_CFLAGS_W1) to enable and remain up-to-date with W=1 warnings. --- drivers/gpu/drm/i915/Makefile | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile index 623f81217442..0485157054fc 100644 --- a/drivers/gpu/drm/i915/Makefile +++ b/drivers/gpu/drm/i915/Makefile @@ -3,22 +3,25 @@ # Makefile for the drm device driver. This driver provides support for the # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher. -# Add a set of useful warning flags and enable -Werror for CI to prevent -# trivial mistakes from creeping in. We have to do this piecemeal as we reject -# any patch that isn't warning clean, so turning on -Wextra (or W=1) we -# need to filter out dubious warnings. Still it is our interest -# to keep running locally with W=1 C=1 until we are completely clean. -# -# Note the danger in using -Wextra is that when CI updates gcc we -# will most likely get a sudden build breakage... Hopefully we will fix -# new warnings before CI updates! -subdir-ccflags-y := -Wextra -subdir-ccflags-y += -Wno-unused-parameter -subdir-ccflags-y += -Wno-type-limits -subdir-ccflags-y += -Wno-missing-field-initializers -subdir-ccflags-y += -Wno-sign-compare -subdir-ccflags-y += -Wno-shift-negative-value +# Unconditionally enable W=1 warnings locally +# --- begin copy-paste W=1 warnings from scripts/Makefile.extrawarn +subdir-ccflags-y += -Wextra -Wunused -Wno-unused-parameter +subdir-ccflags-y += -Wmissing-declarations +subdir-ccflags-y += $(call cc-option, -Wrestrict) +subdir-ccflags-y += -Wmissing-format-attribute +subdir-ccflags-y += -Wmissing-prototypes +subdir-ccflags-y += -Wold-style-definition +subdir-ccflags-y += -Wmissing-include-dirs subdir-ccflags-y += $(call cc-option, -Wunused-but-set-variable) +subdir-ccflags-y += $(call cc-option, -Wunused-const-variable) +subdir-ccflags-y += $(call cc-option, -Wpacked-not-aligned) +subdir-ccflags-y += $(call cc-option, -Wformat-overflow) +subdir-ccflags-y += $(call cc-option, -Wformat-truncation) +subdir-ccflags-y += $(call cc-option, -Wstringop-overflow) +subdir-ccflags-y += $(call cc-option, -Wstringop-truncation) +# --- end copy-paste + +# Enable -Werror in CI and development subdir-ccflags-$(CONFIG_DRM_I915_WERROR) += -Werror # Fine grained warnings disable