diff options
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.14.71/4716-drm-amdgpu-Reserve-VM-root-shared-fence-slot-for-com.patch')
| -rw-r--r-- | common/recipes-kernel/linux/linux-yocto-4.14.71/4716-drm-amdgpu-Reserve-VM-root-shared-fence-slot-for-com.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.14.71/4716-drm-amdgpu-Reserve-VM-root-shared-fence-slot-for-com.patch b/common/recipes-kernel/linux/linux-yocto-4.14.71/4716-drm-amdgpu-Reserve-VM-root-shared-fence-slot-for-com.patch new file mode 100644 index 00000000..dfa4aa0e --- /dev/null +++ b/common/recipes-kernel/linux/linux-yocto-4.14.71/4716-drm-amdgpu-Reserve-VM-root-shared-fence-slot-for-com.patch @@ -0,0 +1,46 @@ +From 30b6d754525da76550a36fb788aba8fd31e49526 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <michel.daenzer@amd.com> +Date: Mon, 25 Jun 2018 11:07:17 +0200 +Subject: [PATCH 4716/5725] drm/amdgpu: Reserve VM root shared fence slot for + command submission (v3) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Without this, there could not be enough slots, which could trigger the +BUG_ON in reservation_object_add_shared_fence. + +v2: +* Jump to the error label instead of returning directly (Jerry Zhang) +v3: +* Reserve slots for command submission after VM updates (Christian König) + +Cc: stable@vger.kernel.org +Bugzilla: https://bugs.freedesktop.org/106418 +Reported-by: mikhail.v.gavrilov@gmail.com +Signed-off-by: Michel Dänzer <michel.daenzer@amd.com> +Signed-off-by: Junwei Zhang <Jerry.Zhang@amd.com> +Reviewed-by: Christian König <christian.koenig@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +index abe2bff..da11c95 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +@@ -930,6 +930,10 @@ static int amdgpu_cs_ib_vm_chunk(struct amdgpu_device *adev, + r = amdgpu_bo_vm_update_pte(p); + if (r) + return r; ++ ++ r = reservation_object_reserve_shared(vm->root.base.bo->tbo.resv); ++ if (r) ++ return r; + } + + return amdgpu_cs_sync_rings(p); +-- +2.7.4 + |