diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2771-drm-amdkfd-Update-GetQueueInfo.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2771-drm-amdkfd-Update-GetQueueInfo.patch | 105 |
1 files changed, 105 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2771-drm-amdkfd-Update-GetQueueInfo.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2771-drm-amdkfd-Update-GetQueueInfo.patch new file mode 100644 index 00000000..aaac325e --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2771-drm-amdkfd-Update-GetQueueInfo.patch @@ -0,0 +1,105 @@ +From f94c890dea7a6a89c6d9875bc90ad7b8222050e9 Mon Sep 17 00:00:00 2001 +From: Philip Cox <Philip.Cox@amd.com> +Date: Thu, 11 Apr 2019 11:52:52 -0400 +Subject: [PATCH 2771/2940] drm/amdkfd: Update GetQueueInfo + +GetQueueInfoneeds control stack size, and wave state size, as well as +their offsets. Update to support the new GetQueueInfo thunk changes. + +Change-Id: I35daad0c412f38fe6087d3835cd07daaae1814d8 +Signed-off-by: Philip Cox <Philip.Cox@amd.com> +--- + .../gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 59 ++++++++++++------- + 1 file changed, 38 insertions(+), 21 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c +index c53c7e5ce608..2cb0aaaf4e3b 100644 +--- a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c +@@ -335,17 +335,38 @@ static bool is_occupied(struct mqd_manager *mm, void *mqd, + pipe_id, queue_id); + } + ++struct user_context_save_area_header { ++ /* Byte offset from start of user context ++ * save area to the last saved top (lowest ++ * address) of control stack data. Must be ++ * 4 byte aligned. ++ */ ++ uint32_t control_stack_offset; ++ ++ /* Byte size of the last saved control stack ++ * data. Must be 4 byte aligned. ++ */ ++ uint32_t control_stack_size; ++ ++ /* Byte offset from start of user context save ++ * area to the last saved base (lowest address) ++ * of wave state data. Must be 4 byte aligned. ++ */ ++ uint32_t wave_state_offset; ++ ++ /* Byte size of the last saved wave state data. ++ * Must be 4 byte aligned. ++ */ ++ uint32_t wave_state_size; ++}; ++ + static int get_wave_state(struct mqd_manager *mm, void *mqd, + void __user *ctl_stack, + u32 *ctl_stack_used_size, + u32 *save_area_used_size) + { +- void __user *user_data_ptr; + struct v9_mqd *m; +- struct { +- uint32_t ctl_stack_size; +- uint32_t save_area_size; +- } user_data; ++ struct user_context_save_area_header header; + + /* Control stack is located one page after MQD. */ + void *mqd_ctl_stack = (void *)((uintptr_t)mqd + PAGE_SIZE); +@@ -353,27 +374,23 @@ static int get_wave_state(struct mqd_manager *mm, void *mqd, + m = get_mqd(mqd); + + *ctl_stack_used_size = m->cp_hqd_cntl_stack_size - +- m->cp_hqd_cntl_stack_offset + sizeof(user_data); ++ m->cp_hqd_cntl_stack_offset; + *save_area_used_size = m->cp_hqd_wg_state_offset - + m->cp_hqd_cntl_stack_size; + +- /* To avoid breaking existing tools reading the control stack, +- * set the IS_EVENT and IS_STATE bits to the sizes so that they +- * are ignored if read as COMPUTE_RELAUNCH register. +- */ +- user_data.ctl_stack_size = 0xC0000000 | *ctl_stack_used_size; +- user_data.save_area_size = 0xC0000000 | *save_area_used_size; ++ header.control_stack_size = *ctl_stack_used_size; ++ header.wave_state_size = *save_area_used_size; + +- /* The user ctl_stack_size and save_area size are located +- * right below the start of the context save area. +- */ +- user_data_ptr = (void __user *)((uintptr_t)ctl_stack +- + m->cp_hqd_cntl_stack_size - sizeof(user_data)); ++ header.wave_state_offset = m->cp_hqd_wg_state_offset + sizeof(header); ++ header.control_stack_offset = m->cp_hqd_cntl_stack_offset; ++ ++ if (copy_to_user(ctl_stack, &header, sizeof(header))) ++ return -EFAULT; ++ ++ if (copy_to_user(ctl_stack + m->cp_hqd_cntl_stack_offset, ++ mqd_ctl_stack + m->cp_hqd_cntl_stack_offset, ++ *ctl_stack_used_size)) + +- if (copy_to_user(ctl_stack, +- (void *)((uintptr_t) mqd_ctl_stack + sizeof(user_data)), +- m->cp_hqd_cntl_stack_size - sizeof(user_data)) +- || copy_to_user(user_data_ptr, &user_data, sizeof(user_data))) + return -EFAULT; + + return 0; +-- +2.17.1 + |