From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 7 Oct 2024 14:56:56 +0000 (+0200)
Subject: 6.11-stable patches
X-Git-Tag: v6.6.55~92
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e9021cdfc58db56ddc1db093ebce5bfbffadbec1;p=thirdparty%2Fkernel%2Fstable-queue.git

6.11-stable patches

added patches:
	drm-xe-generate-oob-before-compiling-anything.patch
---

diff --git a/queue-6.11/drm-xe-generate-oob-before-compiling-anything.patch b/queue-6.11/drm-xe-generate-oob-before-compiling-anything.patch
new file mode 100644
index 00000000000..0ba6ee28fc1
--- /dev/null
+++ b/queue-6.11/drm-xe-generate-oob-before-compiling-anything.patch
@@ -0,0 +1,70 @@
+From ea74bf9ccba9ae80fc0766c07c4abaef927e9e63 Mon Sep 17 00:00:00 2001
+From: Lucas De Marchi <lucas.demarchi@intel.com>
+Date: Mon, 8 Jul 2024 14:29:06 -0700
+Subject: drm/xe: Generate oob before compiling anything
+
+From: Lucas De Marchi <lucas.demarchi@intel.com>
+
+commit ea74bf9ccba9ae80fc0766c07c4abaef927e9e63 upstream.
+
+Instead of keep adding more dependencies as WAs are needed in different
+places of the driver, just add a rule with all the objects so the code
+generation happens before anything else.
+
+While at it, group lines related to wa_oob in the Makefile.
+
+v2: Prefix $(obj) when declaring dependency
+
+Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
+Link: https://patchwork.freedesktop.org/patch/msgid/20240708213041.1734028-1-lucas.demarchi@intel.com
+Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/gpu/drm/xe/Makefile |   24 ++++--------------------
+ 1 file changed, 4 insertions(+), 20 deletions(-)
+
+--- a/drivers/gpu/drm/xe/Makefile
++++ b/drivers/gpu/drm/xe/Makefile
+@@ -12,34 +12,15 @@ subdir-ccflags-$(CONFIG_DRM_XE_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_device.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_pat.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
+@@ -322,3 +303,6 @@ quiet_cmd_hdrtest = HDRTEST $(patsubst %
+ 
+ $(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
diff --git a/queue-6.11/series b/queue-6.11/series
index 0afe66da491..9e56292d27d 100644
--- a/queue-6.11/series
+++ b/queue-6.11/series
@@ -397,3 +397,4 @@ ext4-fix-fast-commit-inode-enqueueing-during-a-full-journal-commit.patch
 ext4-use-handle-to-mark-fc-as-ineligible-in-__track_dentry_update.patch
 ext4-mark-fc-as-ineligible-using-an-handle-in-ext4_xattr_set.patch
 ext4-fix-off-by-one-issue-in-alloc_flex_gd.patch
+drm-xe-generate-oob-before-compiling-anything.patch