aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-kernel/linux/files/1066-drm-amdgpu-check-if-ring-emit_vm_flush-exists-in-vm-.patch
blob: 24fdb903f52e69dd18d971c1aa84a9f56d461943 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
From e167a00f9ab0c0fbbc2e9434f58a3407ee860f3f Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexander.deucher@amd.com>
Date: Thu, 28 Apr 2016 17:03:19 -0400
Subject: [PATCH 1066/1110] drm/amdgpu: check if ring emit_vm_flush exists in
 vm flush

No vm flush on engines that don't support VM.

bug:
https://bugs.freedesktop.org/show_bug.cgi?id=95195

Reviewed-by: Ken Wang <Qingqing.Wang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Kalyan Alle <kalyan.alle@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
index 6399429..fd691d0 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@ -311,7 +311,8 @@ int amdgpu_vm_flush(struct amdgpu_ring *ring,
                     ring->type == AMDGPU_RING_TYPE_COMPUTE))
                amdgpu_ring_emit_pipeline_sync(ring);
 
-	if (pd_addr != AMDGPU_VM_NO_FLUSH) {
+        if (ring->funcs->emit_vm_flush &&
+            pd_addr != AMDGPU_VM_NO_FLUSH) {
                 struct fence *fence;
 
 		trace_amdgpu_vm_flush(pd_addr, ring->idx, vm_id);
-- 
2.7.4