aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-kernel/linux/linux-yocto-4.19.8/0914-drm-amdgpu-always-reserve-two-slots-for-the-VM.patch
diff options
context:
space:
mode:
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.19.8/0914-drm-amdgpu-always-reserve-two-slots-for-the-VM.patch')
-rw-r--r--common/recipes-kernel/linux/linux-yocto-4.19.8/0914-drm-amdgpu-always-reserve-two-slots-for-the-VM.patch85
1 files changed, 85 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.19.8/0914-drm-amdgpu-always-reserve-two-slots-for-the-VM.patch b/common/recipes-kernel/linux/linux-yocto-4.19.8/0914-drm-amdgpu-always-reserve-two-slots-for-the-VM.patch
new file mode 100644
index 00000000..651f998d
--- /dev/null
+++ b/common/recipes-kernel/linux/linux-yocto-4.19.8/0914-drm-amdgpu-always-reserve-two-slots-for-the-VM.patch
@@ -0,0 +1,85 @@
+From 5e2f077798a937667a55647ec67674388c6f61fb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com>
+Date: Fri, 21 Sep 2018 18:09:59 +0200
+Subject: [PATCH 0914/2940] drm/amdgpu: always reserve two slots for the VM
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+And drop the now superflous extra reservations.
+
+Signed-off-by: Christian König <christian.koenig@amd.com>
+Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
+Reviewed-by: Junwei Zhang <Jerry.Zhang@amd.com>
+Reviewed-by: Huang Rui <ray.huang@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+---
+ drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 4 ----
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 15 ++++++---------
+ 2 files changed, 6 insertions(+), 13 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+index 35ebf24612df..811acb7bcf04 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+@@ -967,10 +967,6 @@ static int amdgpu_cs_vm_handling(struct amdgpu_cs_parser *p)
+ if (r)
+ return r;
+
+- r = reservation_object_reserve_shared(vm->root.base.bo->tbo.resv);
+- if (r)
+- return r;
+-
+ p->job->vm_pd_addr = amdgpu_gmc_pd_addr(vm->root.base.bo);
+
+ if (amdgpu_vm_debug) {
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+index bf7037fb4162..ba324a1cae5e 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+@@ -617,7 +617,8 @@ void amdgpu_vm_get_pd_bo(struct amdgpu_vm *vm,
+ {
+ entry->priority = 0;
+ entry->tv.bo = &vm->root.base.bo->tbo;
+- entry->tv.num_shared = 1;
++ /* One for the VM updates and one for the CS job */
++ entry->tv.num_shared = 2;
+ entry->user_pages = NULL;
+ list_add(&entry->tv.head, validated);
+ }
+@@ -773,10 +774,6 @@ static int amdgpu_vm_clear_bo(struct amdgpu_device *adev,
+
+ ring = container_of(vm->entity.rq->sched, struct amdgpu_ring, sched);
+
+- r = reservation_object_reserve_shared(bo->tbo.resv);
+- if (r)
+- return r;
+-
+ r = ttm_bo_validate(&bo->tbo, &bo->placement, &ctx);
+ if (r)
+ goto error;
+@@ -1836,10 +1833,6 @@ static int amdgpu_vm_bo_update_mapping(struct amdgpu_device *adev,
+ if (r)
+ goto error_free;
+
+- r = reservation_object_reserve_shared(vm->root.base.bo->tbo.resv);
+- if (r)
+- goto error_free;
+-
+ r = amdgpu_vm_update_ptes(&params, start, last + 1, addr, flags);
+ if (r)
+ goto error_free;
+@@ -3043,6 +3036,10 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm,
+ if (r)
+ goto error_free_root;
+
++ r = reservation_object_reserve_shared(root->tbo.resv, 1);
++ if (r)
++ goto error_unreserve;
++
+ r = amdgpu_vm_clear_bo(adev, vm, root,
+ adev->vm_manager.root_level,
+ vm->pte_support_ats);
+--
+2.17.1
+