]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
drm/amdkfd: Added MQD manager files for GFX12.
authorDavid Belanger <david.belanger@amd.com>
Tue, 16 May 2023 16:25:02 +0000 (12:25 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Thu, 2 May 2024 20:18:12 +0000 (16:18 -0400)
Initial implementation, based on GFX11.

v2: Removed dbg_wa code as not needed on GFX12.
v3: squash in SDMA queue fixes (Alex)
v4: rebase (Alex)

Signed-off-by: David Belanger <david.belanger@amd.com>
Reviewed-by: Harish Kasiviswanathan <Harish.Kasiviswanathan@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdkfd/Makefile
drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c
drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v12.c [new file with mode: 0644]
drivers/gpu/drm/amd/amdkfd/kfd_priv.h
drivers/gpu/drm/amd/include/v12_structs.h

index a5ae7bcf44eb85c01fbc67bbb43cd90f9945a895..f0d9eebf242b6918a3f12149a819b96e50f7eac5 100644 (file)
@@ -38,6 +38,7 @@ AMDKFD_FILES  := $(AMDKFD_PATH)/kfd_module.o \
                $(AMDKFD_PATH)/kfd_mqd_manager_v9.o \
                $(AMDKFD_PATH)/kfd_mqd_manager_v10.o \
                $(AMDKFD_PATH)/kfd_mqd_manager_v11.o \
+               $(AMDKFD_PATH)/kfd_mqd_manager_v12.o \
                $(AMDKFD_PATH)/kfd_kernel_queue.o \
                $(AMDKFD_PATH)/kfd_packet_manager.o \
                $(AMDKFD_PATH)/kfd_packet_manager_vi.o \
index 8746a61a852dc230d3c84a843f96478c4cd7bead..ccfa5a0a8f6bc9f9b547676c63d5d0529dcf73ca 100644 (file)
@@ -129,7 +129,7 @@ void mqd_symmetrically_map_cu_mask(struct mqd_manager *mm,
        }
 
        cu_bitmap_sh_mul = (KFD_GC_VERSION(mm->dev) >= IP_VERSION(11, 0, 0) &&
-                           KFD_GC_VERSION(mm->dev) < IP_VERSION(12, 0, 0)) ? 2 : 1;
+                           KFD_GC_VERSION(mm->dev) < IP_VERSION(13, 0, 0)) ? 2 : 1;
 
        /* Count active CUs per SH.
         *
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v12.c b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v12.c
new file mode 100644 (file)
index 0000000..4d786b5
--- /dev/null
@@ -0,0 +1,447 @@
+// SPDX-License-Identifier: GPL-2.0 OR MIT
+/*
+ * Copyright 2023 Advanced Micro Devices, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+
+#include <linux/printk.h>
+#include <linux/slab.h>
+#include <linux/uaccess.h>
+#include "kfd_priv.h"
+#include "kfd_mqd_manager.h"
+#include "v12_structs.h"
+#include "gc/gc_12_0_0_sh_mask.h"
+#include "amdgpu_amdkfd.h"
+
+static inline struct v12_compute_mqd *get_mqd(void *mqd)
+{
+       return (struct v12_compute_mqd *)mqd;
+}
+
+static inline struct v12_sdma_mqd *get_sdma_mqd(void *mqd)
+{
+       return (struct v12_sdma_mqd *)mqd;
+}
+
+static void update_cu_mask(struct mqd_manager *mm, void *mqd,
+                          struct mqd_update_info *minfo)
+{
+       struct v12_compute_mqd *m;
+       uint32_t se_mask[KFD_MAX_NUM_SE] = {0};
+
+       if (!minfo || !minfo->cu_mask.ptr)
+               return;
+
+       mqd_symmetrically_map_cu_mask(mm,
+               minfo->cu_mask.ptr, minfo->cu_mask.count, se_mask, 0);
+
+       m = get_mqd(mqd);
+       m->compute_static_thread_mgmt_se0 = se_mask[0];
+       m->compute_static_thread_mgmt_se1 = se_mask[1];
+       m->compute_static_thread_mgmt_se2 = se_mask[2];
+       m->compute_static_thread_mgmt_se3 = se_mask[3];
+       m->compute_static_thread_mgmt_se4 = se_mask[4];
+       m->compute_static_thread_mgmt_se5 = se_mask[5];
+       m->compute_static_thread_mgmt_se6 = se_mask[6];
+       m->compute_static_thread_mgmt_se7 = se_mask[7];
+
+       pr_debug("update cu mask to %#x %#x %#x %#x %#x %#x %#x %#x\n",
+               m->compute_static_thread_mgmt_se0,
+               m->compute_static_thread_mgmt_se1,
+               m->compute_static_thread_mgmt_se2,
+               m->compute_static_thread_mgmt_se3,
+               m->compute_static_thread_mgmt_se4,
+               m->compute_static_thread_mgmt_se5,
+               m->compute_static_thread_mgmt_se6,
+               m->compute_static_thread_mgmt_se7);
+}
+
+static void set_priority(struct v12_compute_mqd *m, struct queue_properties *q)
+{
+       m->cp_hqd_pipe_priority = pipe_priority_map[q->priority];
+       m->cp_hqd_queue_priority = q->priority;
+}
+
+static struct kfd_mem_obj *allocate_mqd(struct kfd_node *node,
+               struct queue_properties *q)
+{
+       struct kfd_mem_obj *mqd_mem_obj;
+
+       /*
+        * Allocate one PAGE_SIZE memory for MQD as MES writes to areas beyond
+        * struct MQD size.
+        */
+       if (kfd_gtt_sa_allocate(node, PAGE_SIZE, &mqd_mem_obj))
+               return NULL;
+
+       return mqd_mem_obj;
+}
+
+static void init_mqd(struct mqd_manager *mm, void **mqd,
+                       struct kfd_mem_obj *mqd_mem_obj, uint64_t *gart_addr,
+                       struct queue_properties *q)
+{
+       uint64_t addr;
+       struct v12_compute_mqd *m;
+
+       m = (struct v12_compute_mqd *) mqd_mem_obj->cpu_ptr;
+       addr = mqd_mem_obj->gpu_addr;
+
+       memset(m, 0, PAGE_SIZE);
+
+       m->header = 0xC0310800;
+       m->compute_pipelinestat_enable = 1;
+       m->compute_static_thread_mgmt_se0 = 0xFFFFFFFF;
+       m->compute_static_thread_mgmt_se1 = 0xFFFFFFFF;
+       m->compute_static_thread_mgmt_se2 = 0xFFFFFFFF;
+       m->compute_static_thread_mgmt_se3 = 0xFFFFFFFF;
+       m->compute_static_thread_mgmt_se4 = 0xFFFFFFFF;
+       m->compute_static_thread_mgmt_se5 = 0xFFFFFFFF;
+       m->compute_static_thread_mgmt_se6 = 0xFFFFFFFF;
+       m->compute_static_thread_mgmt_se7 = 0xFFFFFFFF;
+
+       m->cp_hqd_persistent_state = CP_HQD_PERSISTENT_STATE__PRELOAD_REQ_MASK |
+                       0x55 << CP_HQD_PERSISTENT_STATE__PRELOAD_SIZE__SHIFT;
+
+       m->cp_mqd_control = 1 << CP_MQD_CONTROL__PRIV_STATE__SHIFT;
+
+       m->cp_mqd_base_addr_lo        = lower_32_bits(addr);
+       m->cp_mqd_base_addr_hi        = upper_32_bits(addr);
+
+       m->cp_hqd_quantum = 1 << CP_HQD_QUANTUM__QUANTUM_EN__SHIFT |
+                       1 << CP_HQD_QUANTUM__QUANTUM_SCALE__SHIFT |
+                       1 << CP_HQD_QUANTUM__QUANTUM_DURATION__SHIFT;
+
+       /* Set cp_hqd_hq_status0.c_queue_debug_en to 1 to have the CP set up the
+        * DISPATCH_PTR.  This is required for the kfd debugger
+        */
+       m->cp_hqd_hq_status0 = 1 << 14;
+
+       if (q->format == KFD_QUEUE_FORMAT_AQL) {
+               m->cp_hqd_aql_control =
+                       1 << CP_HQD_AQL_CONTROL__CONTROL0__SHIFT;
+       }
+
+       if (mm->dev->kfd->cwsr_enabled) {
+               m->cp_hqd_persistent_state |=
+                       (1 << CP_HQD_PERSISTENT_STATE__QSWITCH_MODE__SHIFT);
+               m->cp_hqd_ctx_save_base_addr_lo =
+                       lower_32_bits(q->ctx_save_restore_area_address);
+               m->cp_hqd_ctx_save_base_addr_hi =
+                       upper_32_bits(q->ctx_save_restore_area_address);
+               m->cp_hqd_ctx_save_size = q->ctx_save_restore_area_size;
+               m->cp_hqd_cntl_stack_size = q->ctl_stack_size;
+               m->cp_hqd_cntl_stack_offset = q->ctl_stack_size;
+               m->cp_hqd_wg_state_offset = q->ctl_stack_size;
+       }
+
+       *mqd = m;
+       if (gart_addr)
+               *gart_addr = addr;
+       mm->update_mqd(mm, m, q, NULL);
+}
+
+static int load_mqd(struct mqd_manager *mm, void *mqd,
+                       uint32_t pipe_id, uint32_t queue_id,
+                       struct queue_properties *p, struct mm_struct *mms)
+{
+       int r = 0;
+       /* AQL write pointer counts in 64B packets, PM4/CP counts in dwords. */
+       uint32_t wptr_shift = (p->format == KFD_QUEUE_FORMAT_AQL ? 4 : 0);
+
+       r = mm->dev->kfd2kgd->hqd_load(mm->dev->adev, mqd, pipe_id, queue_id,
+                                         (uint32_t __user *)p->write_ptr,
+                                         wptr_shift, 0, mms, 0);
+       return r;
+}
+
+static void update_mqd(struct mqd_manager *mm, void *mqd,
+                      struct queue_properties *q,
+                      struct mqd_update_info *minfo)
+{
+       struct v12_compute_mqd *m;
+
+       m = get_mqd(mqd);
+
+       m->cp_hqd_pq_control = 5 << CP_HQD_PQ_CONTROL__RPTR_BLOCK_SIZE__SHIFT;
+       m->cp_hqd_pq_control |=
+                       ffs(q->queue_size / sizeof(unsigned int)) - 1 - 1;
+       pr_debug("cp_hqd_pq_control 0x%x\n", m->cp_hqd_pq_control);
+
+       m->cp_hqd_pq_base_lo = lower_32_bits((uint64_t)q->queue_address >> 8);
+       m->cp_hqd_pq_base_hi = upper_32_bits((uint64_t)q->queue_address >> 8);
+
+       m->cp_hqd_pq_rptr_report_addr_lo = lower_32_bits((uint64_t)q->read_ptr);
+       m->cp_hqd_pq_rptr_report_addr_hi = upper_32_bits((uint64_t)q->read_ptr);
+       m->cp_hqd_pq_wptr_poll_addr_lo = lower_32_bits((uint64_t)q->write_ptr);
+       m->cp_hqd_pq_wptr_poll_addr_hi = upper_32_bits((uint64_t)q->write_ptr);
+
+       m->cp_hqd_pq_doorbell_control =
+               q->doorbell_off <<
+                       CP_HQD_PQ_DOORBELL_CONTROL__DOORBELL_OFFSET__SHIFT;
+       pr_debug("cp_hqd_pq_doorbell_control 0x%x\n",
+                       m->cp_hqd_pq_doorbell_control);
+
+       m->cp_hqd_ib_control = 3 << CP_HQD_IB_CONTROL__MIN_IB_AVAIL_SIZE__SHIFT;
+
+       /*
+        * HW does not clamp this field correctly. Maximum EOP queue size
+        * is constrained by per-SE EOP done signal count, which is 8-bit.
+        * Limit is 0xFF EOP entries (= 0x7F8 dwords). CP will not submit
+        * more than (EOP entry count - 1) so a queue size of 0x800 dwords
+        * is safe, giving a maximum field value of 0xA.
+        */
+       m->cp_hqd_eop_control = min(0xA,
+               ffs(q->eop_ring_buffer_size / sizeof(unsigned int)) - 1 - 1);
+       m->cp_hqd_eop_base_addr_lo =
+                       lower_32_bits(q->eop_ring_buffer_address >> 8);
+       m->cp_hqd_eop_base_addr_hi =
+                       upper_32_bits(q->eop_ring_buffer_address >> 8);
+
+       m->cp_hqd_iq_timer = 0;
+
+       m->cp_hqd_vmid = q->vmid;
+
+       if (q->format == KFD_QUEUE_FORMAT_AQL) {
+               /* GC 10 removed WPP_CLAMP from PQ Control */
+               m->cp_hqd_pq_control |= CP_HQD_PQ_CONTROL__NO_UPDATE_RPTR_MASK |
+                               2 << CP_HQD_PQ_CONTROL__SLOT_BASED_WPTR__SHIFT |
+                               1 << CP_HQD_PQ_CONTROL__QUEUE_FULL_EN__SHIFT;
+               m->cp_hqd_pq_doorbell_control |=
+                       1 << CP_HQD_PQ_DOORBELL_CONTROL__DOORBELL_BIF_DROP__SHIFT;
+       }
+       if (mm->dev->kfd->cwsr_enabled)
+               m->cp_hqd_ctx_save_control = 0;
+
+       update_cu_mask(mm, mqd, minfo);
+       set_priority(m, q);
+
+       q->is_active = QUEUE_IS_ACTIVE(*q);
+}
+
+static bool check_preemption_failed(struct mqd_manager *mm, void *mqd)
+{
+       struct v12_compute_mqd *m = (struct v12_compute_mqd *)mqd;
+
+       return kfd_check_hiq_mqd_doorbell_id(mm->dev, m->queue_doorbell_id0, 0);
+}
+
+static int get_wave_state(struct mqd_manager *mm, void *mqd,
+                         struct queue_properties *q,
+                         void __user *ctl_stack,
+                         u32 *ctl_stack_used_size,
+                         u32 *save_area_used_size)
+{
+       struct v12_compute_mqd *m;
+       struct mqd_user_context_save_area_header header;
+
+       m = get_mqd(mqd);
+
+       /* Control stack is written backwards, while workgroup context data
+        * is written forwards. Both starts from m->cp_hqd_cntl_stack_size.
+        * Current position is at m->cp_hqd_cntl_stack_offset and
+        * m->cp_hqd_wg_state_offset, respectively.
+        */
+       *ctl_stack_used_size = m->cp_hqd_cntl_stack_size -
+               m->cp_hqd_cntl_stack_offset;
+       *save_area_used_size = m->cp_hqd_wg_state_offset -
+               m->cp_hqd_cntl_stack_size;
+
+       /* Control stack is not copied to user mode for GFXv12 because
+        * it's part of the context save area that is already
+        * accessible to user mode
+        */
+       header.control_stack_size = *ctl_stack_used_size;
+       header.wave_state_size = *save_area_used_size;
+
+       header.wave_state_offset = m->cp_hqd_wg_state_offset;
+       header.control_stack_offset = m->cp_hqd_cntl_stack_offset;
+
+       if (copy_to_user(ctl_stack, &header, sizeof(header)))
+               return -EFAULT;
+
+       return 0;
+}
+
+static void init_mqd_hiq(struct mqd_manager *mm, void **mqd,
+                       struct kfd_mem_obj *mqd_mem_obj, uint64_t *gart_addr,
+                       struct queue_properties *q)
+{
+       struct v12_compute_mqd *m;
+
+       init_mqd(mm, mqd, mqd_mem_obj, gart_addr, q);
+
+       m = get_mqd(*mqd);
+
+       m->cp_hqd_pq_control |= 1 << CP_HQD_PQ_CONTROL__PRIV_STATE__SHIFT |
+                       1 << CP_HQD_PQ_CONTROL__KMD_QUEUE__SHIFT;
+}
+
+static void init_mqd_sdma(struct mqd_manager *mm, void **mqd,
+               struct kfd_mem_obj *mqd_mem_obj, uint64_t *gart_addr,
+               struct queue_properties *q)
+{
+       struct v12_sdma_mqd *m;
+
+       m = (struct v12_sdma_mqd *) mqd_mem_obj->cpu_ptr;
+
+       memset(m, 0, sizeof(struct v12_sdma_mqd));
+
+       *mqd = m;
+       if (gart_addr)
+               *gart_addr = mqd_mem_obj->gpu_addr;
+
+       mm->update_mqd(mm, m, q, NULL);
+}
+
+#define SDMA_RLC_DUMMY_DEFAULT 0xf
+
+static void update_mqd_sdma(struct mqd_manager *mm, void *mqd,
+               struct queue_properties *q,
+               struct mqd_update_info *minfo)
+{
+       struct v12_sdma_mqd *m;
+
+       m = get_sdma_mqd(mqd);
+       m->sdmax_rlcx_rb_cntl = (ffs(q->queue_size / sizeof(unsigned int)) - 1)
+               << SDMA0_QUEUE0_RB_CNTL__RB_SIZE__SHIFT |
+               q->vmid << SDMA0_QUEUE0_RB_CNTL__RB_VMID__SHIFT |
+               1 << SDMA0_QUEUE0_RB_CNTL__RPTR_WRITEBACK_ENABLE__SHIFT |
+               6 << SDMA0_QUEUE0_RB_CNTL__RPTR_WRITEBACK_TIMER__SHIFT |
+               1 << SDMA0_QUEUE0_RB_CNTL__MCU_WPTR_POLL_ENABLE__SHIFT;
+
+       m->sdmax_rlcx_rb_base = lower_32_bits(q->queue_address >> 8);
+       m->sdmax_rlcx_rb_base_hi = upper_32_bits(q->queue_address >> 8);
+       m->sdmax_rlcx_rb_rptr_addr_lo = lower_32_bits((uint64_t)q->read_ptr);
+       m->sdmax_rlcx_rb_rptr_addr_hi = upper_32_bits((uint64_t)q->read_ptr);
+       m->sdmax_rlcx_rb_wptr_poll_addr_lo = lower_32_bits((uint64_t)q->write_ptr);
+       m->sdmax_rlcx_rb_wptr_poll_addr_hi = upper_32_bits((uint64_t)q->write_ptr);
+       m->sdmax_rlcx_doorbell_offset =
+               q->doorbell_off << SDMA0_QUEUE0_DOORBELL_OFFSET__OFFSET__SHIFT;
+
+       m->sdma_engine_id = q->sdma_engine_id;
+       m->sdma_queue_id = q->sdma_queue_id;
+
+       m->sdmax_rlcx_dummy_reg = SDMA_RLC_DUMMY_DEFAULT;
+
+       q->is_active = QUEUE_IS_ACTIVE(*q);
+}
+
+#if defined(CONFIG_DEBUG_FS)
+
+static int debugfs_show_mqd(struct seq_file *m, void *data)
+{
+       seq_hex_dump(m, "    ", DUMP_PREFIX_OFFSET, 32, 4,
+                    data, sizeof(struct v12_compute_mqd), false);
+       return 0;
+}
+
+static int debugfs_show_mqd_sdma(struct seq_file *m, void *data)
+{
+       seq_hex_dump(m, "    ", DUMP_PREFIX_OFFSET, 32, 4,
+                    data, sizeof(struct v12_sdma_mqd), false);
+       return 0;
+}
+
+#endif
+
+struct mqd_manager *mqd_manager_init_v12(enum KFD_MQD_TYPE type,
+               struct kfd_node *dev)
+{
+       struct mqd_manager *mqd;
+
+       if (WARN_ON(type >= KFD_MQD_TYPE_MAX))
+               return NULL;
+
+       mqd = kzalloc(sizeof(*mqd), GFP_KERNEL);
+       if (!mqd)
+               return NULL;
+
+       mqd->dev = dev;
+
+       switch (type) {
+       case KFD_MQD_TYPE_CP:
+               pr_debug("%s@%i\n", __func__, __LINE__);
+               mqd->allocate_mqd = allocate_mqd;
+               mqd->init_mqd = init_mqd;
+               mqd->free_mqd = kfd_free_mqd_cp;
+               mqd->load_mqd = load_mqd;
+               mqd->update_mqd = update_mqd;
+               mqd->destroy_mqd = kfd_destroy_mqd_cp;
+               mqd->is_occupied = kfd_is_occupied_cp;
+               mqd->mqd_size = sizeof(struct v12_compute_mqd);
+               mqd->get_wave_state = get_wave_state;
+#if defined(CONFIG_DEBUG_FS)
+               mqd->debugfs_show_mqd = debugfs_show_mqd;
+#endif
+               pr_debug("%s@%i\n", __func__, __LINE__);
+               break;
+       case KFD_MQD_TYPE_HIQ:
+               pr_debug("%s@%i\n", __func__, __LINE__);
+               mqd->allocate_mqd = allocate_hiq_mqd;
+               mqd->init_mqd = init_mqd_hiq;
+               mqd->free_mqd = free_mqd_hiq_sdma;
+               mqd->load_mqd = kfd_hiq_load_mqd_kiq;
+               mqd->update_mqd = update_mqd;
+               mqd->destroy_mqd = kfd_destroy_mqd_cp;
+               mqd->is_occupied = kfd_is_occupied_cp;
+               mqd->mqd_size = sizeof(struct v12_compute_mqd);
+#if defined(CONFIG_DEBUG_FS)
+               mqd->debugfs_show_mqd = debugfs_show_mqd;
+#endif
+               mqd->check_preemption_failed = check_preemption_failed;
+               pr_debug("%s@%i\n", __func__, __LINE__);
+               break;
+       case KFD_MQD_TYPE_DIQ:
+               mqd->allocate_mqd = allocate_mqd;
+               mqd->init_mqd = init_mqd_hiq;
+               mqd->free_mqd = kfd_free_mqd_cp;
+               mqd->load_mqd = load_mqd;
+               mqd->update_mqd = update_mqd;
+               mqd->destroy_mqd = kfd_destroy_mqd_cp;
+               mqd->is_occupied = kfd_is_occupied_cp;
+               mqd->mqd_size = sizeof(struct v12_compute_mqd);
+#if defined(CONFIG_DEBUG_FS)
+               mqd->debugfs_show_mqd = debugfs_show_mqd;
+#endif
+               break;
+       case KFD_MQD_TYPE_SDMA:
+               pr_debug("%s@%i\n", __func__, __LINE__);
+               mqd->allocate_mqd = allocate_mqd;
+               mqd->init_mqd = init_mqd_sdma;
+               mqd->free_mqd = kfd_free_mqd_cp;
+               mqd->load_mqd = kfd_load_mqd_sdma;
+               mqd->update_mqd = update_mqd_sdma;
+               mqd->destroy_mqd = kfd_destroy_mqd_sdma;
+               mqd->is_occupied = kfd_is_occupied_sdma;
+               mqd->mqd_size = sizeof(struct v12_sdma_mqd);
+#if defined(CONFIG_DEBUG_FS)
+               mqd->debugfs_show_mqd = debugfs_show_mqd_sdma;
+#endif
+               pr_debug("%s@%i\n", __func__, __LINE__);
+               break;
+       default:
+               kfree(mqd);
+               return NULL;
+       }
+
+       return mqd;
+}
index e32ee963eeaba5b786b38c2eec2404f6dc95fafb..c51e908f6f192ffd4dc75a83c081d2b3045331fb 100644 (file)
@@ -1295,6 +1295,8 @@ struct mqd_manager *mqd_manager_init_v10(enum KFD_MQD_TYPE type,
                struct kfd_node *dev);
 struct mqd_manager *mqd_manager_init_v11(enum KFD_MQD_TYPE type,
                struct kfd_node *dev);
+struct mqd_manager *mqd_manager_init_v12(enum KFD_MQD_TYPE type,
+               struct kfd_node *dev);
 struct device_queue_manager *device_queue_manager_init(struct kfd_node *dev);
 void device_queue_manager_uninit(struct device_queue_manager *dqm);
 struct kernel_queue *kernel_queue_init(struct kfd_node *dev,
index acf096b5598f8116ad47f942dabe678f33f8119f..5eabab611b022d928ab8e4c7e2e9db8140e10f8d 100644 (file)
@@ -666,8 +666,9 @@ struct v12_sdma_mqd {
     uint32_t reserved_123; // offset: 123  (0x7B)
     uint32_t reserved_124; // offset: 124  (0x7C)
     uint32_t reserved_125; // offset: 125  (0x7D)
-    uint32_t reserved_126; // offset: 126  (0x7E)
-    uint32_t reserved_127; // offset: 127  (0x7F)
+       /* reserved_126,127: repurposed for driver-internal use */
+       uint32_t sdma_engine_id;
+       uint32_t sdma_queue_id;
 };
 
 struct v12_compute_mqd {