From 84c5489f3955d811f936696d1062a3302af5aa5a Mon Sep 17 00:00:00 2001 From: Philip Yang Date: Fri, 10 Sep 2021 10:45:42 -0400 Subject: [PATCH] Revert "libhsakmt: Fix deadlock in map_mmio" This reverts commit 559bb50c6a7df06591d27275b9bcd7b211f8cfa4. Change-Id: Ibd32ac36bcb9ee418957d25b240ef9dd9172fbd3 Signed-off-by: Philip Yang [ROCm/ROCR-Runtime commit: 91b0fce53563c52c8e0d217765c39c5bf0cb685e] --- projects/rocr-runtime/src/fmm.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/projects/rocr-runtime/src/fmm.c b/projects/rocr-runtime/src/fmm.c index 420b6e0483..3b7f18af31 100644 --- a/projects/rocr-runtime/src/fmm.c +++ b/projects/rocr-runtime/src/fmm.c @@ -2095,10 +2095,8 @@ static void *map_mmio(uint32_t node_id, uint32_t gpu_id, int mmap_fd) mem = __fmm_allocate_device(gpu_id, NULL, PAGE_SIZE, aperture, &mmap_offset, ioc_flags, &vm_obj); - if (!mem || !vm_obj) { - pthread_mutex_unlock(&aperture->fmm_mutex); + if (!mem || !vm_obj) return NULL; - } mflags.Value = 0; mflags.ui32.NonPaged = 1;