diff options
| -rw-r--r-- | queue-6.1/drm-i915-gem-allow-exec_capture-on-recoverable-contexts-on-dg1.patch | 46 | ||||
| -rw-r--r-- | queue-6.1/series | 1 | ||||
| -rw-r--r-- | queue-6.12/drm-i915-gem-allow-exec_capture-on-recoverable-contexts-on-dg1.patch | 46 | ||||
| -rw-r--r-- | queue-6.12/series | 1 | ||||
| -rw-r--r-- | queue-6.15/drm-i915-gem-allow-exec_capture-on-recoverable-contexts-on-dg1.patch | 46 | ||||
| -rw-r--r-- | queue-6.15/series | 1 |
6 files changed, 0 insertions, 141 deletions
diff --git a/queue-6.1/drm-i915-gem-allow-exec_capture-on-recoverable-contexts-on-dg1.patch b/queue-6.1/drm-i915-gem-allow-exec_capture-on-recoverable-contexts-on-dg1.patch deleted file mode 100644 index 5ecd8eab6d..0000000000 --- a/queue-6.1/drm-i915-gem-allow-exec_capture-on-recoverable-contexts-on-dg1.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 25eeba495b2fc16037647c1a51bcdf6fc157af5c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@linux.intel.com> -Date: Mon, 12 May 2025 21:22:15 +0200 -Subject: drm/i915/gem: Allow EXEC_CAPTURE on recoverable contexts on DG1 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Ville Syrjälä <ville.syrjala@linux.intel.com> - -commit 25eeba495b2fc16037647c1a51bcdf6fc157af5c upstream. - -The intel-media-driver is currently broken on DG1 because -it uses EXEC_CAPTURE with recovarable contexts. Relax the -check to allow that. - -I've also submitted a fix for the intel-media-driver: -https://github.com/intel/media-driver/pull/1920 - -Cc: stable@vger.kernel.org # v6.0+ -Cc: Matthew Auld <matthew.auld@intel.com> -Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com> -Testcase: igt/gem_exec_capture/capture-invisible -Fixes: 71b1669ea9bd ("drm/i915/uapi: tweak error capture on recoverable contexts") -Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com> -Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> -Signed-off-by: Andi Shyti <andi.shyti@kernel.org> -Link: https://lore.kernel.org/r/20250411144313.11660-2-ville.syrjala@linux.intel.com -(cherry picked from commit d6e020819612a4a06207af858e0978be4d3e3140) -Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> ---- - drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c -+++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c -@@ -2001,7 +2001,7 @@ static int eb_capture_stage(struct i915_ - continue; - - if (i915_gem_context_is_recoverable(eb->gem_context) && -- (IS_DGFX(eb->i915) || GRAPHICS_VER_FULL(eb->i915) > IP_VER(12, 0))) -+ GRAPHICS_VER_FULL(eb->i915) > IP_VER(12, 10)) - return -EINVAL; - - for_each_batch_create_order(eb, j) { diff --git a/queue-6.1/series b/queue-6.1/series index 36aba393a5..d6b19f7dc0 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -112,7 +112,6 @@ drm-bridge-cdns-dsi-check-return-value-when-getting-default-phy-config.patch drm-bridge-cdns-dsi-wait-for-clk-and-data-lanes-to-be-ready.patch drm-amd-display-add-null-pointer-check-for-get_first_active_display.patch drm-amdgpu-amdgpu_vram_mgr_new-clamp-lpfn-to-total-vram.patch -drm-i915-gem-allow-exec_capture-on-recoverable-contexts-on-dg1.patch drm-amdgpu-add-kicker-device-detection.patch ksmbd-use-unsafe_memcpy-for-ntlm_negotiate.patch ksmbd-remove-unsafe_memcpy-use-in-session-setup.patch diff --git a/queue-6.12/drm-i915-gem-allow-exec_capture-on-recoverable-contexts-on-dg1.patch b/queue-6.12/drm-i915-gem-allow-exec_capture-on-recoverable-contexts-on-dg1.patch deleted file mode 100644 index b4da89de59..0000000000 --- a/queue-6.12/drm-i915-gem-allow-exec_capture-on-recoverable-contexts-on-dg1.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 25eeba495b2fc16037647c1a51bcdf6fc157af5c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@linux.intel.com> -Date: Mon, 12 May 2025 21:22:15 +0200 -Subject: drm/i915/gem: Allow EXEC_CAPTURE on recoverable contexts on DG1 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Ville Syrjälä <ville.syrjala@linux.intel.com> - -commit 25eeba495b2fc16037647c1a51bcdf6fc157af5c upstream. - -The intel-media-driver is currently broken on DG1 because -it uses EXEC_CAPTURE with recovarable contexts. Relax the -check to allow that. - -I've also submitted a fix for the intel-media-driver: -https://github.com/intel/media-driver/pull/1920 - -Cc: stable@vger.kernel.org # v6.0+ -Cc: Matthew Auld <matthew.auld@intel.com> -Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com> -Testcase: igt/gem_exec_capture/capture-invisible -Fixes: 71b1669ea9bd ("drm/i915/uapi: tweak error capture on recoverable contexts") -Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com> -Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> -Signed-off-by: Andi Shyti <andi.shyti@kernel.org> -Link: https://lore.kernel.org/r/20250411144313.11660-2-ville.syrjala@linux.intel.com -(cherry picked from commit d6e020819612a4a06207af858e0978be4d3e3140) -Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> ---- - drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c -+++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c -@@ -2014,7 +2014,7 @@ static int eb_capture_stage(struct i915_ - continue; - - if (i915_gem_context_is_recoverable(eb->gem_context) && -- (IS_DGFX(eb->i915) || GRAPHICS_VER_FULL(eb->i915) > IP_VER(12, 0))) -+ GRAPHICS_VER_FULL(eb->i915) > IP_VER(12, 10)) - return -EINVAL; - - for_each_batch_create_order(eb, j) { diff --git a/queue-6.12/series b/queue-6.12/series index 0cbce2df08..ee1aa186e5 100644 --- a/queue-6.12/series +++ b/queue-6.12/series @@ -173,7 +173,6 @@ drm-amd-display-correct-non-oled-pre_t11_delay.patch drm-xe-vm-move-rebind_work-init-earlier.patch drm-xe-sched-stop-re-submitting-signalled-jobs.patch drm-xe-guc_submit-add-back-fix.patch -drm-i915-gem-allow-exec_capture-on-recoverable-contexts-on-dg1.patch drm-amd-display-fix-rmcm-programming-seq-errors.patch drm-amdgpu-add-kicker-device-detection.patch drm-amd-display-check-dce_hwseq-before-dereferencing-it.patch diff --git a/queue-6.15/drm-i915-gem-allow-exec_capture-on-recoverable-contexts-on-dg1.patch b/queue-6.15/drm-i915-gem-allow-exec_capture-on-recoverable-contexts-on-dg1.patch deleted file mode 100644 index b4da89de59..0000000000 --- a/queue-6.15/drm-i915-gem-allow-exec_capture-on-recoverable-contexts-on-dg1.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 25eeba495b2fc16037647c1a51bcdf6fc157af5c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@linux.intel.com> -Date: Mon, 12 May 2025 21:22:15 +0200 -Subject: drm/i915/gem: Allow EXEC_CAPTURE on recoverable contexts on DG1 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Ville Syrjälä <ville.syrjala@linux.intel.com> - -commit 25eeba495b2fc16037647c1a51bcdf6fc157af5c upstream. - -The intel-media-driver is currently broken on DG1 because -it uses EXEC_CAPTURE with recovarable contexts. Relax the -check to allow that. - -I've also submitted a fix for the intel-media-driver: -https://github.com/intel/media-driver/pull/1920 - -Cc: stable@vger.kernel.org # v6.0+ -Cc: Matthew Auld <matthew.auld@intel.com> -Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com> -Testcase: igt/gem_exec_capture/capture-invisible -Fixes: 71b1669ea9bd ("drm/i915/uapi: tweak error capture on recoverable contexts") -Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com> -Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> -Signed-off-by: Andi Shyti <andi.shyti@kernel.org> -Link: https://lore.kernel.org/r/20250411144313.11660-2-ville.syrjala@linux.intel.com -(cherry picked from commit d6e020819612a4a06207af858e0978be4d3e3140) -Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> ---- - drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c -+++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c -@@ -2014,7 +2014,7 @@ static int eb_capture_stage(struct i915_ - continue; - - if (i915_gem_context_is_recoverable(eb->gem_context) && -- (IS_DGFX(eb->i915) || GRAPHICS_VER_FULL(eb->i915) > IP_VER(12, 0))) -+ GRAPHICS_VER_FULL(eb->i915) > IP_VER(12, 10)) - return -EINVAL; - - for_each_batch_create_order(eb, j) { diff --git a/queue-6.15/series b/queue-6.15/series index c015354971..935a7402a6 100644 --- a/queue-6.15/series +++ b/queue-6.15/series @@ -223,7 +223,6 @@ drm-amd-display-correct-non-oled-pre_t11_delay.patch drm-xe-vm-move-rebind_work-init-earlier.patch drm-xe-sched-stop-re-submitting-signalled-jobs.patch drm-xe-guc_submit-add-back-fix.patch -drm-i915-gem-allow-exec_capture-on-recoverable-contexts-on-dg1.patch drm-amd-display-fix-rmcm-programming-seq-errors.patch drm-amdgpu-vcn-v5_0_1-to-prevent-fw-checking-rb-during-dpg-pause.patch drm-amdgpu-add-kicker-device-detection.patch |