Skip to contentSkip to conversation

FAILED: patch "[PATCH] drm/amdgpu: fix amdgpu_vm_clear_freed v2" failed to apply to 4.9-stable tree

PATCH [email protected] 1 participant 1 message May 22, 2017

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 4.9-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

Quoted 1 line

From fc6aa33da4b1043ad1b337d051770993418256d2 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Christian=20K=C3=B6nig?= <[email protected]>
Date: Wed, 19 Apr 2017 14:41:19 +0200
Subject: [PATCH] drm/amdgpu: fix amdgpu_vm_clear_freed v2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Use amdgpu_vm_bo_update_mapping() instead of amdgpu_vm_bo_split_mapping() here.

We don't want any flags set in the cleared areas and splitting shouldn't be necessary.

v2: fix typo in commit message

drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +3 -2
index 6b95176d3f75..f34d822f92ac 100644
@@ -1631,8 +1631,9 @@ int amdgpu_vm_clear_freed(struct amdgpu_device *adev,
 			struct amdgpu_bo_va_mapping, list);
 		list_del(&mapping->list);
 
-		r = amdgpu_vm_bo_split_mapping(adev, NULL, 0, NULL, vm, mapping,
-					       0, 0, &f);
+		r = amdgpu_vm_bo_update_mapping(adev, NULL, 0, NULL, vm,
+						mapping->start, mapping->last,
+						0, 0, &f);
 		amdgpu_vm_free_mapping(adev, vm, mapping, f);
 		if (r) {
 			dma_fence_put(f);