diff options
Diffstat (limited to 'common/recipes-kernel/linux/files/0357-drm-amdgpu-no-updates-shouldn-t-cause-vm-flush-v2.patch')
| -rw-r--r-- | common/recipes-kernel/linux/files/0357-drm-amdgpu-no-updates-shouldn-t-cause-vm-flush-v2.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/files/0357-drm-amdgpu-no-updates-shouldn-t-cause-vm-flush-v2.patch b/common/recipes-kernel/linux/files/0357-drm-amdgpu-no-updates-shouldn-t-cause-vm-flush-v2.patch new file mode 100644 index 00000000..859a0012 --- /dev/null +++ b/common/recipes-kernel/linux/files/0357-drm-amdgpu-no-updates-shouldn-t-cause-vm-flush-v2.patch @@ -0,0 +1,44 @@ +From fc8fa5e428ae937f79a36ccbe303fa871ffbbbf7 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com> +Date: Mon, 20 Jul 2015 15:47:30 +0200 +Subject: [PATCH 0357/1050] drm/amdgpu: no updates shouldn't cause vm flush v2 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +v2 (chk): split fix from original patch + +Signed-off-by: monk.liu <monk.liu@amd.com> +Signed-off-by: Christian König <christian.koenig@amd.com> +Reviewed-by: Jammy Zhou <Jammy.Zhou@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +index 0c8c990..1e895b9 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +@@ -200,13 +200,15 @@ void amdgpu_vm_flush(struct amdgpu_ring *ring, + { + uint64_t pd_addr = amdgpu_bo_gpu_offset(vm->page_directory); + struct amdgpu_vm_id *vm_id = &vm->ids[ring->idx]; ++ struct amdgpu_fence *flushed_updates = vm_id->flushed_updates; + +- if (pd_addr != vm_id->pd_gpu_addr || !vm_id->flushed_updates || +- amdgpu_fence_is_earlier(vm_id->flushed_updates, updates)) { ++ if (pd_addr != vm_id->pd_gpu_addr || !flushed_updates || ++ (updates && amdgpu_fence_is_earlier(flushed_updates, updates))) { + + trace_amdgpu_vm_flush(pd_addr, ring->idx, vm_id->id); +- amdgpu_fence_unref(&vm_id->flushed_updates); +- vm_id->flushed_updates = amdgpu_fence_ref(updates); ++ vm_id->flushed_updates = amdgpu_fence_ref( ++ amdgpu_fence_later(flushed_updates, updates)); ++ amdgpu_fence_unref(&flushed_updates); + vm_id->pd_gpu_addr = pd_addr; + amdgpu_ring_emit_vm_flush(ring, vm_id->id, vm_id->pd_gpu_addr); + } +-- +1.9.1 + |