From: Greg Kroah-Hartman Date: Tue, 12 Sep 2023 11:31:15 +0000 (+0200) Subject: 5.15-stable patches X-Git-Tag: v6.1.53~10 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a702e3c27168d79ef5616aada3f27b1f5df2da47;p=thirdparty%2Fkernel%2Fstable-queue.git 5.15-stable patches added patches: revert-drm-amdgpu-install-stub-fence-into-potential-unused-fence-pointers.patch --- diff --git a/queue-5.15/revert-drm-amdgpu-install-stub-fence-into-potential-unused-fence-pointers.patch b/queue-5.15/revert-drm-amdgpu-install-stub-fence-into-potential-unused-fence-pointers.patch new file mode 100644 index 00000000000..7ed6ffc93dc --- /dev/null +++ b/queue-5.15/revert-drm-amdgpu-install-stub-fence-into-potential-unused-fence-pointers.patch @@ -0,0 +1,55 @@ +From bf7b83108430e77aadb2175e7bad421ac5469e8a Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman +Date: Tue, 12 Sep 2023 13:28:47 +0200 +Subject: Revert "drm/amdgpu: install stub fence into potential unused fence pointers" + +From: Greg Kroah-Hartman + +This reverts commit 4921792e04f2125b5eadef9dbe9417a8354c7eff which is +commit 187916e6ed9d0c3b3abc27429f7a5f8c936bd1f0 upstream. + +It is reported to cause a lot of log spam, so should be reverted. + +Link: https://lore.kernel.org/r/d32d6919-47cf-4ddc-955a-0759088220ae@gmail.com +Link: https://lore.kernel.org/r/BL1PR12MB5144A0E84378A2666A26AE18F7F2A@BL1PR12MB5144.namprd12.prod.outlook.com +Reported-by: Bryan Jennings +Reported-by: Alexander Deucher +Cc: Christian König +Cc: Lang Yu +Cc: Alex Deucher +Cc: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +@@ -2260,7 +2260,6 @@ 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); + +@@ -2975,8 +2974,7 @@ 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 = dma_fence_get_stub(); ++ vm->last_update = NULL; + vm->last_unlocked = dma_fence_get_stub(); + + mutex_init(&vm->eviction_lock); +@@ -3119,7 +3117,7 @@ int amdgpu_vm_make_compute(struct amdgpu + vm->update_funcs = &amdgpu_vm_sdma_funcs; + } + dma_fence_put(vm->last_update); +- vm->last_update = dma_fence_get_stub(); ++ vm->last_update = NULL; + vm->is_compute_context = true; + + /* Free the shadow bo for compute VM */ diff --git a/queue-5.15/series b/queue-5.15/series index 86bcb2c0156..0aa6bd55c4f 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -374,3 +374,4 @@ perf-x86-uncore-correct-the-number-of-chas-on-emr.patch net-remove-duplicate-indirect_callable_declare-of-udp_ehashfn.patch tracing-zero-the-pipe-cpumask-on-alloc-to-avoid-spurious-ebusy.patch md-md-bitmap-remove-unnecessary-local-variable-in-backlog_store.patch +revert-drm-amdgpu-install-stub-fence-into-potential-unused-fence-pointers.patch