diff options
Diffstat (limited to 'common/recipes-kernel/linux/files/0395-drm-amdgpu-merge-amdgpu_fence_process-and-_activity.patch')
| -rw-r--r-- | common/recipes-kernel/linux/files/0395-drm-amdgpu-merge-amdgpu_fence_process-and-_activity.patch | 67 |
1 files changed, 67 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/files/0395-drm-amdgpu-merge-amdgpu_fence_process-and-_activity.patch b/common/recipes-kernel/linux/files/0395-drm-amdgpu-merge-amdgpu_fence_process-and-_activity.patch new file mode 100644 index 00000000..e8ade9f6 --- /dev/null +++ b/common/recipes-kernel/linux/files/0395-drm-amdgpu-merge-amdgpu_fence_process-and-_activity.patch @@ -0,0 +1,67 @@ +From 2658022b2a789a112617ed1e68e8c6f94c4431d5 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com> +Date: Fri, 11 Mar 2016 17:57:56 +0100 +Subject: [PATCH 0395/1110] drm/amdgpu: merge amdgpu_fence_process and + _activity +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +No need to keep the two separate any more. + +Signed-off-by: Christian König <christian.koenig@amd.com> +Reviewed-by: Chunming Zhou <david1.zhou@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 24 +++++------------------- + 1 file changed, 5 insertions(+), 19 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c +index 35fbc88..d8bbe85 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c +@@ -155,15 +155,15 @@ static void amdgpu_fence_schedule_fallback(struct amdgpu_ring *ring) + } + + /** +- * amdgpu_fence_activity - check for fence activity ++ * amdgpu_fence_process - check for fence activity + * + * @ring: pointer to struct amdgpu_ring + * + * Checks the current fence value and calculates the last +- * signalled fence value. Returns true if activity occured +- * on the ring, and the fence_queue should be waken up. ++ * signalled fence value. Wakes the fence queue if the ++ * sequence number has increased. + */ +-static bool amdgpu_fence_activity(struct amdgpu_ring *ring) ++void amdgpu_fence_process(struct amdgpu_ring *ring) + { + uint64_t seq, last_seq, last_emitted; + bool wake = false; +@@ -193,21 +193,7 @@ static bool amdgpu_fence_activity(struct amdgpu_ring *ring) + if (seq < last_emitted) + amdgpu_fence_schedule_fallback(ring); + +- return wake; +-} +- +-/** +- * amdgpu_fence_process - process a fence +- * +- * @adev: amdgpu_device pointer +- * @ring: ring index the fence is associated with +- * +- * Checks the current fence value and wakes the fence queue +- * if the sequence number has increased (all asics). +- */ +-void amdgpu_fence_process(struct amdgpu_ring *ring) +-{ +- if (amdgpu_fence_activity(ring)) ++ if (wake) + wake_up_all(&ring->fence_drv.fence_queue); + } + +-- +2.7.4 + |