diff options
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.14.71/4968-drm-amdgpu-minor-cleanup-in-amdgpu_job.c.patch')
| -rw-r--r-- | common/recipes-kernel/linux/linux-yocto-4.14.71/4968-drm-amdgpu-minor-cleanup-in-amdgpu_job.c.patch | 66 |
1 files changed, 66 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.14.71/4968-drm-amdgpu-minor-cleanup-in-amdgpu_job.c.patch b/common/recipes-kernel/linux/linux-yocto-4.14.71/4968-drm-amdgpu-minor-cleanup-in-amdgpu_job.c.patch new file mode 100644 index 00000000..b5695181 --- /dev/null +++ b/common/recipes-kernel/linux/linux-yocto-4.14.71/4968-drm-amdgpu-minor-cleanup-in-amdgpu_job.c.patch @@ -0,0 +1,66 @@ +From a628d595dd0642548a3fc785ea217a0c3cadc547 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com> +Date: Fri, 13 Jul 2018 14:01:08 +0200 +Subject: [PATCH 4968/5725] drm/amdgpu: minor cleanup in amdgpu_job.c +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Remove superflous NULL check, fix coding style a bit, shorten error +messages. + +Signed-off-by: Christian König <christian.koenig@amd.com> +Reviewed-by: Junwei Zhang <Jerry.Zhang@amd.com> +Acked-by: Chunming Zhou <david1.zhou@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 11 ++++------- + 1 file changed, 4 insertions(+), 7 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c +index 09efdd1..f92437f 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c +@@ -33,7 +33,7 @@ static void amdgpu_job_timedout(struct drm_sched_job *s_job) + struct amdgpu_ring *ring = to_amdgpu_ring(s_job->sched); + struct amdgpu_job *job = to_amdgpu_job(s_job); + +- DRM_ERROR("ring %s timeout, last signaled seq=%u, last emitted seq=%u\n", ++ DRM_ERROR("ring %s timeout, signaled seq=%u, emitted seq=%u\n", + job->base.sched->name, atomic_read(&ring->fence_drv.last_seq), + ring->fence_drv.sync_seq); + +@@ -166,16 +166,17 @@ static struct dma_fence *amdgpu_job_dependency(struct drm_sched_job *sched_job, + struct amdgpu_ring *ring = to_amdgpu_ring(s_entity->sched); + struct amdgpu_job *job = to_amdgpu_job(sched_job); + struct amdgpu_vm *vm = job->vm; ++ struct dma_fence *fence; + bool explicit = false; + int r; +- struct dma_fence *fence = amdgpu_sync_get_fence(&job->sync, &explicit); + ++ fence = amdgpu_sync_get_fence(&job->sync, &explicit); + if (fence && explicit) { + if (drm_sched_dependency_optimized(fence, s_entity)) { + r = amdgpu_sync_fence(ring->adev, &job->sched_sync, + fence, false); + if (r) +- DRM_ERROR("Error adding fence to sync (%d)\n", r); ++ DRM_ERROR("Error adding fence (%d)\n", r); + } + } + +@@ -199,10 +200,6 @@ static struct dma_fence *amdgpu_job_run(struct drm_sched_job *sched_job) + struct amdgpu_job *job; + int r; + +- if (!sched_job) { +- DRM_ERROR("job is null\n"); +- return NULL; +- } + job = to_amdgpu_job(sched_job); + finished = &job->base.s_fence->finished; + +-- +2.7.4 + |