diff options
Diffstat (limited to 'meta-r1000/recipes-kernel/linux/linux-yocto-4.14.71/5402-drm-amdgpu-Fix-SDMA-TO-after-GPU-reset-v3.patch')
| -rw-r--r-- | meta-r1000/recipes-kernel/linux/linux-yocto-4.14.71/5402-drm-amdgpu-Fix-SDMA-TO-after-GPU-reset-v3.patch | 55 |
1 files changed, 0 insertions, 55 deletions
diff --git a/meta-r1000/recipes-kernel/linux/linux-yocto-4.14.71/5402-drm-amdgpu-Fix-SDMA-TO-after-GPU-reset-v3.patch b/meta-r1000/recipes-kernel/linux/linux-yocto-4.14.71/5402-drm-amdgpu-Fix-SDMA-TO-after-GPU-reset-v3.patch deleted file mode 100644 index 84973c6f..00000000 --- a/meta-r1000/recipes-kernel/linux/linux-yocto-4.14.71/5402-drm-amdgpu-Fix-SDMA-TO-after-GPU-reset-v3.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 834c2f1eb23ce8db4720cf957a101195826fd1dd Mon Sep 17 00:00:00 2001 -From: Andrey Grodzovsky <andrey.grodzovsky@amd.com> -Date: Mon, 10 Sep 2018 18:43:58 -0400 -Subject: [PATCH 5402/5725] drm/amdgpu: Fix SDMA TO after GPU reset v3 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -After GPU reset amdgpu_vm_clear_bo triggers VM flush -but job->vm_pd_addr is not set causing SDMA TO. - -v2: -Per advise by Christian König avoid flushing VM for jobs where -job->vm_pd_addr wasn't explicitly set. - -v3: -Shortcut vm_flush_needed early. - -Fixes cbd5285 drm/amdgpu: move setting the GART addr into TTM. -Signed-off-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com> -Reviewed-by: Christian König <christian.koenig@amd.com> ---- - drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 1 + - drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 3 ++- - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c -index 2d50825..5b2a38a 100644 ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c -@@ -73,6 +73,7 @@ int amdgpu_job_alloc(struct amdgpu_device *adev, unsigned num_ibs, - amdgpu_sync_create(&(*job)->sync); - amdgpu_sync_create(&(*job)->sched_sync); - (*job)->vram_lost_counter = atomic_read(&adev->vram_lost_counter); -+ (*job)->vm_pd_addr = AMDGPU_BO_INVALID_OFFSET; - - return 0; - } -diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c -index fc1bd7d..1382b92 100644 ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c -@@ -799,7 +799,8 @@ int amdgpu_vm_flush(struct amdgpu_ring *ring, struct amdgpu_job *job, bool need_ - } - - gds_switch_needed &= !!ring->funcs->emit_gds_switch; -- vm_flush_needed &= !!ring->funcs->emit_vm_flush; -+ vm_flush_needed &= !!ring->funcs->emit_vm_flush && -+ job->vm_pd_addr != AMDGPU_BO_INVALID_OFFSET; - pasid_mapping_needed &= adev->gmc.gmc_funcs->emit_pasid_mapping && - ring->funcs->emit_wreg; - --- -2.7.4 - |