From: Greg Kroah-Hartman Date: Tue, 25 Jun 2024 12:44:28 +0000 (+0200) Subject: drop drm patch X-Git-Tag: v6.1.96~16 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f17e85f9154bf588ff81adc9e266456e3281b26f;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 aaabd72640f..00000000000 --- a/queue-6.9/drm-xe-use-ordered-wq-for-g2h-handler.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 5a8a2b9e943b5275701a6e9643c6b3e4bbbff0a6 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 d78c9701a12..901efefb4da 100644 --- a/queue-6.9/series +++ b/queue-6.9/series @@ -235,7 +235,6 @@ spi-stm32-qspi-fix-dual-flash-mode-sanity-test-in-stm32_qspi_setup.patch arm64-dts-imx8qm-mek-fix-gpio-number-for-reg_usdhc2_vmmc.patch thermal-core-change-pm-notifier-priority-to-the-minimum.patch spi-stm32-qspi-clamp-stm32_qspi_get_mode-output-to-ccr_buswidth_4.patch -drm-xe-use-ordered-wq-for-g2h-handler.patch nbd-improve-the-documentation-of-the-locking-assumpt.patch nbd-fix-signal-handling.patch tracing-add-module_description-to-preemptirq_delay_t.patch