diff options
Diffstat (limited to 'common/recipes-kernel/linux/files/0551-drm-amdgpu-cleanup-fence-queue-init-v2.patch')
| -rw-r--r-- | common/recipes-kernel/linux/files/0551-drm-amdgpu-cleanup-fence-queue-init-v2.patch | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/common/recipes-kernel/linux/files/0551-drm-amdgpu-cleanup-fence-queue-init-v2.patch b/common/recipes-kernel/linux/files/0551-drm-amdgpu-cleanup-fence-queue-init-v2.patch deleted file mode 100644 index ca458db9..00000000 --- a/common/recipes-kernel/linux/files/0551-drm-amdgpu-cleanup-fence-queue-init-v2.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 5ec92a7692872d656cffe010920fb49c4f51d75f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com> -Date: Mon, 7 Sep 2015 18:43:02 +0200 -Subject: [PATCH 0551/1050] drm/amdgpu: cleanup fence queue init v2 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Move the fence related stuff into amdgpu_fence.c - -v2: rework commit message, cause this is actually not a bug - -Signed-off-by: Christian König <christian.koenig@amd.com> -Reviewed-by: Chunming Zhou<david1.zhou@amd.com> -Reviewed-by: Junwei Zhang <Jerry.Zhang@amd.com> ---- - drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 2 ++ - drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 2 -- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c -index 8e8cd09..7f2d85e 100644 ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c -@@ -625,6 +625,8 @@ void amdgpu_fence_driver_init_ring(struct amdgpu_ring *ring) - amdgpu_fence_check_lockup); - ring->fence_drv.ring = ring; - -+ init_waitqueue_head(&ring->fence_drv.fence_queue); -+ - if (amdgpu_enable_scheduler) { - ring->sched = amd_sched_create(&amdgpu_sched_ops, - ring->idx, -diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c -index 130292d..6e73543 100644 ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c -@@ -360,8 +360,6 @@ int amdgpu_ring_init(struct amdgpu_device *adev, struct amdgpu_ring *ring, - amdgpu_fence_driver_init_ring(ring); - } - -- init_waitqueue_head(&ring->fence_drv.fence_queue); -- - r = amdgpu_wb_get(adev, &ring->rptr_offs); - if (r) { - dev_err(adev->dev, "(%d) ring rptr_offs wb alloc failed\n", r); --- -1.9.1 - |