diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3972-drm-amdkfd-Record-vmid-pasid-mapping-in-the-driver-f.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3972-drm-amdkfd-Record-vmid-pasid-mapping-in-the-driver-f.patch | 113 |
1 files changed, 113 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3972-drm-amdkfd-Record-vmid-pasid-mapping-in-the-driver-f.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3972-drm-amdkfd-Record-vmid-pasid-mapping-in-the-driver-f.patch new file mode 100644 index 00000000..71130291 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3972-drm-amdkfd-Record-vmid-pasid-mapping-in-the-driver-f.patch @@ -0,0 +1,113 @@ +From 45839c019bcc30a3af67f4df0bf12d090fdc25b2 Mon Sep 17 00:00:00 2001 +From: Yong Zhao <Yong.Zhao@amd.com> +Date: Wed, 25 Sep 2019 23:49:46 -0400 +Subject: [PATCH 3972/4256] drm/amdkfd: Record vmid pasid mapping in the driver + for non HWS mode + +This makes possible the vmid pasid mapping query through software. + +Change-Id: Ib539aae277a227cc39f6469ae23c46c4d289b87b +Signed-off-by: Yong Zhao <Yong.Zhao@amd.com> +Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com> +--- + .../drm/amd/amdkfd/kfd_device_queue_manager.c | 33 ++++++++++++------- + .../drm/amd/amdkfd/kfd_device_queue_manager.h | 4 ++- + 2 files changed, 24 insertions(+), 13 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +index 10e49a9cbcfa..437a9d28b5c2 100644 +--- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +@@ -224,20 +224,30 @@ static int allocate_vmid(struct device_queue_manager *dqm, + struct qcm_process_device *qpd, + struct queue *q) + { +- int bit, allocated_vmid; ++ int allocated_vmid = -1, i; + +- if (dqm->vmid_bitmap == 0) +- return -ENOMEM; ++ for (i = dqm->dev->vm_info.first_vmid_kfd; ++ i <= dqm->dev->vm_info.last_vmid_kfd; i++) { ++ if (!dqm->vmid_pasid[i]) { ++ allocated_vmid = i; ++ break; ++ } ++ } ++ ++ if (allocated_vmid < 0) { ++ pr_err("no more vmid to allocate\n"); ++ return -ENOSPC; ++ } ++ ++ pr_debug("vmid allocated: %d\n", allocated_vmid); ++ ++ dqm->vmid_pasid[allocated_vmid] = q->process->pasid; + +- bit = ffs(dqm->vmid_bitmap) - 1; +- dqm->vmid_bitmap &= ~(1 << bit); ++ set_pasid_vmid_mapping(dqm, q->process->pasid, allocated_vmid); + +- allocated_vmid = bit + dqm->dev->vm_info.first_vmid_kfd; +- pr_debug("vmid allocation %d\n", allocated_vmid); + qpd->vmid = allocated_vmid; + q->properties.vmid = allocated_vmid; + +- set_pasid_vmid_mapping(dqm, q->process->pasid, q->properties.vmid); + program_sh_mem_settings(dqm, qpd); + + /* qpd->page_table_base is set earlier when register_process() +@@ -278,8 +288,6 @@ static void deallocate_vmid(struct device_queue_manager *dqm, + struct qcm_process_device *qpd, + struct queue *q) + { +- int bit = qpd->vmid - dqm->dev->vm_info.first_vmid_kfd; +- + /* On GFX v7, CP doesn't flush TC at dequeue */ + if (q->device->device_info->asic_family == CHIP_HAWAII) + if (flush_texture_cache_nocpsch(q->device, qpd)) +@@ -289,8 +297,8 @@ static void deallocate_vmid(struct device_queue_manager *dqm, + + /* Release the vmid mapping */ + set_pasid_vmid_mapping(dqm, 0, qpd->vmid); ++ dqm->vmid_pasid[qpd->vmid] = 0; + +- dqm->vmid_bitmap |= (1 << bit); + qpd->vmid = 0; + q->properties.vmid = 0; + } +@@ -1007,7 +1015,8 @@ static int initialize_nocpsch(struct device_queue_manager *dqm) + dqm->allocated_queues[pipe] |= 1 << queue; + } + +- dqm->vmid_bitmap = (1 << dqm->dev->vm_info.vmid_num_kfd) - 1; ++ memset(dqm->vmid_pasid, 0, sizeof(dqm->vmid_pasid)); ++ + dqm->sdma_bitmap = ~0ULL >> (64 - get_num_sdma_queues(dqm)); + dqm->xgmi_sdma_bitmap = ~0ULL >> (64 - get_num_xgmi_sdma_queues(dqm)); + +diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h +index eed8f950b663..48e3b89e27c3 100644 +--- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h +@@ -33,6 +33,7 @@ + + + #define USE_DEFAULT_GRACE_PERIOD 0xffffffff ++#define VMID_NUM 16 + + struct device_process_node { + struct qcm_process_device *qpd; +@@ -188,7 +189,8 @@ struct device_queue_manager { + unsigned int *allocated_queues; + uint64_t sdma_bitmap; + uint64_t xgmi_sdma_bitmap; +- unsigned int vmid_bitmap; ++ /* the pasid mapping for each kfd vmid */ ++ uint16_t vmid_pasid[VMID_NUM]; + uint64_t pipelines_addr; + struct kfd_mem_obj *pipeline_mem; + uint64_t fence_gpu_addr; +-- +2.17.1 + |