From mboxrd@z Thu Jan 1 00:00:00 1970 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 07EB6C7EE23 for ; Wed, 31 May 2023 17:14:04 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 93CFC10E1D5; Wed, 31 May 2023 17:14:03 +0000 (UTC) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by gabe.freedesktop.org (Postfix) with ESMTPS id B057810E1D5 for ; Wed, 31 May 2023 17:14: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=1685553240; x=1717089240; h=from:to:subject:in-reply-to:references:date:message-id: mime-version; bh=h+ycGKcKZboQQU3jGXQmC0JnknK45mavoTJZL1+8qk0=; b=kNZtjS8ESwPCMJQrxhZ7DCj4T9ggGqY9vQcTRzlibZm97g6R6OLgpsAc MN0pvJorwXC/W/R4ivgrHdQGbTu2GxytHRqpZoMhVP4FA4LzpCOjCniqk IQy/IzRRaXIsrhuNPHGjvMmrBX1q5O22jtqLTprERBaFdMsZTaWjeOgEY ErFkmsaOuUSRB7xKDaMDM59Dm1KUpoMKKc8/NTvjziTQ9NmN3Lsp9Ja6M H3U6uooEHuXtrSlEt17PNKZ7ebgecl3TxUHPUKkqvrmhVSQ5+zHaRh0Wj pyjAI6cLCvCunRh9zv9tV/czhc4ZSKMqQ56JtBxFtvEzqTIjRUFy1EfTM Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10727"; a="335652488" X-IronPort-AV: E=Sophos;i="6.00,207,1681196400"; d="scan'208";a="335652488" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 May 2023 10:13:15 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10727"; a="851298895" X-IronPort-AV: E=Sophos;i="6.00,207,1681196400"; d="scan'208";a="851298895" Received: from eladcoh1-mobl2.ger.corp.intel.com (HELO localhost) ([10.252.46.230]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 May 2023 10:13:14 -0700 From: Jani Nikula To: Gustavo Sousa , intel-gfx@lists.freedesktop.org In-Reply-To: <168505865091.3319.13924171660522526573@gjsousa-mobl2> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20230525210653.1048972-1-jani.nikula@intel.com> <168505865091.3319.13924171660522526573@gjsousa-mobl2> Date: Wed, 31 May 2023 20:13:12 +0300 Message-ID: <87ttvsfmqf.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain Subject: Re: [Intel-gfx] [PATCH] drm/i915: use localized __diag_ignore_all() instead of per file 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: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Thu, 25 May 2023, Gustavo Sousa wrote: > Quoting Jani Nikula (2023-05-25 18:06:53-03:00) >>Use localized __diag_push(), __diag_ignore_all() with rationale, and >>__diag_pop() for specific initializations instead of blanket disabling >>of -Woverride-init across several files. >> >>Signed-off-by: Jani Nikula > > Reviewed-by: Gustavo Sousa Thanks, pushed to din. BR, Jani. > >>--- >> drivers/gpu/drm/i915/Makefile | 5 ----- >> drivers/gpu/drm/i915/display/intel_display_device.c | 5 +++++ >> drivers/gpu/drm/i915/display/intel_fbdev.c | 5 +++++ >> drivers/gpu/drm/i915/i915_pci.c | 5 +++++ >> 4 files changed, 15 insertions(+), 5 deletions(-) >> >>diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile >>index 06374fc072d3..1c9ed4c52760 100644 >>--- a/drivers/gpu/drm/i915/Makefile >>+++ b/drivers/gpu/drm/i915/Makefile >>@@ -23,11 +23,6 @@ subdir-ccflags-y += $(call cc-disable-warning, unused-but-set-variable) >> subdir-ccflags-y += $(call cc-disable-warning, frame-address) >> subdir-ccflags-$(CONFIG_DRM_I915_WERROR) += -Werror >> >>-# Fine grained warnings disable >>-CFLAGS_i915_pci.o = $(call cc-disable-warning, override-init) >>-CFLAGS_display/intel_display_device.o = $(call cc-disable-warning, override-init) >>-CFLAGS_display/intel_fbdev.o = $(call cc-disable-warning, override-init) >>- >> subdir-ccflags-y += -I$(srctree)/$(src) >> >> # Please keep these build lists sorted! >>diff --git a/drivers/gpu/drm/i915/display/intel_display_device.c b/drivers/gpu/drm/i915/display/intel_display_device.c >>index a513ac8f71a3..464df1764a86 100644 >>--- a/drivers/gpu/drm/i915/display/intel_display_device.c >>+++ b/drivers/gpu/drm/i915/display/intel_display_device.c >>@@ -14,6 +14,9 @@ >> #include "intel_display_reg_defs.h" >> #include "intel_fbc.h" >> >>+__diag_push(); >>+__diag_ignore_all("-Woverride-init", "Allow overriding inherited members"); >>+ >> static const struct intel_display_device_info no_display = {}; >> >> #define PIPE_A_OFFSET 0x70000 >>@@ -650,6 +653,8 @@ static const struct intel_display_device_info xe_lpdp_display = { >> BIT(TRANSCODER_C) | BIT(TRANSCODER_D), >> }; >> >>+__diag_pop(); >>+ >> #undef INTEL_VGA_DEVICE >> #undef INTEL_QUANTA_VGA_DEVICE >> #define INTEL_VGA_DEVICE(id, info) { id, info } >>diff --git a/drivers/gpu/drm/i915/display/intel_fbdev.c b/drivers/gpu/drm/i915/display/intel_fbdev.c >>index aab1ae74a8f7..2c3f7befed17 100644 >>--- a/drivers/gpu/drm/i915/display/intel_fbdev.c >>+++ b/drivers/gpu/drm/i915/display/intel_fbdev.c >>@@ -130,6 +130,9 @@ static int intel_fbdev_mmap(struct fb_info *info, struct vm_area_struct *vma) >> return i915_gem_fb_mmap(obj, vma); >> } >> >>+__diag_push(); >>+__diag_ignore_all("-Woverride-init", "Allow overriding the default ops"); >>+ >> static const struct fb_ops intelfb_ops = { >> .owner = THIS_MODULE, >> DRM_FB_HELPER_DEFAULT_OPS, >>@@ -144,6 +147,8 @@ static const struct fb_ops intelfb_ops = { >> .fb_mmap = intel_fbdev_mmap, >> }; >> >>+__diag_pop(); >>+ >> static int intelfb_alloc(struct drm_fb_helper *helper, >> struct drm_fb_helper_surface_size *sizes) >> { >>diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c >>index 928975d5fe2f..3d7a5db9833b 100644 >>--- a/drivers/gpu/drm/i915/i915_pci.c >>+++ b/drivers/gpu/drm/i915/i915_pci.c >>@@ -38,6 +38,9 @@ >> #include "i915_reg.h" >> #include "intel_pci_config.h" >> >>+__diag_push(); >>+__diag_ignore_all("-Woverride-init", "Allow overriding inherited members"); >>+ >> #define PLATFORM(x) .platform = (x) >> #define GEN(x) \ >> .__runtime.graphics.ip.ver = (x), \ >>@@ -843,6 +846,8 @@ static const struct intel_device_info mtl_info = { >> >> #undef PLATFORM >> >>+__diag_pop(); >>+ >> /* >> * Make sure any device matches here are from most specific to most >> * general. For example, since the Quanta match is based on the subsystem >>-- >>2.39.2 >> -- Jani Nikula, Intel Open Source Graphics Center