aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-kernel/linux/files/0682-drm-amdgpu-cleanup-scheduler-fence-get-put-dance.patch
blob: 534cefccd1afa6c326e8adc47d399ccc5a98c04d (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
From 4a562283376197722b295d27633134401bbc80f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com>
Date: Fri, 6 Nov 2015 14:09:21 +0100
Subject: [PATCH 0682/1565] drm/amdgpu: cleanup scheduler fence get/put dance
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The code was correct, but getting two references when the ownership
is linearly moved on is a bit awkward and just overhead.

Signed: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c     | 1 -
 drivers/gpu/drm/amd/scheduler/gpu_scheduler.c | 1 -
 2 files changed, 2 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c
index 67f778f..8ef9e44 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c
@@ -64,7 +64,6 @@ err:
 		job->free_job(job);
 
 	mutex_unlock(&job->job_lock);
-	fence_put(&job->base.s_fence->base);
 	kfree(job);
 	return fence ? &fence->base : NULL;
 }
diff --git a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c
index b8925fe..ccb7c15 100644
--- a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c
+++ b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c
@@ -285,7 +285,6 @@ int amd_sched_entity_push_job(struct amd_sched_job *sched_job)
 	if (!fence)
 		return -ENOMEM;
 
-	fence_get(&fence->base);
 	sched_job->s_fence = fence;
 
 	wait_event(entity->sched->job_scheduled,
-- 
1.9.1