From: Greg Kroah-Hartman Date: Wed, 19 Jun 2024 14:18:05 +0000 (+0200) Subject: drop drm patch X-Git-Tag: v6.1.95~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b9d4823a1624053cf8df6317bc9a26ab2a41e092;p=thirdparty%2Fkernel%2Fstable-queue.git drop drm patch --- diff --git a/queue-6.9/drm-xe-use-ordered-wq-for-g2h-handler.patch b/queue-6.9/drm-xe-use-ordered-wq-for-g2h-handler.patch deleted file mode 100644 index ea8a9212353..00000000000 --- a/queue-6.9/drm-xe-use-ordered-wq-for-g2h-handler.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 8582e60cd1871a086a5a6574ffa90c31ed287bf8 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sun, 5 May 2024 20:47:58 -0700 -Subject: drm/xe: Use ordered WQ for G2H handler -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Matthew Brost - -[ Upstream commit 2d9c72f676e6f79a021b74c6c1c88235e7d5b722 ] - -System work queues are shared, use a dedicated work queue for G2H -processing to avoid G2H processing getting block behind system tasks. - -Fixes: dd08ebf6c352 ("drm/xe: Introduce a new DRM driver for Intel GPUs") -Cc: -Signed-off-by: Matthew Brost -Reviewed-by: Francois Dugast -Link: https://patchwork.freedesktop.org/patch/msgid/20240506034758.3697397-1-matthew.brost@intel.com -(cherry picked from commit 50aec9665e0babd62b9eee4e613d9a1ef8d2b7de) -Signed-off-by: Thomas Hellström -Signed-off-by: Sasha Levin ---- - drivers/gpu/drm/xe/xe_guc_ct.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/drivers/gpu/drm/xe/xe_guc_ct.c b/drivers/gpu/drm/xe/xe_guc_ct.c -index 8bbfa45798e2e..6ac86936faaf9 100644 ---- a/drivers/gpu/drm/xe/xe_guc_ct.c -+++ b/drivers/gpu/drm/xe/xe_guc_ct.c -@@ -146,6 +146,10 @@ int xe_guc_ct_init(struct xe_guc_ct *ct) - - xe_assert(xe, !(guc_ct_size() % PAGE_SIZE)); - -+ ct->g2h_wq = alloc_ordered_workqueue("xe-g2h-wq", 0); -+ if (!ct->g2h_wq) -+ return -ENOMEM; -+ - ct->g2h_wq = alloc_ordered_workqueue("xe-g2h-wq", 0); - if (!ct->g2h_wq) - return -ENOMEM; --- -2.43.0 - diff --git a/queue-6.9/series b/queue-6.9/series index 65ccdd55792..d36bb2a0d21 100644 --- a/queue-6.9/series +++ b/queue-6.9/series @@ -70,7 +70,6 @@ af_unix-use-skb_queue_len_lockless-in-sk_diag_show_r.patch af_unix-annotate-data-race-of-sk-sk_shutdown-in-sk_d.patch ipv6-fix-possible-race-in-__fib6_drop_pcpu_from.patch net-ethtool-fix-the-error-condition-in-ethtool_get_p.patch -drm-xe-use-ordered-wq-for-g2h-handler.patch x86-cpu-get-rid-of-an-unnecessary-local-variable-in-.patch x86-cpu-provide-default-cache-line-size-if-not-enume.patch selftests-mm-ksft_exit-functions-do-not-return.patch