diff --git a/blacklist.conf b/blacklist.conf index 3b9222d..d1a98bb 100644 --- a/blacklist.conf +++ b/blacklist.conf @@ -927,3 +927,4 @@ efa90c11f62e6b7252fb75efe2787056872a627c # for Clang bfdf4e6208051ed7165b2e92035b4bf11f43eb63 # cleanup breaking kABI 31cb1304ad8bd27b7d2abd8669fb887fb47d8eaf # cleanup breaking kABI 70fb5ccf2ebb09a0c8ebba775041567812d45f86 # Not a fix, relatively high risk of performance regression +187916e6ed9d0c3b3abc27429f7a5f8c936bd1f0 # amdgpu: causing a log spam (bsc#1215523) diff --git a/patches.suse/drm-amdgpu-install-stub-fence-into-potential-unused-.patch b/patches.suse/drm-amdgpu-install-stub-fence-into-potential-unused-.patch deleted file mode 100644 index 5fe12cc..0000000 --- a/patches.suse/drm-amdgpu-install-stub-fence-into-potential-unused-.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 187916e6ed9d0c3b3abc27429f7a5f8c936bd1f0 Mon Sep 17 00:00:00 2001 -From: Lang Yu -Date: Fri, 5 May 2023 20:14:15 +0800 -Subject: [PATCH] drm/amdgpu: install stub fence into potential unused fence pointers -Mime-version: 1.0 -Content-type: text/plain; charset=UTF-8 -Content-transfer-encoding: 8bit -Git-commit: 187916e6ed9d0c3b3abc27429f7a5f8c936bd1f0 -Patch-mainline: v6.5-rc1 -References: git-fixes - -When using cpu to update page tables, vm update fences are unused. -Install stub fence into these fence pointers instead of NULL -to avoid NULL dereference when calling dma_fence_wait() on them. - -Suggested-by: Christian König -Signed-off-by: Lang Yu -Reviewed-by: Christian König -Signed-off-by: Alex Deucher -Acked-by: Takashi Iwai - ---- - drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c -@@ -2220,6 +2220,7 @@ struct amdgpu_bo_va *amdgpu_vm_bo_add(st - amdgpu_vm_bo_base_init(&bo_va->base, vm, bo); - - bo_va->ref_count = 1; -+ bo_va->last_pt_update = dma_fence_get_stub(); - INIT_LIST_HEAD(&bo_va->valids); - INIT_LIST_HEAD(&bo_va->invalids); - -@@ -2935,7 +2936,8 @@ int amdgpu_vm_init(struct amdgpu_device - vm->update_funcs = &amdgpu_vm_cpu_funcs; - else - vm->update_funcs = &amdgpu_vm_sdma_funcs; -- vm->last_update = NULL; -+ -+ vm->last_update = dma_fence_get_stub(); - vm->last_unlocked = dma_fence_get_stub(); - - mutex_init(&vm->eviction_lock); -@@ -3107,7 +3109,7 @@ int amdgpu_vm_make_compute(struct amdgpu - vm->update_funcs = &amdgpu_vm_sdma_funcs; - } - dma_fence_put(vm->last_update); -- vm->last_update = NULL; -+ vm->last_update = dma_fence_get_stub(); - vm->is_compute_context = true; - - if (vm->pasid) { diff --git a/series.conf b/series.conf index 816e7fb..7e81771 100644 --- a/series.conf +++ b/series.conf @@ -21291,7 +21291,6 @@ patches.suse/radeon-avoid-double-free-in-ci_dpm_init.patch patches.suse/drm-amd-display-Explicitly-specify-update-type-per-p.patch patches.suse/drm-radeon-Fix-integer-overflow-in-radeon_cs_parser_.patch - patches.suse/drm-amdgpu-install-stub-fence-into-potential-unused-.patch patches.suse/drm-amdkfd-Fix-potential-deallocation-of-previously-.patch patches.suse/drm-amd-display-drop-redundant-memset-in-get_availab.patch patches.suse/drm-amdgpu-Validate-VM-ioctl-flags.patch