diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3046-drm-amdkfd-Replace-hardcoded-values-by-using-the-pro.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3046-drm-amdkfd-Replace-hardcoded-values-by-using-the-pro.patch | 74 |
1 files changed, 74 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3046-drm-amdkfd-Replace-hardcoded-values-by-using-the-pro.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3046-drm-amdkfd-Replace-hardcoded-values-by-using-the-pro.patch new file mode 100644 index 00000000..caf5578f --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3046-drm-amdkfd-Replace-hardcoded-values-by-using-the-pro.patch @@ -0,0 +1,74 @@ +From 8ea8496bf67e2fd67ec47cfa378a707a615be6cd Mon Sep 17 00:00:00 2001 +From: Yong Zhao <yong.zhao@amd.com> +Date: Wed, 20 Dec 2017 18:27:24 -0500 +Subject: [PATCH 3046/4131] drm/amdkfd: Replace hardcoded values by using the + proper function + +Change-Id: Ic83ddc5b61962adc5056fcaf0ab85b4c54bbec2f +Signed-off-by: Yong Zhao <yong.zhao@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c | 4 ++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 4 ++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 3 +-- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 1 + + 4 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c +index 0aef5dc..4faf452 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c +@@ -951,8 +951,8 @@ static void set_vm_context_page_table_base(struct kgd_dev *kgd, uint32_t vmid, + uint32_t page_table_base) + { + struct amdgpu_device *adev = get_amdgpu_device(kgd); +- /* TODO: Don't use hardcoded VMIDs */ +- if (vmid < 8 || vmid > 15) { ++ ++ if (!amdgpu_amdkfd_is_kfd_vmid(adev, vmid)) { + pr_err("trying to set page table base for wrong VMID\n"); + return; + } +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c +index a560f9a..6228dd8 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c +@@ -1016,8 +1016,8 @@ static void set_vm_context_page_table_base(struct kgd_dev *kgd, uint32_t vmid, + uint32_t page_table_base) + { + struct amdgpu_device *adev = get_amdgpu_device(kgd); +- /* TODO: Don't use hardcoded VMIDs */ +- if (vmid < 8 || vmid > 15) { ++ ++ if (!amdgpu_amdkfd_is_kfd_vmid(adev, vmid)) { + pr_err("trying to set page table base for wrong VMID\n"); + return; + } +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c +index 5793145..0f6b395 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c +@@ -1191,8 +1191,7 @@ static void set_vm_context_page_table_base(struct kgd_dev *kgd, uint32_t vmid, + uint64_t base = (uint64_t)page_table_base << PAGE_SHIFT | + AMDGPU_PTE_VALID; + +- /* TODO: Don't use hardcoded VMIDs */ +- if (vmid < 8 || vmid > 15) { ++ if (!amdgpu_amdkfd_is_kfd_vmid(adev, vmid)) { + pr_err("trying to set page table base for wrong VMID %u\n", + vmid); + return; +diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c b/drivers/gpu/drm/amd/amdkfd/kfd_device.c +index 36c8397..eeebaf4 100644 +--- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c +@@ -502,6 +502,7 @@ bool kgd2kfd_device_init(struct kfd_dev *kfd, + + kfd->shared_resources = *gpu_resources; + ++ /* Usually first_vmid_kfd = 8, last_vmid_kfd = 15 */ + kfd->vm_info.first_vmid_kfd = ffs(gpu_resources->compute_vmid_bitmap)-1; + kfd->vm_info.last_vmid_kfd = fls(gpu_resources->compute_vmid_bitmap)-1; + kfd->vm_info.vmid_num_kfd = kfd->vm_info.last_vmid_kfd +-- +2.7.4 + |