FAILED: patch "[PATCH] drm/amdgpu: Verify root PD is mapped into kernel address" failed to apply to 4.17-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 4.17-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
9d4a0d4cdc8b5904ec7c9b9e04bab3e9e60d7a74Mon Sep 17 00:00:00 2001
From: Andrey Grodzovsky <[email protected]>
Date: Thu, 5 Jul 2018 14:49:34 -0400
Subject: [PATCH] drm/amdgpu: Verify root PD is mapped into kernel address
space (v4)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Problem: When PD/PT update made by CPU root PD was not yet mapped causing page fault.
Fix: Verify root PD is mapped into CPU address space.
v2:
Make sure that we add the root PD to the relocated list since then it's get mapped into CPU address space bt default in amdgpu_vm_update_directories.
v3:
Drop change to not move kernel type BOs to evicted list.
v4:
Remove redundant bo move to relocated list.
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +3 -1
@@ -107,6 +107,9 @@ static void amdgpu_vm_bo_base_init(struct amdgpu_vm_bo_base *base,return ;list_add_tail (&base->bo_list, &bo->va); +if (bo->tbo.type == ttm_bo_type_kernel) +list_move (&base->vm_status, &vm->relocated); +if (bo->tbo.resv != vm->root.base.bo->tbo.resv)return ;
@@ -468,7 +471,6 @@ static int amdgpu_vm_alloc_levels(struct amdgpu_device *adev, pt->parent =amdgpu_bo_ref (parent->base.bo);amdgpu_vm_bo_base_init (&entry->base, vm, pt); -list_move (&entry->base.vm_status, &vm->relocated); }if (level <AMDGPU_VM_PTB ) {