Commit a4172af3 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-xe-next-2024-07-30' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-next 



drm-xe-next for 6.12

UAPI Changes:
- Rename xe perf layer as xe observation layer, but was
  also made available via fixes to previous verison (Ashutosh)
- Use write-back caching mode for system memory on DGFX,
  but was also mad available via fixes to previous version (Thomas)
- Expose SIMD16 EU mask in topology query for userspace to know
  the type of EU, as available in PVC, Lunar Lake and Battlemage
  (Lucas)
- Return ENOBUFS instead of ENOMEM in vm_bind if failure is tied
  to an array of binds (Matthew Brost)

Driver Changes:
- Log cleanup moving messages to debug priority (Michal Wajdeczko)
- Add timeout to fences to adhere to dma_buf rules (Matthew Brost)
- Rename old engine nomenclature to exec_queue (Matthew Brost)
- Convert multiple bind ops to 1 job (Matthew Brost)
- Add error injection for vm bind to help testing error path
  (Matthew Brost)
- Fix error handling in page table to propagate correctly
  to userspace (Matthew Brost)
- Re-organize and cleanup SR-IOV related registers (Michal Wajdeczko)
- Make the device write barrier compatible with VF (Michal Wajdeczko)
- New display workarounds for Battlemage (Matthew  Auld)
- New media workarounds for Lunar Lake and Battlemage (Ngai-Mint Kwan)
- New graphics workarounds for Lunar Lake (Bommu Krishnaiah)
- Tracepoint updates (Matthew Brost, Nirmoy Das)
- Cleanup the header generation for OOB workarounds (Lucas De Marchi)
- Fix leaking HDCP-related object (Nirmoy Das)
- Serialize L2 flushes to avoid races (Tejas Upadhyay)
- Log pid and comm on job timeout (José Roberto de Souza)
- Simplify boilerplate code for live kunit (Michal Wajdeczko)
- Improve kunit skips for live kunit (Michal Wajdeczko)
- Fix xe_sync cleanup when handling xe_exec ioctl (Ashutosh Dixit)
- Limit fair VF LMEM provisioning (Michal Wajdeczko)
- New workaround to fence mmio writes in Lunar Lake (Tejas Upadhyay)
- Warn on writes inaccessible register in VF (Michal Wajdeczko)
- Fix register lookup in VF (Michal Wajdeczko)
- Add GSC support for Battlemage (Alexander Usyskin)
- Fix wedging only the GT in which timeout occurred (Matthew Brost)
- Block device suspend when wedging (Matthew Brost)
- Handle compression and migration changes for Battlemage
  (Akshata Jahagirdar)
- Limit access of stolen memory for Lunar Lake (Uma Shankar)
- Fail invalid addresses during user fence creation (Matthew Brost)
- Refcount xe_file to safely and accurately store fdinfo stats
  (Umesh Nerlige Ramappa)
- Cleanup and fix PM reference for TLB invalidation code
  (Matthew Brost)
- Fix PM reference handling when communicating with GuC (Matthew Brost)
- Add new BO flag for 2 MiB alignement and use in VF (Michal Wajdeczko)
- Simplify MMIO setup for multi-tile platforms (Lucas De Marchi)
- Add check for uninitialized access to OOB workarounds
  (Lucas De Marchi)
- New GSC and HuC firmware blobs for Lunar Lake and Battlemage
  (Daniele Ceraolo Spurio)
- Unify mmio wait logic (Gustavo Sousa)
- Fix off-by-one when processing RTP rules (Lucas De Marchi)
- Future-proof migrate logic with compressed PAT flag (Matt Roper)
- Add WA kunit tests for Battlemage (Lucas De Marchi)
- Test active tracking for workaorunds with kunit (Lucas De Marchi)
- Add kunit tests for RTP with no actions (Lucas De Marchi)
- Unify parse of OR rules in RTP (Lucas De Marchi)
- Add performance tuning for Battlemage (Sai Teja Pottumuttu)
- Make bit masks unsigned (Geert Uytterhoeven)

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Lucas De Marchi <lucas.demarchi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/k7xuktfav4zmtxxjr77glu2hszypvzgmzghoumh757nqfnk7kn@ccfi4ts3ytbk
parents de9c2c66 f2881dfd

drivers/gpu/drm/i915/display/intel_display_wa.h

+8 −0
Original line number Diff line number Diff line
@@ -6,8 +6,16 @@ 
#ifndef __INTEL_DISPLAY_WA_H__

#define __INTEL_DISPLAY_WA_H__



#include <linux/types.h>



struct drm_i915_private;



void intel_display_wa_apply(struct drm_i915_private *i915);



#ifdef I915

static inline bool intel_display_needs_wa_16023588340(struct drm_i915_private *i915) { return false; }

#else

bool intel_display_needs_wa_16023588340(struct drm_i915_private *i915);

#endif



#endif

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

+6 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ 
#include "intel_display_device.h"

#include "intel_display_trace.h"

#include "intel_display_types.h"

#include "intel_display_wa.h"

#include "intel_fbc.h"

#include "intel_fbc_regs.h"

#include "intel_frontbuffer.h"
@@ -1237,6 +1238,11 @@ static int intel_fbc_check_plane(struct intel_atomic_state *state, 
		return 0;

	}



	if (intel_display_needs_wa_16023588340(i915)) {

		plane_state->no_fbc_reason = "Wa_16023588340";

		return 0;

	}



	/* WaFbcTurnOffFbcWhenHyperVisorIsUsed:skl,bxt */

	if (i915_vtd_active(i915) && (IS_SKYLAKE(i915) || IS_BROXTON(i915))) {

		plane_state->no_fbc_reason = "VT-d enabled";

drivers/gpu/drm/xe/Makefile

+5 −18
Original line number Diff line number Diff line
@@ -12,32 +12,15 @@ subdir-ccflags-$(CONFIG_DRM_XE_WERROR) += -Werror 
subdir-ccflags-y += -I$(obj) -I$(src)



# generated sources

hostprogs := xe_gen_wa_oob



hostprogs := xe_gen_wa_oob

generated_oob := $(obj)/generated/xe_wa_oob.c $(obj)/generated/xe_wa_oob.h



quiet_cmd_wa_oob = GEN     $(notdir $(generated_oob))

      cmd_wa_oob = mkdir -p $(@D); $^ $(generated_oob)



$(obj)/generated/%_wa_oob.c $(obj)/generated/%_wa_oob.h: $(obj)/xe_gen_wa_oob \

		 $(src)/xe_wa_oob.rules

	$(call cmd,wa_oob)



uses_generated_oob := \

	$(obj)/xe_ggtt.o \

	$(obj)/xe_gsc.o \

	$(obj)/xe_gt.o \

	$(obj)/xe_guc.o \

	$(obj)/xe_guc_ads.o \

	$(obj)/xe_guc_pc.o \

	$(obj)/xe_migrate.o \

	$(obj)/xe_ring_ops.o \

	$(obj)/xe_vm.o \

	$(obj)/xe_wa.o \

	$(obj)/xe_ttm_stolen_mgr.o



$(uses_generated_oob): $(generated_oob)



# Please keep these build lists sorted!



# core driver code
@@ -192,6 +175,7 @@ xe-$(CONFIG_DRM_XE_DISPLAY) += \ 
	display/xe_display.o \

	display/xe_display_misc.o \

	display/xe_display_rps.o \

	display/xe_display_wa.o \

	display/xe_dsb_buffer.o \

	display/xe_fb_pin.o \

	display/xe_hdcp_gsc.o \
@@ -320,3 +304,6 @@ quiet_cmd_hdrtest = HDRTEST $(patsubst %.hdrtest,%.h,$@) 


$(obj)/%.hdrtest: $(src)/%.h FORCE

	$(call if_changed_dep,hdrtest)



uses_generated_oob := $(addprefix $(obj)/, $(xe-y))

$(uses_generated_oob): $(obj)/generated/xe_wa_oob.h

drivers/gpu/drm/xe/display/intel_fbdev_fb.c

+5 −1
Original line number Diff line number Diff line
@@ -10,6 +10,9 @@ 
#include "xe_bo.h"

#include "xe_gt.h"

#include "xe_ttm_stolen_mgr.h"

#include "xe_wa.h"



#include <generated/xe_wa_oob.h>



struct intel_framebuffer *intel_fbdev_fb_alloc(struct drm_fb_helper *helper,

					       struct drm_fb_helper_surface_size *sizes)
@@ -37,7 +40,7 @@ struct intel_framebuffer *intel_fbdev_fb_alloc(struct drm_fb_helper *helper, 
	size = PAGE_ALIGN(size);

	obj = ERR_PTR(-ENODEV);



	if (!IS_DGFX(xe)) {

	if (!IS_DGFX(xe) && !XE_WA(xe_root_mmio_gt(xe), 22019338487_display)) {

		obj = xe_bo_create_pin_map(xe, xe_device_get_root_tile(xe),

					   NULL, size,

					   ttm_bo_type_kernel, XE_BO_FLAG_SCANOUT |
@@ -48,6 +51,7 @@ struct intel_framebuffer *intel_fbdev_fb_alloc(struct drm_fb_helper *helper, 
		else

			drm_info(&xe->drm, "Allocated fbdev into stolen failed: %li\n", PTR_ERR(obj));

	}



	if (IS_ERR(obj)) {

		obj = xe_bo_create_pin_map(xe, xe_device_get_root_tile(xe), NULL, size,

					   ttm_bo_type_kernel, XE_BO_FLAG_SCANOUT |

drivers/gpu/drm/xe/display/xe_display_wa.c

0 → 100644
+16 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: MIT

/*

 * Copyright © 2024 Intel Corporation

 */



#include "intel_display_wa.h"



#include "xe_device.h"

#include "xe_wa.h"



#include <generated/xe_wa_oob.h>



bool intel_display_needs_wa_16023588340(struct drm_i915_private *i915)

{

	return XE_WA(xe_root_mmio_gt(i915), 16023588340);

}