* [Intel-gfx] [PATCH] drm/i915: use localized __diag_ignore_all() instead of per file
@ 2023-05-25 21:06 Jani Nikula
2023-05-25 21:54 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for " Patchwork
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: Jani Nikula @ 2023-05-25 21:06 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula
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>
---
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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Intel-gfx] ✗ Fi.CI.SPARSE: warning for drm/i915: use localized __diag_ignore_all() instead of per file
2023-05-25 21:06 [Intel-gfx] [PATCH] drm/i915: use localized __diag_ignore_all() instead of per file Jani Nikula
@ 2023-05-25 21:54 ` Patchwork
2023-05-25 22:02 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Patchwork @ 2023-05-25 21:54 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: use localized __diag_ignore_all() instead of per file
URL : https://patchwork.freedesktop.org/series/118395/
State : warning
== Summary ==
Error: dim sparse failed
Sparse version: v0.6.2
Fast mode used, each commit won't be checked separately.
+drivers/gpu/drm/i915/display/intel_display_device.c:468:9: warning: Initializer entry defined twice
+drivers/gpu/drm/i915/display/intel_display_device.c:470:9: also defined here
+drivers/gpu/drm/i915/display/intel_display_device.c:565:9: warning: Initializer entry defined twice
+drivers/gpu/drm/i915/display/intel_display_device.c:570:10: also defined here
+drivers/gpu/drm/i915/display/intel_display_device.c:576:9: warning: Initializer entry defined twice
+drivers/gpu/drm/i915/display/intel_display_device.c:578:10: also defined here
+drivers/gpu/drm/i915/display/intel_display_device.c:645:9: warning: Initializer entry defined twice
+drivers/gpu/drm/i915/display/intel_display_device.c:649:10: also defined here
+drivers/gpu/drm/i915/display/intel_fbdev.c:138:9: warning: Initializer entry defined twice
+drivers/gpu/drm/i915/display/intel_fbdev.c:139:10: also defined here
+drivers/gpu/drm/i915/i915_pci.c:154:9: warning: Initializer entry defined twice
+drivers/gpu/drm/i915/i915_pci.c:156:10: also defined here
+drivers/gpu/drm/i915/i915_pci.c:185:9: warning: Initializer entry defined twice
+drivers/gpu/drm/i915/i915_pci.c:187:10: also defined here
+drivers/gpu/drm/i915/i915_pci.c:191:9: warning: Initializer entry defined twice
+drivers/gpu/drm/i915/i915_pci.c:193:10: also defined here
+drivers/gpu/drm/i915/i915_pci.c:197:9: warning: Initializer entry defined twice
+drivers/gpu/drm/i915/i915_pci.c:200:10: also defined here
+drivers/gpu/drm/i915/i915_pci.c:217:9: warning: Initializer entry defined twice
+drivers/gpu/drm/i915/i915_pci.c:220:10: also defined here
+drivers/gpu/drm/i915/i915_pci.c:224:9: warning: Initializer entry defined twice
+drivers/gpu/drm/i915/i915_pci.c:228:10: also defined here
+drivers/gpu/drm/i915/i915_pci.c:232:9: warning: Initializer entry defined twice
+drivers/gpu/drm/i915/i915_pci.c:235:10: also defined here
+drivers/gpu/drm/i915/i915_pci.c:239:9: warning: Initializer entry defined twice
+drivers/gpu/drm/i915/i915_pci.c:243:10: also defined here
+drivers/gpu/drm/i915/i915_pci.c:408:9: also defined here
+drivers/gpu/drm/i915/i915_pci.c:408:9: warning: Initializer entry defined twice
+drivers/gpu/drm/i915/i915_pci.c:413:9: also defined here
+drivers/gpu/drm/i915/i915_pci.c:413:9: warning: Initializer entry defined twice
+drivers/gpu/drm/i915/i915_pci.c:418:9: also defined here
+drivers/gpu/drm/i915/i915_pci.c:418:9: warning: Initializer entry defined twice
+drivers/gpu/drm/i915/i915_pci.c:436:9: also defined here
+drivers/gpu/drm/i915/i915_pci.c:436:9: warning: Initializer entry defined twice
+drivers/gpu/drm/i915/i915_pci.c:441:9: also defined here
+drivers/gpu/drm/i915/i915_pci.c:441:9: warning: Initializer entry defined twice
+drivers/gpu/drm/i915/i915_pci.c:446:9: also defined here
+drivers/gpu/drm/i915/i915_pci.c:446:9: warning: Initializer entry defined twice
+drivers/gpu/drm/i915/i915_pci.c:454:9: warning: too many warnings
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915: use localized __diag_ignore_all() instead of per file
2023-05-25 21:06 [Intel-gfx] [PATCH] drm/i915: use localized __diag_ignore_all() instead of per file Jani Nikula
2023-05-25 21:54 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for " Patchwork
@ 2023-05-25 22:02 ` Patchwork
2023-05-25 23:50 ` [Intel-gfx] [PATCH] " Gustavo Sousa
2023-05-26 11:19 ` [Intel-gfx] ✓ Fi.CI.IGT: success for " Patchwork
3 siblings, 0 replies; 6+ messages in thread
From: Patchwork @ 2023-05-25 22:02 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
[-- Attachment #1: Type: text/plain, Size: 10505 bytes --]
== Series Details ==
Series: drm/i915: use localized __diag_ignore_all() instead of per file
URL : https://patchwork.freedesktop.org/series/118395/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_13188 -> Patchwork_118395v1
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118395v1/index.html
Participating hosts (39 -> 38)
------------------------------
Additional (1): bat-dg2-9
Missing (2): fi-kbl-soraka fi-snb-2520m
Known issues
------------
Here are the changes found in Patchwork_118395v1 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_mmap@basic:
- bat-dg2-9: NOTRUN -> [SKIP][1] ([i915#4083])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118395v1/bat-dg2-9/igt@gem_mmap@basic.html
* igt@gem_mmap_gtt@basic:
- bat-dg2-9: NOTRUN -> [SKIP][2] ([i915#4077]) +2 similar issues
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118395v1/bat-dg2-9/igt@gem_mmap_gtt@basic.html
* igt@gem_render_tiled_blits@basic:
- bat-dg2-9: NOTRUN -> [SKIP][3] ([i915#4079]) +1 similar issue
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118395v1/bat-dg2-9/igt@gem_render_tiled_blits@basic.html
* igt@i915_pm_backlight@basic-brightness:
- bat-dg2-9: NOTRUN -> [SKIP][4] ([i915#5354] / [i915#7561])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118395v1/bat-dg2-9/igt@i915_pm_backlight@basic-brightness.html
* igt@i915_pm_rps@basic-api:
- bat-dg2-9: NOTRUN -> [SKIP][5] ([i915#6621])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118395v1/bat-dg2-9/igt@i915_pm_rps@basic-api.html
* igt@i915_selftest@live@migrate:
- bat-adlp-9: [PASS][6] -> [DMESG-FAIL][7] ([i915#7699] / [i915#7913])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13188/bat-adlp-9/igt@i915_selftest@live@migrate.html
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118395v1/bat-adlp-9/igt@i915_selftest@live@migrate.html
- bat-dg2-11: [PASS][8] -> [DMESG-WARN][9] ([i915#7699])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13188/bat-dg2-11/igt@i915_selftest@live@migrate.html
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118395v1/bat-dg2-11/igt@i915_selftest@live@migrate.html
* igt@i915_selftest@live@slpc:
- bat-rpls-2: NOTRUN -> [DMESG-WARN][10] ([i915#6367])
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118395v1/bat-rpls-2/igt@i915_selftest@live@slpc.html
* igt@i915_suspend@basic-s2idle-without-i915:
- bat-rpls-2: NOTRUN -> [ABORT][11] ([i915#6687])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118395v1/bat-rpls-2/igt@i915_suspend@basic-s2idle-without-i915.html
* igt@kms_addfb_basic@addfb25-y-tiled-small-legacy:
- bat-dg2-9: NOTRUN -> [SKIP][12] ([i915#5190])
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118395v1/bat-dg2-9/igt@kms_addfb_basic@addfb25-y-tiled-small-legacy.html
* igt@kms_addfb_basic@basic-x-tiled-legacy:
- bat-dg2-9: NOTRUN -> [SKIP][13] ([i915#4212]) +2 similar issues
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118395v1/bat-dg2-9/igt@kms_addfb_basic@basic-x-tiled-legacy.html
* igt@kms_addfb_basic@basic-y-tiled-legacy:
- bat-dg2-9: NOTRUN -> [SKIP][14] ([i915#4215] / [i915#5190])
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118395v1/bat-dg2-9/igt@kms_addfb_basic@basic-y-tiled-legacy.html
* igt@kms_addfb_basic@framebuffer-vs-set-tiling:
- bat-dg2-9: NOTRUN -> [SKIP][15] ([IGT#6] / [i915#4212]) +4 similar issues
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118395v1/bat-dg2-9/igt@kms_addfb_basic@framebuffer-vs-set-tiling.html
* igt@kms_chamelium_hpd@common-hpd-after-suspend:
- fi-glk-j4005: NOTRUN -> [SKIP][16] ([fdo#109271])
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118395v1/fi-glk-j4005/igt@kms_chamelium_hpd@common-hpd-after-suspend.html
* igt@kms_chamelium_hpd@vga-hpd-fast:
- bat-dg2-9: NOTRUN -> [SKIP][17] ([i915#7828]) +8 similar issues
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118395v1/bat-dg2-9/igt@kms_chamelium_hpd@vga-hpd-fast.html
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy:
- bat-dg2-9: NOTRUN -> [SKIP][18] ([IGT#6] / [i915#4103] / [i915#4213]) +1 similar issue
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118395v1/bat-dg2-9/igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy.html
* igt@kms_force_connector_basic@force-load-detect:
- bat-dg2-9: NOTRUN -> [SKIP][19] ([IGT#6] / [fdo#109285])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118395v1/bat-dg2-9/igt@kms_force_connector_basic@force-load-detect.html
* igt@kms_force_connector_basic@prune-stale-modes:
- bat-dg2-9: NOTRUN -> [SKIP][20] ([IGT#6] / [i915#5274])
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118395v1/bat-dg2-9/igt@kms_force_connector_basic@prune-stale-modes.html
* igt@kms_psr@sprite_plane_onoff:
- bat-dg2-9: NOTRUN -> [SKIP][21] ([IGT#6] / [i915#1072]) +3 similar issues
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118395v1/bat-dg2-9/igt@kms_psr@sprite_plane_onoff.html
* igt@kms_setmode@basic-clone-single-crtc:
- bat-dg2-9: NOTRUN -> [SKIP][22] ([IGT#6] / [i915#3555] / [i915#4579])
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118395v1/bat-dg2-9/igt@kms_setmode@basic-clone-single-crtc.html
* igt@prime_vgem@basic-fence-flip:
- bat-dg2-9: NOTRUN -> [SKIP][23] ([i915#3708])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118395v1/bat-dg2-9/igt@prime_vgem@basic-fence-flip.html
* igt@prime_vgem@basic-fence-mmap:
- bat-dg2-9: NOTRUN -> [SKIP][24] ([i915#3708] / [i915#4077]) +1 similar issue
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118395v1/bat-dg2-9/igt@prime_vgem@basic-fence-mmap.html
* igt@prime_vgem@basic-write:
- bat-dg2-9: NOTRUN -> [SKIP][25] ([i915#3291] / [i915#3708]) +2 similar issues
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118395v1/bat-dg2-9/igt@prime_vgem@basic-write.html
#### Possible fixes ####
* igt@i915_selftest@live@late_gt_pm:
- fi-glk-j4005: [ABORT][26] ([i915#6217]) -> [PASS][27]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13188/fi-glk-j4005/igt@i915_selftest@live@late_gt_pm.html
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118395v1/fi-glk-j4005/igt@i915_selftest@live@late_gt_pm.html
* igt@i915_selftest@live@reset:
- bat-rpls-2: [ABORT][28] ([i915#4983] / [i915#7461] / [i915#7913] / [i915#8347]) -> [PASS][29]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13188/bat-rpls-2/igt@i915_selftest@live@reset.html
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118395v1/bat-rpls-2/igt@i915_selftest@live@reset.html
* igt@i915_selftest@live@slpc:
- {bat-mtlp-8}: [DMESG-WARN][30] ([i915#6367]) -> [PASS][31]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13188/bat-mtlp-8/igt@i915_selftest@live@slpc.html
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118395v1/bat-mtlp-8/igt@i915_selftest@live@slpc.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[IGT#6]: https://gitlab.freedesktop.org/drm/igt-gpu-tools/issues/6
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072
[i915#3291]: https://gitlab.freedesktop.org/drm/intel/issues/3291
[i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555
[i915#3708]: https://gitlab.freedesktop.org/drm/intel/issues/3708
[i915#4077]: https://gitlab.freedesktop.org/drm/intel/issues/4077
[i915#4079]: https://gitlab.freedesktop.org/drm/intel/issues/4079
[i915#4083]: https://gitlab.freedesktop.org/drm/intel/issues/4083
[i915#4103]: https://gitlab.freedesktop.org/drm/intel/issues/4103
[i915#4212]: https://gitlab.freedesktop.org/drm/intel/issues/4212
[i915#4213]: https://gitlab.freedesktop.org/drm/intel/issues/4213
[i915#4215]: https://gitlab.freedesktop.org/drm/intel/issues/4215
[i915#4423]: https://gitlab.freedesktop.org/drm/intel/issues/4423
[i915#4579]: https://gitlab.freedesktop.org/drm/intel/issues/4579
[i915#4983]: https://gitlab.freedesktop.org/drm/intel/issues/4983
[i915#5190]: https://gitlab.freedesktop.org/drm/intel/issues/5190
[i915#5274]: https://gitlab.freedesktop.org/drm/intel/issues/5274
[i915#5354]: https://gitlab.freedesktop.org/drm/intel/issues/5354
[i915#6217]: https://gitlab.freedesktop.org/drm/intel/issues/6217
[i915#6367]: https://gitlab.freedesktop.org/drm/intel/issues/6367
[i915#6621]: https://gitlab.freedesktop.org/drm/intel/issues/6621
[i915#6687]: https://gitlab.freedesktop.org/drm/intel/issues/6687
[i915#7461]: https://gitlab.freedesktop.org/drm/intel/issues/7461
[i915#7561]: https://gitlab.freedesktop.org/drm/intel/issues/7561
[i915#7699]: https://gitlab.freedesktop.org/drm/intel/issues/7699
[i915#7828]: https://gitlab.freedesktop.org/drm/intel/issues/7828
[i915#7913]: https://gitlab.freedesktop.org/drm/intel/issues/7913
[i915#8189]: https://gitlab.freedesktop.org/drm/intel/issues/8189
[i915#8347]: https://gitlab.freedesktop.org/drm/intel/issues/8347
[i915#8386]: https://gitlab.freedesktop.org/drm/intel/issues/8386
[i915#8497]: https://gitlab.freedesktop.org/drm/intel/issues/8497
Build changes
-------------
* Linux: CI_DRM_13188 -> Patchwork_118395v1
CI-20190529: 20190529
CI_DRM_13188: c32513de80b47e8f2f1ef45cfb753c0ba2800f75 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7303: 8f09a9f1da506db907b549bb477f3233b5416733 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_118395v1: c32513de80b47e8f2f1ef45cfb753c0ba2800f75 @ git://anongit.freedesktop.org/gfx-ci/linux
### Linux commits
4ce901de6c09 drm/i915: use localized __diag_ignore_all() instead of per file
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118395v1/index.html
[-- Attachment #2: Type: text/html, Size: 12376 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915: use localized __diag_ignore_all() instead of per file
2023-05-25 21:06 [Intel-gfx] [PATCH] drm/i915: use localized __diag_ignore_all() instead of per file Jani Nikula
2023-05-25 21:54 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for " Patchwork
2023-05-25 22:02 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
@ 2023-05-25 23:50 ` Gustavo Sousa
2023-05-31 17:13 ` Jani Nikula
2023-05-26 11:19 ` [Intel-gfx] ✓ Fi.CI.IGT: success for " Patchwork
3 siblings, 1 reply; 6+ messages in thread
From: Gustavo Sousa @ 2023-05-25 23:50 UTC (permalink / raw)
To: Jani Nikula, intel-gfx; +Cc: jani.nikula
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 <jani.nikula@intel.com>
Reviewed-by: Gustavo Sousa <gustavo.sousa@intel.com>
>---
> 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
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Intel-gfx] ✓ Fi.CI.IGT: success for drm/i915: use localized __diag_ignore_all() instead of per file
2023-05-25 21:06 [Intel-gfx] [PATCH] drm/i915: use localized __diag_ignore_all() instead of per file Jani Nikula
` (2 preceding siblings ...)
2023-05-25 23:50 ` [Intel-gfx] [PATCH] " Gustavo Sousa
@ 2023-05-26 11:19 ` Patchwork
3 siblings, 0 replies; 6+ messages in thread
From: Patchwork @ 2023-05-26 11:19 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
[-- Attachment #1: Type: text/plain, Size: 12439 bytes --]
== Series Details ==
Series: drm/i915: use localized __diag_ignore_all() instead of per file
URL : https://patchwork.freedesktop.org/series/118395/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_13188_full -> Patchwork_118395v1_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Participating hosts (7 -> 8)
------------------------------
Additional (1): shard-rkl0
New tests
---------
New tests have been introduced between CI_DRM_13188_full and Patchwork_118395v1_full:
### New IGT tests (1) ###
* igt@kms_flip_scaled_crc:
- Statuses :
- Exec time: [None] s
Known issues
------------
Here are the changes found in Patchwork_118395v1_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_eio@suspend:
- shard-snb: [PASS][1] -> [INCOMPLETE][2] ([i915#7850])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13188/shard-snb1/igt@gem_eio@suspend.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118395v1/shard-snb1/igt@gem_eio@suspend.html
* igt@gem_exec_fair@basic-pace-share@rcs0:
- shard-apl: [PASS][3] -> [FAIL][4] ([i915#2842])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13188/shard-apl7/igt@gem_exec_fair@basic-pace-share@rcs0.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118395v1/shard-apl1/igt@gem_exec_fair@basic-pace-share@rcs0.html
* igt@kms_async_flips@alternate-sync-async-flip@pipe-a-hdmi-a-1:
- shard-glk: [PASS][5] -> [FAIL][6] ([i915#2521])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13188/shard-glk3/igt@kms_async_flips@alternate-sync-async-flip@pipe-a-hdmi-a-1.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118395v1/shard-glk2/igt@kms_async_flips@alternate-sync-async-flip@pipe-a-hdmi-a-1.html
* igt@kms_flip@2x-flip-vs-blocking-wf-vblank@ab-hdmi-a1-hdmi-a2:
- shard-glk: [PASS][7] -> [FAIL][8] ([i915#2122])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13188/shard-glk5/igt@kms_flip@2x-flip-vs-blocking-wf-vblank@ab-hdmi-a1-hdmi-a2.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118395v1/shard-glk7/igt@kms_flip@2x-flip-vs-blocking-wf-vblank@ab-hdmi-a1-hdmi-a2.html
* igt@kms_plane_scaling@plane-upscale-with-modifiers-factor-0-25@pipe-b-hdmi-a-1:
- shard-snb: NOTRUN -> [SKIP][9] ([fdo#109271] / [i915#4579]) +11 similar issues
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118395v1/shard-snb1/igt@kms_plane_scaling@plane-upscale-with-modifiers-factor-0-25@pipe-b-hdmi-a-1.html
* igt@kms_plane_scaling@planes-downscale-factor-0-25-unity-scaling@pipe-a-hdmi-a-1:
- shard-snb: NOTRUN -> [SKIP][10] ([fdo#109271]) +18 similar issues
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118395v1/shard-snb1/igt@kms_plane_scaling@planes-downscale-factor-0-25-unity-scaling@pipe-a-hdmi-a-1.html
#### Possible fixes ####
* igt@drm_fdinfo@idle@rcs0:
- {shard-rkl}: [FAIL][11] ([i915#7742]) -> [PASS][12] +1 similar issue
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13188/shard-rkl-1/igt@drm_fdinfo@idle@rcs0.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118395v1/shard-rkl-7/igt@drm_fdinfo@idle@rcs0.html
* igt@gem_barrier_race@remote-request@rcs0:
- {shard-rkl}: [ABORT][13] ([i915#7461] / [i915#8211]) -> [PASS][14]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13188/shard-rkl-1/igt@gem_barrier_race@remote-request@rcs0.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118395v1/shard-rkl-7/igt@gem_barrier_race@remote-request@rcs0.html
- {shard-dg1}: [ABORT][15] ([i915#7461] / [i915#8234]) -> [PASS][16]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13188/shard-dg1-18/igt@gem_barrier_race@remote-request@rcs0.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118395v1/shard-dg1-14/igt@gem_barrier_race@remote-request@rcs0.html
* igt@gem_ctx_exec@basic-nohangcheck:
- {shard-rkl}: [FAIL][17] ([i915#6268]) -> [PASS][18]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13188/shard-rkl-6/igt@gem_ctx_exec@basic-nohangcheck.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118395v1/shard-rkl-4/igt@gem_ctx_exec@basic-nohangcheck.html
* igt@gem_exec_fair@basic-flow@rcs0:
- {shard-tglu}: [FAIL][19] ([i915#2842]) -> [PASS][20]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13188/shard-tglu-7/igt@gem_exec_fair@basic-flow@rcs0.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118395v1/shard-tglu-6/igt@gem_exec_fair@basic-flow@rcs0.html
* igt@gem_exec_fair@basic-none-solo@rcs0:
- shard-apl: [FAIL][21] ([i915#2842]) -> [PASS][22]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13188/shard-apl6/igt@gem_exec_fair@basic-none-solo@rcs0.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118395v1/shard-apl6/igt@gem_exec_fair@basic-none-solo@rcs0.html
* igt@gem_exec_fair@basic-none@bcs0:
- {shard-rkl}: [FAIL][23] ([i915#2842]) -> [PASS][24] +1 similar issue
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13188/shard-rkl-6/igt@gem_exec_fair@basic-none@bcs0.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118395v1/shard-rkl-4/igt@gem_exec_fair@basic-none@bcs0.html
* igt@gem_exec_fair@basic-pace-solo@rcs0:
- shard-glk: [FAIL][25] ([i915#2842]) -> [PASS][26]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13188/shard-glk8/igt@gem_exec_fair@basic-pace-solo@rcs0.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118395v1/shard-glk6/igt@gem_exec_fair@basic-pace-solo@rcs0.html
* igt@i915_pm_rpm@dpms-lpsp:
- {shard-rkl}: [SKIP][27] ([i915#1397]) -> [PASS][28] +1 similar issue
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13188/shard-rkl-1/igt@i915_pm_rpm@dpms-lpsp.html
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118395v1/shard-rkl-7/igt@i915_pm_rpm@dpms-lpsp.html
* igt@i915_selftest@live@gt_heartbeat:
- shard-apl: [DMESG-FAIL][29] ([i915#5334]) -> [PASS][30]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13188/shard-apl6/igt@i915_selftest@live@gt_heartbeat.html
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118395v1/shard-apl6/igt@i915_selftest@live@gt_heartbeat.html
* igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size:
- shard-glk: [FAIL][31] ([IGT#6] / [i915#2346]) -> [PASS][32]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13188/shard-glk8/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118395v1/shard-glk3/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html
* igt@kms_cursor_legacy@forked-bo@pipe-b:
- {shard-rkl}: [INCOMPLETE][33] ([i915#8011]) -> [PASS][34]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13188/shard-rkl-7/igt@kms_cursor_legacy@forked-bo@pipe-b.html
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118395v1/shard-rkl-2/igt@kms_cursor_legacy@forked-bo@pipe-b.html
* igt@kms_flip@2x-flip-vs-expired-vblank-interruptible@ac-hdmi-a1-hdmi-a2:
- shard-glk: [FAIL][35] ([i915#2122]) -> [PASS][36]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13188/shard-glk6/igt@kms_flip@2x-flip-vs-expired-vblank-interruptible@ac-hdmi-a1-hdmi-a2.html
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118395v1/shard-glk1/igt@kms_flip@2x-flip-vs-expired-vblank-interruptible@ac-hdmi-a1-hdmi-a2.html
* igt@kms_flip@flip-vs-expired-vblank@c-hdmi-a1:
- shard-glk: [FAIL][37] ([i915#79]) -> [PASS][38]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13188/shard-glk8/igt@kms_flip@flip-vs-expired-vblank@c-hdmi-a1.html
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118395v1/shard-glk3/igt@kms_flip@flip-vs-expired-vblank@c-hdmi-a1.html
#### Warnings ####
* igt@kms_hdr@static-toggle:
- shard-snb: [SKIP][39] ([fdo#109271] / [i915#4579]) -> [SKIP][40] ([fdo#109271])
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13188/shard-snb4/igt@kms_hdr@static-toggle.html
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118395v1/shard-snb4/igt@kms_hdr@static-toggle.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[IGT#6]: https://gitlab.freedesktop.org/drm/igt-gpu-tools/issues/6
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109289]: https://bugs.freedesktop.org/show_bug.cgi?id=109289
[fdo#109313]: https://bugs.freedesktop.org/show_bug.cgi?id=109313
[fdo#110189]: https://bugs.freedesktop.org/show_bug.cgi?id=110189
[fdo#110723]: https://bugs.freedesktop.org/show_bug.cgi?id=110723
[fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
[fdo#111825]: https://bugs.freedesktop.org/show_bug.cgi?id=111825
[i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072
[i915#1397]: https://gitlab.freedesktop.org/drm/intel/issues/1397
[i915#1825]: https://gitlab.freedesktop.org/drm/intel/issues/1825
[i915#2122]: https://gitlab.freedesktop.org/drm/intel/issues/2122
[i915#2346]: https://gitlab.freedesktop.org/drm/intel/issues/2346
[i915#2521]: https://gitlab.freedesktop.org/drm/intel/issues/2521
[i915#2842]: https://gitlab.freedesktop.org/drm/intel/issues/2842
[i915#3023]: https://gitlab.freedesktop.org/drm/intel/issues/3023
[i915#315]: https://gitlab.freedesktop.org/drm/intel/issues/315
[i915#3539]: https://gitlab.freedesktop.org/drm/intel/issues/3539
[i915#3591]: https://gitlab.freedesktop.org/drm/intel/issues/3591
[i915#3804]: https://gitlab.freedesktop.org/drm/intel/issues/3804
[i915#3955]: https://gitlab.freedesktop.org/drm/intel/issues/3955
[i915#4070]: https://gitlab.freedesktop.org/drm/intel/issues/4070
[i915#4078]: https://gitlab.freedesktop.org/drm/intel/issues/4078
[i915#4281]: https://gitlab.freedesktop.org/drm/intel/issues/4281
[i915#4349]: https://gitlab.freedesktop.org/drm/intel/issues/4349
[i915#4391]: https://gitlab.freedesktop.org/drm/intel/issues/4391
[i915#4538]: https://gitlab.freedesktop.org/drm/intel/issues/4538
[i915#4579]: https://gitlab.freedesktop.org/drm/intel/issues/4579
[i915#4816]: https://gitlab.freedesktop.org/drm/intel/issues/4816
[i915#4833]: https://gitlab.freedesktop.org/drm/intel/issues/4833
[i915#4852]: https://gitlab.freedesktop.org/drm/intel/issues/4852
[i915#5176]: https://gitlab.freedesktop.org/drm/intel/issues/5176
[i915#5235]: https://gitlab.freedesktop.org/drm/intel/issues/5235
[i915#5334]: https://gitlab.freedesktop.org/drm/intel/issues/5334
[i915#5354]: https://gitlab.freedesktop.org/drm/intel/issues/5354
[i915#6268]: https://gitlab.freedesktop.org/drm/intel/issues/6268
[i915#658]: https://gitlab.freedesktop.org/drm/intel/issues/658
[i915#6786]: https://gitlab.freedesktop.org/drm/intel/issues/6786
[i915#7461]: https://gitlab.freedesktop.org/drm/intel/issues/7461
[i915#7742]: https://gitlab.freedesktop.org/drm/intel/issues/7742
[i915#7828]: https://gitlab.freedesktop.org/drm/intel/issues/7828
[i915#7850]: https://gitlab.freedesktop.org/drm/intel/issues/7850
[i915#79]: https://gitlab.freedesktop.org/drm/intel/issues/79
[i915#8011]: https://gitlab.freedesktop.org/drm/intel/issues/8011
[i915#8211]: https://gitlab.freedesktop.org/drm/intel/issues/8211
[i915#8234]: https://gitlab.freedesktop.org/drm/intel/issues/8234
[i915#8292]: https://gitlab.freedesktop.org/drm/intel/issues/8292
Build changes
-------------
* Linux: CI_DRM_13188 -> Patchwork_118395v1
CI-20190529: 20190529
CI_DRM_13188: c32513de80b47e8f2f1ef45cfb753c0ba2800f75 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7303: 8f09a9f1da506db907b549bb477f3233b5416733 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_118395v1: c32513de80b47e8f2f1ef45cfb753c0ba2800f75 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118395v1/index.html
[-- Attachment #2: Type: text/html, Size: 12213 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915: use localized __diag_ignore_all() instead of per file
2023-05-25 23:50 ` [Intel-gfx] [PATCH] " Gustavo Sousa
@ 2023-05-31 17:13 ` Jani Nikula
0 siblings, 0 replies; 6+ messages in thread
From: Jani Nikula @ 2023-05-31 17:13 UTC (permalink / raw)
To: Gustavo Sousa, intel-gfx
On Thu, 25 May 2023, Gustavo Sousa <gustavo.sousa@intel.com> 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 <jani.nikula@intel.com>
>
> Reviewed-by: Gustavo Sousa <gustavo.sousa@intel.com>
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
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-05-31 17:14 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-05-25 21:06 [Intel-gfx] [PATCH] drm/i915: use localized __diag_ignore_all() instead of per file Jani Nikula
2023-05-25 21:54 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for " Patchwork
2023-05-25 22:02 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2023-05-25 23:50 ` [Intel-gfx] [PATCH] " Gustavo Sousa
2023-05-31 17:13 ` Jani Nikula
2023-05-26 11:19 ` [Intel-gfx] ✓ Fi.CI.IGT: success for " Patchwork
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).