Commit 8bdb468d authored Aug 30, 2024 by Dave Airlie

kernel into drm-next



UAPI Changes:
- Fix OA format masks which were breaking build with gcc-5

Cross-subsystem Changes:

Driver Changes:
- Use dma_fence_chain_free in chain fence unused as a sync (Matthew Brost)
- Refactor hw engine lookup and mmio access to be used in more places
  (Dominik, Matt Auld, Mika Kuoppala)
- Enable priority mem read for Xe2 and later (Pallavi Mishra)
- Fix PL1 disable flow in xe_hwmon_power_max_write (Karthik)
- Fix refcount and speedup devcoredump (Matthew Brost)
- Add performance tuning changes to Xe2 (Akshata, Shekhar)
- Fix OA sysfs entry (Ashutosh)
- Add first GuC firmware support for BMG (Julia)
- Bump minimum GuC firmware for platforms under force_probe to match LNL
  and BMG (Julia)
- Fix access check on user fence creation (Nirmoy)
- Add/document workarounds for Xe2 (Julia, Daniele, John, Tejas)
- Document workaround and use proper WA infra (Matt Roper)
- Fix VF configuration on media GT (Michal Wajdeczko)
- Fix VM dma-resv lock (Matthew Brost)
- Allow suspend/resume exec queue backend op to be called multiple times
  (Matthew Brost)
- Add GT stats to debugfs (Nirmoy)
- Add hwconfig to debugfs (Matt Roper)
- Compile out all debugfs code with ONFIG_DEUBG_FS=n (Lucas)
- Remove dead kunit code (Jani Nikula)
- Refactor drvdata storing to help display (Jani Nikula)
- Cleanup unsused xe parameter in pte handling (Himal)
- Rename s/enable_display/probe_display/ for clarity (Lucas)
- Fix missing MCR annotation in couple of registers (Tejas)
- Fix DGFX display suspend/resume (Maarten)
- Prepare exec_queue_kill for PXP handling (Daniele)
- Fix devm/drmm issues (Daniele, Matthew Brost)
- Fix tile and ggtt fini sequences (Matthew Brost)
- Fix crashes when probing without firmware in place (Daniele, Matthew Brost)
- Use xe_managed for kernel BOs (Daniele, Matthew Brost)
- Future-proof dss_per_group calculation by using hwconfig (Matt Roper)
- Use reserved copy engine for user binds on faulting devices
  (Matthew Brost)
- Allow mixing dma-fence jobs and long-running faulting jobs (Francois)
- Cleanup redundant arg when creating use BO (Nirmoy)
- Prevent UAF around preempt fence (Auld)
- Fix display suspend/resume (Maarten)
- Use vma_pages() helper (Thorsten)
- Calculate pagefault queue size (Stuart, Matthew Auld)
- Fix missing pagefault wq destroy (Stuart)
- Fix lifetime handling of HW fence ctx (Matthew Brost)
- Fix order destroy order for jobs (Matthew Brost)
- Fix TLB invalidation for media GT (Matthew Brost)
- Document GGTT (Rodrigo Vivi)
- Refactor GGTT layering and fix runtime outer protection (Rodrigo Vivi)
- Handle HPD polling on display pm runtime suspend/resume (Imre, Vinod)
- Drop unrequired NULL checks (Apoorva, Himal)
- Use separate rpm lockdep map for non-d3cold-capable devices (Thomas Hellström)
- Support "nomodeset" kernel command-line option (Thomas Zimmermann)
- Drop force_probe requirement for LNL and BMG (Lucas, Balasubramani)

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

From: Lucas De Marchi <lucas.demarchi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/wd42jsh4i3q5zlrmi2cljejohdsrqc6hvtxf76lbxsp3ibrgmz@y54fa7wwxgsd

parents 4f7d8da5 3adcf970

Documentation/gpu/xe/xe_mm.rst

+15 −0

Original line number	Diff line number	Diff line
		@@ -7,6 +7,21 @@ Memory Management
		.. kernel-doc:: drivers/gpu/drm/xe/xe_bo_doc.h
		:doc: Buffer Objects (BO)

		GGTT
		====

		.. kernel-doc:: drivers/gpu/drm/xe/xe_ggtt.c
		:doc: Global Graphics Translation Table (GGTT)

		GGTT Internal API
		-----------------

		.. kernel-doc:: drivers/gpu/drm/xe/xe_ggtt_types.h
		:internal:

		.. kernel-doc:: drivers/gpu/drm/xe/xe_ggtt.c
		:internal:

		Pagetable building
		==================

drivers/gpu/drm/drm_print.c

+8 −5

Original line number	Diff line number	Diff line
		@@ -100,6 +100,7 @@ void __drm_puts_coredump(struct drm_printer p, const char str)
		copy = iterator->remain;

		/* Copy out the bit of the string that we need */
		if (iterator->data)
		memcpy(iterator->data,
		str + (iterator->start - iterator->offset), copy);

		@@ -110,6 +111,7 @@ void __drm_puts_coredump(struct drm_printer p, const char str)

		len = min_t(ssize_t, strlen(str), iterator->remain);

		if (iterator->data)
		memcpy(iterator->data + pos, str, len);

		iterator->offset += len;
		@@ -140,6 +142,7 @@ void __drm_printfn_coredump(struct drm_printer p, struct va_format vaf)
		if ((iterator->offset >= iterator->start) && (len < iterator->remain)) {
		ssize_t pos = iterator->offset - iterator->start;

		if (iterator->data)
		snprintf(((char *) iterator->data) + pos,
		iterator->remain, "%pV", vaf);

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

+4 −0

Original line number	Diff line number	Diff line
		@@ -317,3 +317,7 @@ void intel_dpt_destroy(struct i915_address_space *vm)
		i915_vm_put(&dpt->vm);
		}

		u64 intel_dpt_offset(struct i915_vma *dpt_vma)
		{
		return dpt_vma->node.start;
		}

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -6,6 +6,8 @@
		#ifndef __INTEL_DPT_H__
		#define __INTEL_DPT_H__

		#include <linux/types.h>

		struct drm_i915_private;

		struct i915_address_space;
		@@ -20,5 +22,6 @@ void intel_dpt_suspend(struct drm_i915_private *i915);
		void intel_dpt_resume(struct drm_i915_private *i915);
		struct i915_address_space *
		intel_dpt_create(struct intel_framebuffer *fb);
		u64 intel_dpt_offset(struct i915_vma *dpt_vma);

		#endif /* __INTEL_DPT_H__ */

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -14,6 +14,7 @@
		#include "intel_de.h"
		#include "intel_display_irq.h"
		#include "intel_display_types.h"
		#include "intel_dpt.h"
		#include "intel_fb.h"
		#include "intel_fbc.h"
		#include "intel_frontbuffer.h"
		@@ -1162,7 +1163,7 @@ static u32 skl_surf_address(const struct intel_plane_state *plane_state,
		* within the DPT is always 0.
		*/
		drm_WARN_ON(&i915->drm, plane_state->dpt_vma &&
		plane_state->dpt_vma->node.start);
		intel_dpt_offset(plane_state->dpt_vma));
		drm_WARN_ON(&i915->drm, offset & 0x1fffff);
		return offset >> 9;
		} else {