Commit 534a7915 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-fixes-2023-07-20' of... 

Merge tag 'drm-intel-fixes-2023-07-20' of git://anongit.freedesktop.org/drm/drm-intel

 into drm-fixes

- Add sentinel to xehp_oa_b_counters [perf] (Andrzej Hajda)
- Revert "drm/i915: use localized __diag_ignore_all() instead of per file" (Jani Nikula)

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/ZLjuwhLhwab5B7RY@tursulin-desk
parents f4f19c03 2c27770a

drivers/gpu/drm/i915/Makefile

+5 −0
Original line number Diff line number Diff line
@@ -23,6 +23,11 @@ subdir-ccflags-y += $(call cc-option, -Wunused-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!

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

+0 −5
Original line number Diff line number Diff line
@@ -16,9 +16,6 @@ 
#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
@@ -665,8 +662,6 @@ 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 }

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

+0 −5
Original line number Diff line number Diff line
@@ -135,9 +135,6 @@ 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,

	__FB_DEFAULT_DEFERRED_OPS_RDWR(intel_fbdev),
@@ -149,8 +146,6 @@ 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)

{

drivers/gpu/drm/i915/i915_pci.c

+0 −5
Original line number Diff line number Diff line
@@ -38,9 +38,6 @@ 
#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), \
@@ -846,8 +843,6 @@ 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

drivers/gpu/drm/i915/i915_perf.c

+1 −0
Original line number Diff line number Diff line
@@ -4431,6 +4431,7 @@ static const struct i915_range mtl_oam_b_counters[] = { 
static const struct i915_range xehp_oa_b_counters[] = {

	{ .start = 0xdc48, .end = 0xdc48 },	/* OAA_ENABLE_REG */

	{ .start = 0xdd00, .end = 0xdd48 },	/* OAG_LCE0_0 - OAA_LENABLE_REG */

	{}

};



static const struct i915_range gen7_oa_mux_regs[] = {