Skip to content

Commit 88e9664

Browse files
committed
drm/i915: use localized __diag_ignore_all() instead of per file
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 <jani.nikula@intel.com> Reviewed-by: Gustavo Sousa <gustavo.sousa@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20230525210653.1048972-1-jani.nikula@intel.com
1 parent e2a9f0a commit 88e9664

4 files changed

Lines changed: 15 additions & 5 deletions

File tree

drivers/gpu/drm/i915/Makefile

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,6 @@ subdir-ccflags-y += $(call cc-disable-warning, unused-but-set-variable)
2323
subdir-ccflags-y += $(call cc-disable-warning, frame-address)
2424
subdir-ccflags-$(CONFIG_DRM_I915_WERROR) += -Werror
2525

26-
# Fine grained warnings disable
27-
CFLAGS_i915_pci.o = $(call cc-disable-warning, override-init)
28-
CFLAGS_display/intel_display_device.o = $(call cc-disable-warning, override-init)
29-
CFLAGS_display/intel_fbdev.o = $(call cc-disable-warning, override-init)
30-
3126
subdir-ccflags-y += -I$(srctree)/$(src)
3227

3328
# Please keep these build lists sorted!

drivers/gpu/drm/i915/display/intel_display_device.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
#include "intel_display_reg_defs.h"
1515
#include "intel_fbc.h"
1616

17+
__diag_push();
18+
__diag_ignore_all("-Woverride-init", "Allow overriding inherited members");
19+
1720
static const struct intel_display_device_info no_display = {};
1821

1922
#define PIPE_A_OFFSET 0x70000
@@ -650,6 +653,8 @@ static const struct intel_display_device_info xe_lpdp_display = {
650653
BIT(TRANSCODER_C) | BIT(TRANSCODER_D),
651654
};
652655

656+
__diag_pop();
657+
653658
#undef INTEL_VGA_DEVICE
654659
#undef INTEL_QUANTA_VGA_DEVICE
655660
#define INTEL_VGA_DEVICE(id, info) { id, info }

drivers/gpu/drm/i915/display/intel_fbdev.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,9 @@ static int intel_fbdev_mmap(struct fb_info *info, struct vm_area_struct *vma)
130130
return i915_gem_fb_mmap(obj, vma);
131131
}
132132

133+
__diag_push();
134+
__diag_ignore_all("-Woverride-init", "Allow overriding the default ops");
135+
133136
static const struct fb_ops intelfb_ops = {
134137
.owner = THIS_MODULE,
135138
DRM_FB_HELPER_DEFAULT_OPS,
@@ -144,6 +147,8 @@ static const struct fb_ops intelfb_ops = {
144147
.fb_mmap = intel_fbdev_mmap,
145148
};
146149

150+
__diag_pop();
151+
147152
static int intelfb_alloc(struct drm_fb_helper *helper,
148153
struct drm_fb_helper_surface_size *sizes)
149154
{

drivers/gpu/drm/i915/i915_pci.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@
3838
#include "i915_reg.h"
3939
#include "intel_pci_config.h"
4040

41+
__diag_push();
42+
__diag_ignore_all("-Woverride-init", "Allow overriding inherited members");
43+
4144
#define PLATFORM(x) .platform = (x)
4245
#define GEN(x) \
4346
.__runtime.graphics.ip.ver = (x), \
@@ -843,6 +846,8 @@ static const struct intel_device_info mtl_info = {
843846

844847
#undef PLATFORM
845848

849+
__diag_pop();
850+
846851
/*
847852
* Make sure any device matches here are from most specific to most
848853
* general. For example, since the Quanta match is based on the subsystem

0 commit comments

Comments
 (0)