diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3063-drm-amdgpu-update-VM-PDs-after-the-PTs.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3063-drm-amdgpu-update-VM-PDs-after-the-PTs.patch | 73 |
1 files changed, 73 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3063-drm-amdgpu-update-VM-PDs-after-the-PTs.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3063-drm-amdgpu-update-VM-PDs-after-the-PTs.patch new file mode 100644 index 00000000..9a0302c9 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3063-drm-amdgpu-update-VM-PDs-after-the-PTs.patch @@ -0,0 +1,73 @@ +From c21bb977b66f2d030d92120f924785e2cb9c60b8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com> +Date: Fri, 1 Sep 2017 20:37:57 +0200 +Subject: [PATCH 3063/4131] drm/amdgpu: update VM PDs after the PTs +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Necessary for the next patch. + +Signed-off-by: Christian König <christian.koenig@amd.com> +Reviewed-by: Chunming Zhou <david1.zhou@amd.com> +Acked-by: Felix Kuehling <Felix.Kuehling@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 8 ++++---- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 8 ++++---- + 2 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +index ad1a3d2..9947e1a 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +@@ -814,10 +814,6 @@ static int amdgpu_bo_vm_update_pte(struct amdgpu_cs_parser *p) + struct amdgpu_bo *bo; + int i, r; + +- r = amdgpu_vm_update_directories(adev, vm); +- if (r) +- return r; +- + r = amdgpu_vm_clear_freed(adev, vm, NULL); + if (r) + return r; +@@ -875,6 +871,10 @@ static int amdgpu_bo_vm_update_pte(struct amdgpu_cs_parser *p) + if (r) + return r; + ++ r = amdgpu_vm_update_directories(adev, vm); ++ if (r) ++ return r; ++ + r = amdgpu_sync_fence(adev, &p->job->sync, vm->last_update, false); + if (r) + return r; +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +index 96143ee..11d1fb7 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +@@ -689,10 +689,6 @@ static void amdgpu_gem_va_update_vm(struct amdgpu_device *adev, + if (!amdgpu_vm_ready(vm)) + return; + +- r = amdgpu_vm_update_directories(adev, vm); +- if (r) +- goto error; +- + r = amdgpu_vm_clear_freed(adev, vm, NULL); + if (r) + goto error; +@@ -701,6 +697,10 @@ static void amdgpu_gem_va_update_vm(struct amdgpu_device *adev, + operation == AMDGPU_VA_OP_REPLACE) + r = amdgpu_vm_bo_update(adev, bo_va, false); + ++ r = amdgpu_vm_update_directories(adev, vm); ++ if (r) ++ goto error; ++ + error: + if (r && r != -ERESTARTSYS) + DRM_ERROR("Couldn't update BO_VA (%d)\n", r); +-- +2.7.4 + |