[Intel-xe] [PATCH 06/10] fixup! drm/xe/display: Implement display support

[Lucas De Marchi]

On Tue, Oct 03, 2023 at 05:34:53PM +0300, Jani Nikula wrote:
>The diag push/pop stuff is unnecessary leftovers.
>
>Signed-off-by: Jani Nikula <jani.nikula at intel.com>
>---
> drivers/gpu/drm/xe/xe_display.c | 5 -----
> 1 file changed, 5 deletions(-)
>
>diff --git a/drivers/gpu/drm/xe/xe_display.c b/drivers/gpu/drm/xe/xe_display.c
>index 82d2c42629ce..391f08c1caca 100644
>--- a/drivers/gpu/drm/xe/xe_display.c
>+++ b/drivers/gpu/drm/xe/xe_display.c
>@@ -417,10 +417,6 @@ void xe_display_pm_resume(struct xe_device *xe)
> 	intel_power_domains_enable(xe);
> }
>
>-/* Display info initialization */
>-__diag_push();
>-__diag_ignore_all("-Woverride-init", "Allow field overrides in table");
>-

is it?

drivers/gpu/drm/xe/Makefile:CFLAGS_i915-display/intel_fbdev.o = $(call cc-disable-warning, override-init)
drivers/gpu/drm/xe/Makefile:CFLAGS_i915-display/intel_display_device.o = $(call cc-disable-warning, override-init)
drivers/gpu/drm/xe/xe_display.c:__diag_ignore_all("-Woverride-init", "Allow field overrides in table");

there's no disable-warning for xe_display.c

Btw, doing it by file is much worse as it ignores the warnings in places
we shouldn't. Old compilers that don't support it also don't warn about
override-init, so we could have a better helper for that.

Lucas De Marchi

> void xe_display_probe(struct xe_device *xe)
> {
> 	if (!xe->info.enable_display)
>@@ -435,4 +431,3 @@ void xe_display_probe(struct xe_device *xe)
> 	xe->info.enable_display = false;
> 	unset_display_features(xe);
> }
>-__diag_pop();
>-- 
>2.39.2
>