aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-kernel/linux/files/0362-drm-amdgpu-if-a-GDS-switch-is-needed-emit-a-pipeline.patch
blob: 27394a5e7802f98f71a76d1e1effbc451296fa79 (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
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
From e4c5273b33bfe7303ea03aa50f9fad2b3ef32980 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com>
Date: Tue, 1 Mar 2016 15:51:53 +0100
Subject: [PATCH 0362/1110] drm/amdgpu: if a GDS switch is needed emit a
 pipeline sync as well
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Otherwise we might change the GDS settings while they are still in use.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Chunming Zhou <david1.zhou@amd.com>
Signed-off-by: Kalyan Alle <kalyan.alle@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
index 25469bf..f139cea 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@ -261,22 +261,24 @@ void amdgpu_vm_flush(struct amdgpu_ring *ring,
 {
         struct amdgpu_device *adev = ring->adev;
         struct amdgpu_vm_manager_id *mgr_id = &adev->vm_manager.ids[vm_id];
+        bool gds_switch_needed = ring->funcs->emit_gds_switch && (
+               mgr_id->gds_base != gds_base ||
+               mgr_id->gds_size != gds_size ||
+               mgr_id->gws_base != gws_base ||
+               mgr_id->gws_size != gws_size ||
+               mgr_id->oa_base != oa_base ||
+               mgr_id->oa_size != oa_size);
+
+        if (ring->funcs->emit_pipeline_sync && (
+           pd_addr != AMDGPU_VM_NO_FLUSH || gds_switch_needed))
+               amdgpu_ring_emit_pipeline_sync(ring);
 
 	if (pd_addr != AMDGPU_VM_NO_FLUSH) {
 		trace_amdgpu_vm_flush(pd_addr, ring->idx, vm_id);
-		if (ring->funcs->emit_pipeline_sync)
-			amdgpu_ring_emit_pipeline_sync(ring);
 		amdgpu_ring_emit_vm_flush(ring, vm_id, pd_addr);
 	}
 
-        if (ring->funcs->emit_gds_switch && (
-           mgr_id->gds_base != gds_base ||
-           mgr_id->gds_size != gds_size ||
-           mgr_id->gws_base != gws_base ||
-           mgr_id->gws_size != gws_size ||
-           mgr_id->oa_base != oa_base ||
-           mgr_id->oa_size != oa_size)) {
-
+        if (gds_switch_needed) {
                mgr_id->gds_base = gds_base;
                mgr_id->gds_size = gds_size;
                mgr_id->gws_base = gws_base;
-- 
2.7.4