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
|
From 48c4e0c84ff1e3e339f4d1ca7f9a601489e641be Mon Sep 17 00:00:00 2001
From: "Le.Ma" <Le.Ma@amd.com>
Date: Wed, 6 Dec 2017 18:50:20 +0800
Subject: [PATCH 2803/4131] drm/amdgpu: Fix to mark fence as explicit for
amdgpu_sem_add_cs()
Change-Id: Ib40cbeeb94157862e4f5e710a6f4d7a63f3d6917
Signed-off-by: Le.Ma <Le.Ma@amd.com>
Reviewed-by: Xiaojie Yuan <Xiaojie.Yuan@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 2 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_sem.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
index cbf9120..073633c 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@ -1180,7 +1180,7 @@ static int amdgpu_cs_dependencies(struct amdgpu_device *adev,
}
}
- return amdgpu_sem_add_cs(p->ctx, p->job->ring, &p->job->dep_sync);
+ return amdgpu_sem_add_cs(p->ctx, p->job->ring, &p->job->sync);
}
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 13, 0)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sem.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_sem.c
index 7a108c6..edba9e8 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sem.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sem.c
@@ -401,7 +401,7 @@ int amdgpu_sem_add_cs(struct amdgpu_ctx *ctx, struct amdgpu_ring *ring,
mutex_lock(&ctx->rings[ring->idx].sem_lock);
list_for_each_entry_safe(dep, tmp, &ctx->rings[ring->idx].sem_dep_list,
list) {
- r = amdgpu_sync_fence(ctx->adev, sync, dep->fence);
+ r = amdgpu_sync_fence(ctx->adev, sync, dep->fence, true);
if (r)
goto err;
dma_fence_put(dep->fence);
--
2.7.4
|
