diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1802-drm-amdgpu-use-a-rw_semaphore-for-MMU-notifiers.patch')
-rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1802-drm-amdgpu-use-a-rw_semaphore-for-MMU-notifiers.patch | 126 |
1 files changed, 126 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1802-drm-amdgpu-use-a-rw_semaphore-for-MMU-notifiers.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1802-drm-amdgpu-use-a-rw_semaphore-for-MMU-notifiers.patch new file mode 100644 index 00000000..1146e2d8 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1802-drm-amdgpu-use-a-rw_semaphore-for-MMU-notifiers.patch @@ -0,0 +1,126 @@ +From 9d2a74fa9f590b409343d1d7193098713eef91e5 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com> +Date: Mon, 11 Sep 2017 18:19:39 -0400 +Subject: [PATCH 1802/4131] drm/amdgpu: use a rw_semaphore for MMU notifiers +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Allow at least some parallel processing. + +Signed-off-by: Christian König <christian.koenig@amd.com> +Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com> + + Conflicts: + drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c + +Change-Id: Ia2c13487a91dcf01c954632579d9b00fdae44c81 +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c | 22 +++++++++++----------- + 1 file changed, 11 insertions(+), 11 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c +index fb960ee..e30a101 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c +@@ -57,7 +57,7 @@ struct amdgpu_mn { + struct hlist_node node; + + /* objects protected by lock */ +- struct mutex lock; ++ struct rw_semaphore lock; + struct rb_root objects; + }; + +@@ -81,7 +81,7 @@ static void amdgpu_mn_destroy(struct work_struct *work) + struct amdgpu_bo *bo, *next_bo; + + mutex_lock(&adev->mn_lock); +- mutex_lock(&rmn->lock); ++ down_write(&rmn->lock); + hash_del(&rmn->node); + rbtree_postorder_for_each_entry_safe(node, next_node, &rmn->objects, + it.rb) { +@@ -91,7 +91,7 @@ static void amdgpu_mn_destroy(struct work_struct *work) + } + kfree(node); + } +- mutex_unlock(&rmn->lock); ++ up_write(&rmn->lock); + mutex_unlock(&adev->mn_lock); + mmu_notifier_unregister_no_release(&rmn->mn, rmn->mm); + kfree(rmn); +@@ -175,7 +175,7 @@ static void amdgpu_mn_invalidate_range_start_gfx(struct mmu_notifier *mn, + /* notification is exclusive, but interval is inclusive */ + end -= 1; + +- mutex_lock(&rmn->lock); ++ down_read(&rmn->lock); + + it = interval_tree_iter_first(&rmn->objects, start, end); + while (it) { +@@ -187,7 +187,7 @@ static void amdgpu_mn_invalidate_range_start_gfx(struct mmu_notifier *mn, + amdgpu_mn_invalidate_node(node, start, end); + } + +- mutex_unlock(&rmn->lock); ++ up_read(&rmn->lock); + } + + /** +@@ -298,7 +298,7 @@ static struct amdgpu_mn *amdgpu_mn_get(struct amdgpu_device *adev, + rmn->mm = mm; + rmn->type = type; + rmn->mn.ops = &amdgpu_mn_ops[type]; +- mutex_init(&rmn->lock); ++ init_rwsem(&rmn->lock); + rmn->objects = RB_ROOT; + + r = __mmu_notifier_register(&rmn->mn, mm); +@@ -347,7 +347,7 @@ int amdgpu_mn_register(struct amdgpu_bo *bo, unsigned long addr) + + INIT_LIST_HEAD(&bos); + +- mutex_lock(&rmn->lock); ++ down_write(&rmn->lock); + + while ((it = interval_tree_iter_first(&rmn->objects, addr, end))) { + kfree(node); +@@ -361,7 +361,7 @@ int amdgpu_mn_register(struct amdgpu_bo *bo, unsigned long addr) + if (!node) { + node = kmalloc(sizeof(struct amdgpu_mn_node), GFP_NOIO); + if (!node) { +- mutex_unlock(&rmn->lock); ++ up_write(&rmn->lock); + return -ENOMEM; + } + } +@@ -376,7 +376,7 @@ int amdgpu_mn_register(struct amdgpu_bo *bo, unsigned long addr) + + interval_tree_insert(&node->it, &rmn->objects); + +- mutex_unlock(&rmn->lock); ++ up_write(&rmn->lock); + + return 0; + } +@@ -402,7 +402,7 @@ void amdgpu_mn_unregister(struct amdgpu_bo *bo) + return; + } + +- mutex_lock(&rmn->lock); ++ down_write(&rmn->lock); + + /* save the next list entry for later */ + head = bo->mn_list.next; +@@ -417,6 +417,6 @@ void amdgpu_mn_unregister(struct amdgpu_bo *bo) + kfree(node); + } + +- mutex_unlock(&rmn->lock); ++ up_write(&rmn->lock); + mutex_unlock(&adev->mn_lock); + } +-- +2.7.4 + |