From: Greg Kroah-Hartman Date: Wed, 19 Feb 2025 13:39:11 +0000 (+0100) Subject: drop drm amdgpu patch X-Git-Tag: v6.1.129~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=17eff12d57bdcdce086d482be306f38db265de56;p=thirdparty%2Fkernel%2Fstable-queue.git drop drm amdgpu patch --- diff --git a/queue-6.12/drm-amdgpu-bump-version-for-rv-pco-compute-fix.patch b/queue-6.12/drm-amdgpu-bump-version-for-rv-pco-compute-fix.patch deleted file mode 100644 index 1d2a859db9..0000000000 --- a/queue-6.12/drm-amdgpu-bump-version-for-rv-pco-compute-fix.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 55ed2b1b50d029dd7e49a35f6628ca64db6d75d8 Mon Sep 17 00:00:00 2001 -From: Alex Deucher -Date: Fri, 31 Jan 2025 13:53:40 -0500 -Subject: drm/amdgpu: bump version for RV/PCO compute fix - -From: Alex Deucher - -commit 55ed2b1b50d029dd7e49a35f6628ca64db6d75d8 upstream. - -Bump the driver version for RV/PCO compute stability fix -so mesa can use this check to enable compute queues on -RV/PCO. - -Reviewed-by: Lijo Lazar -Signed-off-by: Alex Deucher -Cc: stable@vger.kernel.org # 6.12.x -Signed-off-by: Greg Kroah-Hartman ---- - drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c -@@ -119,9 +119,10 @@ - * - 3.58.0 - Add GFX12 DCC support - * - 3.59.0 - Cleared VRAM - * - 3.60.0 - Add AMDGPU_TILING_GFX12_DCC_WRITE_COMPRESS_DISABLE (Vulkan requirement) -+ * - 3.61.0 - Contains fix for RV/PCO compute queues - */ - #define KMS_DRIVER_MAJOR 3 --#define KMS_DRIVER_MINOR 60 -+#define KMS_DRIVER_MINOR 61 - #define KMS_DRIVER_PATCHLEVEL 0 - - /* diff --git a/queue-6.12/series b/queue-6.12/series index 37fdf78afa..0c541014f2 100644 --- a/queue-6.12/series +++ b/queue-6.12/series @@ -94,7 +94,6 @@ kbuild-use-fzero-init-padding-bits-all.patch batman-adv-fix-panic-during-interface-removal.patch batman-adv-ignore-neighbor-throughput-metrics-in-error-case.patch batman-adv-drop-unmanaged-elp-metric-worker.patch -drm-amdgpu-bump-version-for-rv-pco-compute-fix.patch drm-amdgpu-avoid-buffer-overflow-attach-in-smu_sys_set_pp_table.patch kvm-x86-reject-hyper-v-s-send_ipi-hypercalls-if-local-apic-isn-t-in-kernel.patch kvm-x86-load-dr6-with-guest-value-only-before-entering-.vcpu_run-loop.patch diff --git a/queue-6.13/drm-amdgpu-bump-version-for-rv-pco-compute-fix.patch b/queue-6.13/drm-amdgpu-bump-version-for-rv-pco-compute-fix.patch deleted file mode 100644 index cf9b200f06..0000000000 --- a/queue-6.13/drm-amdgpu-bump-version-for-rv-pco-compute-fix.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 55ed2b1b50d029dd7e49a35f6628ca64db6d75d8 Mon Sep 17 00:00:00 2001 -From: Alex Deucher -Date: Fri, 31 Jan 2025 13:53:40 -0500 -Subject: drm/amdgpu: bump version for RV/PCO compute fix - -From: Alex Deucher - -commit 55ed2b1b50d029dd7e49a35f6628ca64db6d75d8 upstream. - -Bump the driver version for RV/PCO compute stability fix -so mesa can use this check to enable compute queues on -RV/PCO. - -Reviewed-by: Lijo Lazar -Signed-off-by: Alex Deucher -Cc: stable@vger.kernel.org # 6.12.x -Signed-off-by: Greg Kroah-Hartman ---- - drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c -@@ -120,9 +120,10 @@ - * - 3.58.0 - Add GFX12 DCC support - * - 3.59.0 - Cleared VRAM - * - 3.60.0 - Add AMDGPU_TILING_GFX12_DCC_WRITE_COMPRESS_DISABLE (Vulkan requirement) -+ * - 3.61.0 - Contains fix for RV/PCO compute queues - */ - #define KMS_DRIVER_MAJOR 3 --#define KMS_DRIVER_MINOR 60 -+#define KMS_DRIVER_MINOR 61 - #define KMS_DRIVER_PATCHLEVEL 0 - - /* diff --git a/queue-6.13/series b/queue-6.13/series index c3cc3944d2..2ff1975f69 100644 --- a/queue-6.13/series +++ b/queue-6.13/series @@ -113,7 +113,6 @@ batman-adv-ignore-neighbor-throughput-metrics-in-error-case.patch batman-adv-drop-unmanaged-elp-metric-worker.patch batman-adv-fix-incorrect-offset-in-batadv_tt_tvlv_ogm_handler_v1.patch drm-xe-carve-out-wopcm-portion-from-the-stolen-memory.patch -drm-amdgpu-bump-version-for-rv-pco-compute-fix.patch drm-amdgpu-avoid-buffer-overflow-attach-in-smu_sys_set_pp_table.patch kvm-x86-reject-hyper-v-s-send_ipi-hypercalls-if-local-apic-isn-t-in-kernel.patch kvm-x86-load-dr6-with-guest-value-only-before-entering-.vcpu_run-loop.patch