diff options
Diffstat (limited to 'common/recipes-kernel/linux/files/0229-drm-amdgpu-remove-sync_to-from-sync-obj-v2.patch')
| -rw-r--r-- | common/recipes-kernel/linux/files/0229-drm-amdgpu-remove-sync_to-from-sync-obj-v2.patch | 122 |
1 files changed, 122 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/files/0229-drm-amdgpu-remove-sync_to-from-sync-obj-v2.patch b/common/recipes-kernel/linux/files/0229-drm-amdgpu-remove-sync_to-from-sync-obj-v2.patch new file mode 100644 index 00000000..233a5378 --- /dev/null +++ b/common/recipes-kernel/linux/files/0229-drm-amdgpu-remove-sync_to-from-sync-obj-v2.patch @@ -0,0 +1,122 @@ +From 413319377bf1a284d74666a77b69711514ac0940 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com> +Date: Mon, 18 Jan 2016 14:49:45 +0100 +Subject: [PATCH 0229/1110] drm/amdgpu: remove sync_to from sync obj v2 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Not needed any more without semaphores. + +v2: remove unused variables as well + +Signed-off-by: Christian König <christian.koenig@amd.com> +Reviewed-by: Chunming Zhou <david1.zhou@amd.com> +Acked-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 44 +++++++------------------------- + 2 files changed, 9 insertions(+), 36 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h +index f572cbc..996b8f8 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h +@@ -596,7 +596,6 @@ int amdgpu_mode_dumb_mmap(struct drm_file *filp, + * Synchronization + */ + struct amdgpu_sync { +- struct fence *sync_to[AMDGPU_MAX_RINGS]; + DECLARE_HASHTABLE(fences, 4); + struct fence *last_vm_update; + }; +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c +index 7f12a4d..1d348f8 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c +@@ -46,11 +46,6 @@ struct amdgpu_sync_entry { + */ + void amdgpu_sync_create(struct amdgpu_sync *sync) + { +- unsigned i; +- +- for (i = 0; i < AMDGPU_MAX_RINGS; ++i) +- sync->sync_to[i] = NULL; +- + hash_init(sync->fences); + sync->last_vm_update = NULL; + } +@@ -104,7 +99,6 @@ int amdgpu_sync_fence(struct amdgpu_device *adev, struct amdgpu_sync *sync, + struct fence *f) + { + struct amdgpu_sync_entry *e; +- struct amdgpu_fence *fence; + + if (!f) + return 0; +@@ -113,27 +107,20 @@ int amdgpu_sync_fence(struct amdgpu_device *adev, struct amdgpu_sync *sync, + amdgpu_sync_test_owner(f, AMDGPU_FENCE_OWNER_VM)) + amdgpu_sync_keep_later(&sync->last_vm_update, f); + +- fence = to_amdgpu_fence(f); +- if (!fence || fence->ring->adev != adev) { +- hash_for_each_possible(sync->fences, e, node, f->context) { +- if (unlikely(e->fence->context != f->context)) +- continue; +- +- amdgpu_sync_keep_later(&e->fence, f); +- return 0; +- } +- +- e = kmalloc(sizeof(struct amdgpu_sync_entry), GFP_KERNEL); +- if (!e) +- return -ENOMEM; ++ hash_for_each_possible(sync->fences, e, node, f->context) { ++ if (unlikely(e->fence->context != f->context)) ++ continue; + +- hash_add(sync->fences, &e->node, f->context); +- e->fence = fence_get(f); ++ amdgpu_sync_keep_later(&e->fence, f); + return 0; + } + +- amdgpu_sync_keep_later(&sync->sync_to[fence->ring->idx], f); ++ e = kmalloc(sizeof(struct amdgpu_sync_entry), GFP_KERNEL); ++ if (!e) ++ return -ENOMEM; + ++ hash_add(sync->fences, &e->node, f->context); ++ e->fence = fence_get(f); + return 0; + } + +@@ -247,16 +234,6 @@ int amdgpu_sync_wait(struct amdgpu_sync *sync) + kfree(e); + } + +- for (i = 0; i < AMDGPU_MAX_RINGS; ++i) { +- struct fence *fence = sync->sync_to[i]; +- if (!fence) +- continue; +- +- r = fence_wait(fence, false); +- if (r) +- return r; +- } +- + return 0; + } + +@@ -283,8 +260,5 @@ void amdgpu_sync_free(struct amdgpu_device *adev, + kfree(e); + } + +- for (i = 0; i < AMDGPU_MAX_RINGS; ++i) +- fence_put(sync->sync_to[i]); +- + fence_put(sync->last_vm_update); + } +-- +2.7.4 + |