Signed-off-by: Shaoyun Liu <shaoyun....@amd.com>
Signed-off-by: Felix Kuehling <felix.kuehl...@amd.com>
---
 drivers/gpu/drm/amd/amdkfd/Makefile              |   7 +-
 drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_v9.c | 331 +++++++++++++
 drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_vi.c |  18 +-
 drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c  |   4 +
 drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers_ai.h  | 583 +++++++++++++++++++++++
 drivers/gpu/drm/amd/amdkfd/kfd_priv.h            |   6 +
 6 files changed, 937 insertions(+), 12 deletions(-)
 create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_v9.c
 create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers_ai.h

diff --git a/drivers/gpu/drm/amd/amdkfd/Makefile 
b/drivers/gpu/drm/amd/amdkfd/Makefile
index 0d02422..52b3c1b 100644
--- a/drivers/gpu/drm/amd/amdkfd/Makefile
+++ b/drivers/gpu/drm/amd/amdkfd/Makefile
@@ -31,9 +31,10 @@ amdkfd-y     := kfd_module.o kfd_device.o kfd_chardev.o 
kfd_topology.o \
                kfd_process.o kfd_queue.o kfd_mqd_manager.o \
                kfd_mqd_manager_cik.o kfd_mqd_manager_vi.o \
                kfd_kernel_queue.o kfd_kernel_queue_cik.o \
-               kfd_kernel_queue_vi.o kfd_packet_manager.o \
-               kfd_process_queue_manager.o kfd_device_queue_manager.o \
-               kfd_device_queue_manager_cik.o kfd_device_queue_manager_vi.o \
+               kfd_kernel_queue_vi.o kfd_kernel_queue_v9.o \
+               kfd_packet_manager.o kfd_process_queue_manager.o \
+               kfd_device_queue_manager.o kfd_device_queue_manager_cik.o \
+               kfd_device_queue_manager_vi.o \
                kfd_interrupt.o kfd_events.o cik_event_interrupt.o \
                kfd_dbgdev.o kfd_dbgmgr.o kfd_crat.o
 
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_v9.c 
b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_v9.c
new file mode 100644
index 0000000..ece7d59
--- /dev/null
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_v9.c
@@ -0,0 +1,331 @@
+/*
+ * Copyright 2016-2018 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 "kfd_kernel_queue.h"
+#include "kfd_device_queue_manager.h"
+#include "kfd_pm4_headers_ai.h"
+#include "kfd_pm4_opcodes.h"
+
+static bool initialize_v9(struct kernel_queue *kq, struct kfd_dev *dev,
+                       enum kfd_queue_type type, unsigned int queue_size);
+static void uninitialize_v9(struct kernel_queue *kq);
+
+void kernel_queue_init_v9(struct kernel_queue_ops *ops)
+{
+       ops->initialize = initialize_v9;
+       ops->uninitialize = uninitialize_v9;
+}
+
+static bool initialize_v9(struct kernel_queue *kq, struct kfd_dev *dev,
+                       enum kfd_queue_type type, unsigned int queue_size)
+{
+       int retval;
+
+       retval = kfd_gtt_sa_allocate(dev, PAGE_SIZE, &kq->eop_mem);
+       if (retval)
+               return false;
+
+       kq->eop_gpu_addr = kq->eop_mem->gpu_addr;
+       kq->eop_kernel_addr = kq->eop_mem->cpu_ptr;
+
+       memset(kq->eop_kernel_addr, 0, PAGE_SIZE);
+
+       return true;
+}
+
+static void uninitialize_v9(struct kernel_queue *kq)
+{
+       kfd_gtt_sa_free(kq->dev, kq->eop_mem);
+}
+
+static int pm_map_process_v9(struct packet_manager *pm,
+               uint32_t *buffer, struct qcm_process_device *qpd)
+{
+       struct pm4_mes_map_process *packet;
+       uint64_t vm_page_table_base_addr =
+               (uint64_t)(qpd->page_table_base) << 12;
+
+       packet = (struct pm4_mes_map_process *)buffer;
+       memset(buffer, 0, sizeof(struct pm4_mes_map_process));
+
+       packet->header.u32All = pm_build_pm4_header(IT_MAP_PROCESS,
+                                       sizeof(struct pm4_mes_map_process));
+       packet->bitfields2.diq_enable = (qpd->is_debug) ? 1 : 0;
+       packet->bitfields2.process_quantum = 1;
+       packet->bitfields2.pasid = qpd->pqm->process->pasid;
+       packet->bitfields14.gds_size = qpd->gds_size;
+       packet->bitfields14.num_gws = qpd->num_gws;
+       packet->bitfields14.num_oac = qpd->num_oac;
+       packet->bitfields14.sdma_enable = 1;
+       packet->bitfields14.num_queues = (qpd->is_debug) ? 0 : qpd->queue_count;
+
+       packet->sh_mem_config = qpd->sh_mem_config;
+       packet->sh_mem_bases = qpd->sh_mem_bases;
+       packet->sq_shader_tba_lo = lower_32_bits(qpd->tba_addr >> 8);
+       packet->sq_shader_tba_hi = upper_32_bits(qpd->tba_addr >> 8);
+       packet->sq_shader_tma_lo = lower_32_bits(qpd->tma_addr >> 8);
+       packet->sq_shader_tma_hi = upper_32_bits(qpd->tma_addr >> 8);
+
+       packet->gds_addr_lo = lower_32_bits(qpd->gds_context_area);
+       packet->gds_addr_hi = upper_32_bits(qpd->gds_context_area);
+
+       packet->vm_context_page_table_base_addr_lo32 =
+                       lower_32_bits(vm_page_table_base_addr);
+       packet->vm_context_page_table_base_addr_hi32 =
+                       upper_32_bits(vm_page_table_base_addr);
+
+       return 0;
+}
+
+static int pm_runlist_v9(struct packet_manager *pm, uint32_t *buffer,
+                       uint64_t ib, size_t ib_size_in_dwords, bool chain)
+{
+       struct pm4_mes_runlist *packet;
+
+       int concurrent_proc_cnt = 0;
+       struct kfd_dev *kfd = pm->dqm->dev;
+
+       /* Determine the number of processes to map together to HW:
+        * it can not exceed the number of VMIDs available to the
+        * scheduler, and it is determined by the smaller of the number
+        * of processes in the runlist and kfd module parameter
+        * hws_max_conc_proc.
+        * Note: the arbitration between the number of VMIDs and
+        * hws_max_conc_proc has been done in
+        * kgd2kfd_device_init().
+        */
+       concurrent_proc_cnt = min(pm->dqm->processes_count,
+                       kfd->max_proc_per_quantum);
+
+       packet = (struct pm4_mes_runlist *)buffer;
+
+       memset(buffer, 0, sizeof(struct pm4_mes_runlist));
+       packet->header.u32All = pm_build_pm4_header(IT_RUN_LIST,
+                                               sizeof(struct pm4_mes_runlist));
+
+       packet->bitfields4.ib_size = ib_size_in_dwords;
+       packet->bitfields4.chain = chain ? 1 : 0;
+       packet->bitfields4.offload_polling = 0;
+       packet->bitfields4.valid = 1;
+       packet->bitfields4.process_cnt = concurrent_proc_cnt;
+       packet->ordinal2 = lower_32_bits(ib);
+       packet->ib_base_hi = upper_32_bits(ib);
+
+       return 0;
+}
+
+static int pm_map_queues_v9(struct packet_manager *pm, uint32_t *buffer,
+               struct queue *q, bool is_static)
+{
+       struct pm4_mes_map_queues *packet;
+       bool use_static = is_static;
+
+       packet = (struct pm4_mes_map_queues *)buffer;
+       memset(buffer, 0, sizeof(struct pm4_mes_map_queues));
+
+       packet->header.u32All = pm_build_pm4_header(IT_MAP_QUEUES,
+                                       sizeof(struct pm4_mes_map_queues));
+       packet->bitfields2.alloc_format =
+               alloc_format__mes_map_queues__one_per_pipe_vi;
+       packet->bitfields2.num_queues = 1;
+       packet->bitfields2.queue_sel =
+               queue_sel__mes_map_queues__map_to_hws_determined_queue_slots_vi;
+
+       packet->bitfields2.engine_sel =
+               engine_sel__mes_map_queues__compute_vi;
+       packet->bitfields2.queue_type =
+               queue_type__mes_map_queues__normal_compute_vi;
+
+       switch (q->properties.type) {
+       case KFD_QUEUE_TYPE_COMPUTE:
+               if (use_static)
+                       packet->bitfields2.queue_type =
+               queue_type__mes_map_queues__normal_latency_static_queue_vi;
+               break;
+       case KFD_QUEUE_TYPE_DIQ:
+               packet->bitfields2.queue_type =
+                       queue_type__mes_map_queues__debug_interface_queue_vi;
+               break;
+       case KFD_QUEUE_TYPE_SDMA:
+               packet->bitfields2.engine_sel = q->properties.sdma_engine_id +
+                               engine_sel__mes_map_queues__sdma0_vi;
+               use_static = false; /* no static queues under SDMA */
+               break;
+       default:
+               WARN(1, "queue type %d", q->properties.type);
+               return -EINVAL;
+       }
+       packet->bitfields3.doorbell_offset =
+                       q->properties.doorbell_off;
+
+       packet->mqd_addr_lo =
+                       lower_32_bits(q->gart_mqd_addr);
+
+       packet->mqd_addr_hi =
+                       upper_32_bits(q->gart_mqd_addr);
+
+       packet->wptr_addr_lo =
+                       lower_32_bits((uint64_t)q->properties.write_ptr);
+
+       packet->wptr_addr_hi =
+                       upper_32_bits((uint64_t)q->properties.write_ptr);
+
+       return 0;
+}
+
+static int pm_unmap_queues_v9(struct packet_manager *pm, uint32_t *buffer,
+                       enum kfd_queue_type type,
+                       enum kfd_unmap_queues_filter filter,
+                       uint32_t filter_param, bool reset,
+                       unsigned int sdma_engine)
+{
+       struct pm4_mes_unmap_queues *packet;
+
+       packet = (struct pm4_mes_unmap_queues *)buffer;
+       memset(buffer, 0, sizeof(struct pm4_mes_unmap_queues));
+
+       packet->header.u32All = pm_build_pm4_header(IT_UNMAP_QUEUES,
+                                       sizeof(struct pm4_mes_unmap_queues));
+       switch (type) {
+       case KFD_QUEUE_TYPE_COMPUTE:
+       case KFD_QUEUE_TYPE_DIQ:
+               packet->bitfields2.engine_sel =
+                       engine_sel__mes_unmap_queues__compute;
+               break;
+       case KFD_QUEUE_TYPE_SDMA:
+               packet->bitfields2.engine_sel =
+                       engine_sel__mes_unmap_queues__sdma0 + sdma_engine;
+               break;
+       default:
+               WARN(1, "queue type %d", type);
+               return -EINVAL;
+       }
+
+       if (reset)
+               packet->bitfields2.action =
+                       action__mes_unmap_queues__reset_queues;
+       else
+               packet->bitfields2.action =
+                       action__mes_unmap_queues__preempt_queues;
+
+       switch (filter) {
+       case KFD_UNMAP_QUEUES_FILTER_SINGLE_QUEUE:
+               packet->bitfields2.queue_sel =
+                       
queue_sel__mes_unmap_queues__perform_request_on_specified_queues;
+               packet->bitfields2.num_queues = 1;
+               packet->bitfields3b.doorbell_offset0 = filter_param;
+               break;
+       case KFD_UNMAP_QUEUES_FILTER_BY_PASID:
+               packet->bitfields2.queue_sel =
+                       
queue_sel__mes_unmap_queues__perform_request_on_pasid_queues;
+               packet->bitfields3a.pasid = filter_param;
+               break;
+       case KFD_UNMAP_QUEUES_FILTER_ALL_QUEUES:
+               packet->bitfields2.queue_sel =
+                       queue_sel__mes_unmap_queues__unmap_all_queues;
+               break;
+       case KFD_UNMAP_QUEUES_FILTER_DYNAMIC_QUEUES:
+               /* in this case, we do not preempt static queues */
+               packet->bitfields2.queue_sel =
+                       
queue_sel__mes_unmap_queues__unmap_all_non_static_queues;
+               break;
+       default:
+               WARN(1, "filter %d", filter);
+               return -EINVAL;
+       }
+
+       return 0;
+
+}
+
+static int pm_query_status_v9(struct packet_manager *pm, uint32_t *buffer,
+                       uint64_t fence_address, uint32_t fence_value)
+{
+       struct pm4_mes_query_status *packet;
+
+       packet = (struct pm4_mes_query_status *)buffer;
+       memset(buffer, 0, sizeof(struct pm4_mes_query_status));
+
+
+       packet->header.u32All = pm_build_pm4_header(IT_QUERY_STATUS,
+                                       sizeof(struct pm4_mes_query_status));
+
+       packet->bitfields2.context_id = 0;
+       packet->bitfields2.interrupt_sel =
+                       interrupt_sel__mes_query_status__completion_status;
+       packet->bitfields2.command =
+                       command__mes_query_status__fence_only_after_write_ack;
+
+       packet->addr_hi = upper_32_bits((uint64_t)fence_address);
+       packet->addr_lo = lower_32_bits((uint64_t)fence_address);
+       packet->data_hi = upper_32_bits((uint64_t)fence_value);
+       packet->data_lo = lower_32_bits((uint64_t)fence_value);
+
+       return 0;
+}
+
+
+static int pm_release_mem_v9(uint64_t gpu_addr, uint32_t *buffer)
+{
+       struct pm4_mec_release_mem *packet;
+
+       packet = (struct pm4_mec_release_mem *)buffer;
+       memset(buffer, 0, sizeof(struct pm4_mec_release_mem));
+
+       packet->header.u32All = pm_build_pm4_header(IT_RELEASE_MEM,
+                                       sizeof(struct pm4_mec_release_mem));
+
+       packet->bitfields2.event_type = CACHE_FLUSH_AND_INV_TS_EVENT;
+       packet->bitfields2.event_index = 
event_index__mec_release_mem__end_of_pipe;
+       packet->bitfields2.tcl1_action_ena = 1;
+       packet->bitfields2.tc_action_ena = 1;
+       packet->bitfields2.cache_policy = cache_policy__mec_release_mem__lru;
+
+       packet->bitfields3.data_sel = 
data_sel__mec_release_mem__send_32_bit_low;
+       packet->bitfields3.int_sel =
+               int_sel__mec_release_mem__send_interrupt_after_write_confirm;
+
+       packet->bitfields4.address_lo_32b = (gpu_addr & 0xffffffff) >> 2;
+       packet->address_hi = upper_32_bits(gpu_addr);
+
+       packet->data_lo = 0;
+
+       return 0;
+}
+
+const struct packet_manager_funcs kfd_v9_pm_funcs = {
+       .map_process            = pm_map_process_v9,
+       .runlist                = pm_runlist_v9,
+       .set_resources          = pm_set_resources_vi,
+       .map_queues             = pm_map_queues_v9,
+       .unmap_queues           = pm_unmap_queues_v9,
+       .query_status           = pm_query_status_v9,
+       .release_mem            = pm_release_mem_v9,
+       .map_process_size       = sizeof(struct pm4_mes_map_process),
+       .runlist_size           = sizeof(struct pm4_mes_runlist),
+       .set_resources_size     = sizeof(struct pm4_mes_set_resources),
+       .map_queues_size        = sizeof(struct pm4_mes_map_queues),
+       .unmap_queues_size      = sizeof(struct pm4_mes_unmap_queues),
+       .query_status_size      = sizeof(struct pm4_mes_query_status),
+       .release_mem_size       = sizeof(struct pm4_mec_release_mem)
+};
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_vi.c 
b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_vi.c
index 7ee326f..f9019ef 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_vi.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_vi.c
@@ -58,7 +58,7 @@ static void uninitialize_vi(struct kernel_queue *kq)
        kfd_gtt_sa_free(kq->dev, kq->eop_mem);
 }
 
-static unsigned int build_pm4_header(unsigned int opcode, size_t packet_size)
+unsigned int pm_build_pm4_header(unsigned int opcode, size_t packet_size)
 {
        union PM4_MES_TYPE_3_HEADER header;
 
@@ -79,7 +79,7 @@ static int pm_map_process_vi(struct packet_manager *pm, 
uint32_t *buffer,
 
        memset(buffer, 0, sizeof(struct pm4_mes_map_process));
 
-       packet->header.u32All = build_pm4_header(IT_MAP_PROCESS,
+       packet->header.u32All = pm_build_pm4_header(IT_MAP_PROCESS,
                                        sizeof(struct pm4_mes_map_process));
        packet->bitfields2.diq_enable = (qpd->is_debug) ? 1 : 0;
        packet->bitfields2.process_quantum = 1;
@@ -128,7 +128,7 @@ static int pm_runlist_vi(struct packet_manager *pm, 
uint32_t *buffer,
        packet = (struct pm4_mes_runlist *)buffer;
 
        memset(buffer, 0, sizeof(struct pm4_mes_runlist));
-       packet->header.u32All = build_pm4_header(IT_RUN_LIST,
+       packet->header.u32All = pm_build_pm4_header(IT_RUN_LIST,
                                                sizeof(struct pm4_mes_runlist));
 
        packet->bitfields4.ib_size = ib_size_in_dwords;
@@ -142,7 +142,7 @@ static int pm_runlist_vi(struct packet_manager *pm, 
uint32_t *buffer,
        return 0;
 }
 
-static int pm_set_resources_vi(struct packet_manager *pm, uint32_t *buffer,
+int pm_set_resources_vi(struct packet_manager *pm, uint32_t *buffer,
                                struct scheduling_resources *res)
 {
        struct pm4_mes_set_resources *packet;
@@ -150,7 +150,7 @@ static int pm_set_resources_vi(struct packet_manager *pm, 
uint32_t *buffer,
        packet = (struct pm4_mes_set_resources *)buffer;
        memset(buffer, 0, sizeof(struct pm4_mes_set_resources));
 
-       packet->header.u32All = build_pm4_header(IT_SET_RESOURCES,
+       packet->header.u32All = pm_build_pm4_header(IT_SET_RESOURCES,
                                        sizeof(struct pm4_mes_set_resources));
 
        packet->bitfields2.queue_type =
@@ -179,7 +179,7 @@ static int pm_map_queues_vi(struct packet_manager *pm, 
uint32_t *buffer,
        packet = (struct pm4_mes_map_queues *)buffer;
        memset(buffer, 0, sizeof(struct pm4_mes_map_queues));
 
-       packet->header.u32All = build_pm4_header(IT_MAP_QUEUES,
+       packet->header.u32All = pm_build_pm4_header(IT_MAP_QUEUES,
                                        sizeof(struct pm4_mes_map_queues));
        packet->bitfields2.alloc_format =
                alloc_format__mes_map_queues__one_per_pipe_vi;
@@ -240,7 +240,7 @@ static int pm_unmap_queues_vi(struct packet_manager *pm, 
uint32_t *buffer,
        packet = (struct pm4_mes_unmap_queues *)buffer;
        memset(buffer, 0, sizeof(struct pm4_mes_unmap_queues));
 
-       packet->header.u32All = build_pm4_header(IT_UNMAP_QUEUES,
+       packet->header.u32All = pm_build_pm4_header(IT_UNMAP_QUEUES,
                                        sizeof(struct pm4_mes_unmap_queues));
        switch (type) {
        case KFD_QUEUE_TYPE_COMPUTE:
@@ -302,7 +302,7 @@ static int pm_query_status_vi(struct packet_manager *pm, 
uint32_t *buffer,
        packet = (struct pm4_mes_query_status *)buffer;
        memset(buffer, 0, sizeof(struct pm4_mes_query_status));
 
-       packet->header.u32All = build_pm4_header(IT_QUERY_STATUS,
+       packet->header.u32All = pm_build_pm4_header(IT_QUERY_STATUS,
                                        sizeof(struct pm4_mes_query_status));
 
        packet->bitfields2.context_id = 0;
@@ -326,7 +326,7 @@ static int pm_release_mem_vi(uint64_t gpu_addr, uint32_t 
*buffer)
        packet = (struct pm4_mec_release_mem *)buffer;
        memset(buffer, 0, sizeof(*packet));
 
-       packet->header.u32All = build_pm4_header(IT_RELEASE_MEM,
+       packet->header.u32All = pm_build_pm4_header(IT_RELEASE_MEM,
                                                 sizeof(*packet));
 
        packet->bitfields2.event_type = CACHE_FLUSH_AND_INV_TS_EVENT;
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c 
b/drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c
index 860ff24..91f0350 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c
@@ -223,6 +223,10 @@ int pm_init(struct packet_manager *pm, struct 
device_queue_manager *dqm)
        case CHIP_POLARIS11:
                pm->pmf = &kfd_vi_pm_funcs;
                break;
+       case CHIP_VEGA10:
+       case CHIP_RAVEN:
+               pm->pmf = &kfd_v9_pm_funcs;
+               break;
        default:
                WARN(1, "Unexpected ASIC family %u",
                     dqm->dev->device_info->asic_family);
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers_ai.h 
b/drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers_ai.h
new file mode 100644
index 0000000..ddad9be
--- /dev/null
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers_ai.h
@@ -0,0 +1,583 @@
+/*
+ * Copyright 2016 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.
+ *
+ */
+
+#ifndef F32_MES_PM4_PACKETS_H
+#define F32_MES_PM4_PACKETS_H
+
+#ifndef PM4_MES_HEADER_DEFINED
+#define PM4_MES_HEADER_DEFINED
+union PM4_MES_TYPE_3_HEADER {
+       struct {
+               uint32_t reserved1 : 8; /* < reserved */
+               uint32_t opcode    : 8; /* < IT opcode */
+               uint32_t count     : 14;/* < number of DWORDs - 1 in the
+                                        *   information body.
+                                        */
+               uint32_t type      : 2; /* < packet identifier.
+                                        *   It should be 3 for type 3 packets
+                                        */
+       };
+       uint32_t u32All;
+};
+#endif /* PM4_MES_HEADER_DEFINED */
+
+/*--------------------MES_SET_RESOURCES--------------------*/
+
+#ifndef PM4_MES_SET_RESOURCES_DEFINED
+#define PM4_MES_SET_RESOURCES_DEFINED
+enum mes_set_resources_queue_type_enum {
+       queue_type__mes_set_resources__kernel_interface_queue_kiq = 0,
+       queue_type__mes_set_resources__hsa_interface_queue_hiq = 1,
+       queue_type__mes_set_resources__hsa_debug_interface_queue = 4
+};
+
+
+struct pm4_mes_set_resources {
+       union {
+               union PM4_MES_TYPE_3_HEADER     header;         /* header */
+               uint32_t                        ordinal1;
+       };
+
+       union {
+               struct {
+                       uint32_t vmid_mask:16;
+                       uint32_t unmap_latency:8;
+                       uint32_t reserved1:5;
+                       enum mes_set_resources_queue_type_enum queue_type:3;
+               } bitfields2;
+               uint32_t ordinal2;
+       };
+
+       uint32_t queue_mask_lo;
+       uint32_t queue_mask_hi;
+       uint32_t gws_mask_lo;
+       uint32_t gws_mask_hi;
+
+       union {
+               struct {
+                       uint32_t oac_mask:16;
+                       uint32_t reserved2:16;
+               } bitfields7;
+               uint32_t ordinal7;
+       };
+
+       union {
+               struct {
+               uint32_t gds_heap_base:6;
+               uint32_t reserved3:5;
+               uint32_t gds_heap_size:6;
+               uint32_t reserved4:15;
+               } bitfields8;
+               uint32_t ordinal8;
+       };
+
+};
+#endif
+
+/*--------------------MES_RUN_LIST--------------------*/
+
+#ifndef PM4_MES_RUN_LIST_DEFINED
+#define PM4_MES_RUN_LIST_DEFINED
+
+struct pm4_mes_runlist {
+       union {
+           union PM4_MES_TYPE_3_HEADER   header;            /* header */
+           uint32_t            ordinal1;
+       };
+
+       union {
+               struct {
+                       uint32_t reserved1:2;
+                       uint32_t ib_base_lo:30;
+               } bitfields2;
+               uint32_t ordinal2;
+       };
+
+       uint32_t ib_base_hi;
+
+       union {
+               struct {
+                       uint32_t ib_size:20;
+                       uint32_t chain:1;
+                       uint32_t offload_polling:1;
+                       uint32_t reserved2:1;
+                       uint32_t valid:1;
+                       uint32_t process_cnt:4;
+                       uint32_t reserved3:4;
+               } bitfields4;
+               uint32_t ordinal4;
+       };
+
+};
+#endif
+
+/*--------------------MES_MAP_PROCESS--------------------*/
+
+#ifndef PM4_MES_MAP_PROCESS_DEFINED
+#define PM4_MES_MAP_PROCESS_DEFINED
+
+struct pm4_mes_map_process {
+       union {
+               union PM4_MES_TYPE_3_HEADER header;     /* header */
+               uint32_t ordinal1;
+       };
+
+       union {
+               struct {
+                       uint32_t pasid:16;
+                       uint32_t reserved1:8;
+                       uint32_t diq_enable:1;
+                       uint32_t process_quantum:7;
+               } bitfields2;
+               uint32_t ordinal2;
+       };
+
+       uint32_t vm_context_page_table_base_addr_lo32;
+
+       uint32_t vm_context_page_table_base_addr_hi32;
+
+       uint32_t sh_mem_bases;
+
+       uint32_t sh_mem_config;
+
+       uint32_t sq_shader_tba_lo;
+
+       uint32_t sq_shader_tba_hi;
+
+       uint32_t sq_shader_tma_lo;
+
+       uint32_t sq_shader_tma_hi;
+
+       uint32_t reserved6;
+
+       uint32_t gds_addr_lo;
+
+       uint32_t gds_addr_hi;
+
+       union {
+               struct {
+                       uint32_t num_gws:6;
+                       uint32_t reserved7:1;
+                       uint32_t sdma_enable:1;
+                       uint32_t num_oac:4;
+                       uint32_t reserved8:4;
+                       uint32_t gds_size:6;
+                       uint32_t num_queues:10;
+               } bitfields14;
+               uint32_t ordinal14;
+       };
+
+       uint32_t completion_signal_lo;
+
+       uint32_t completion_signal_hi;
+
+};
+
+#endif
+
+/*--------------------MES_MAP_PROCESS_VM--------------------*/
+
+#ifndef PM4_MES_MAP_PROCESS_VM_DEFINED
+#define PM4_MES_MAP_PROCESS_VM_DEFINED
+
+struct PM4_MES_MAP_PROCESS_VM {
+       union {
+               union PM4_MES_TYPE_3_HEADER header;     /* header */
+               uint32_t ordinal1;
+       };
+
+       uint32_t reserved1;
+
+       uint32_t vm_context_cntl;
+
+       uint32_t reserved2;
+
+       uint32_t vm_context_page_table_end_addr_lo32;
+
+       uint32_t vm_context_page_table_end_addr_hi32;
+
+       uint32_t vm_context_page_table_start_addr_lo32;
+
+       uint32_t vm_context_page_table_start_addr_hi32;
+
+       uint32_t reserved3;
+
+       uint32_t reserved4;
+
+       uint32_t reserved5;
+
+       uint32_t reserved6;
+
+       uint32_t reserved7;
+
+       uint32_t reserved8;
+
+       uint32_t completion_signal_lo32;
+
+       uint32_t completion_signal_hi32;
+
+};
+#endif
+
+/*--------------------MES_MAP_QUEUES--------------------*/
+
+#ifndef PM4_MES_MAP_QUEUES_VI_DEFINED
+#define PM4_MES_MAP_QUEUES_VI_DEFINED
+enum mes_map_queues_queue_sel_enum {
+       queue_sel__mes_map_queues__map_to_specified_queue_slots_vi = 0,
+queue_sel__mes_map_queues__map_to_hws_determined_queue_slots_vi = 1
+};
+
+enum mes_map_queues_queue_type_enum {
+       queue_type__mes_map_queues__normal_compute_vi = 0,
+       queue_type__mes_map_queues__debug_interface_queue_vi = 1,
+       queue_type__mes_map_queues__normal_latency_static_queue_vi = 2,
+queue_type__mes_map_queues__low_latency_static_queue_vi = 3
+};
+
+enum mes_map_queues_alloc_format_enum {
+       alloc_format__mes_map_queues__one_per_pipe_vi = 0,
+alloc_format__mes_map_queues__all_on_one_pipe_vi = 1
+};
+
+enum mes_map_queues_engine_sel_enum {
+       engine_sel__mes_map_queues__compute_vi = 0,
+       engine_sel__mes_map_queues__sdma0_vi = 2,
+       engine_sel__mes_map_queues__sdma1_vi = 3
+};
+
+
+struct pm4_mes_map_queues {
+       union {
+               union PM4_MES_TYPE_3_HEADER   header;            /* header */
+               uint32_t            ordinal1;
+       };
+
+       union {
+               struct {
+                       uint32_t reserved1:4;
+                       enum mes_map_queues_queue_sel_enum queue_sel:2;
+                       uint32_t reserved2:15;
+                       enum mes_map_queues_queue_type_enum queue_type:3;
+                       enum mes_map_queues_alloc_format_enum alloc_format:2;
+                       enum mes_map_queues_engine_sel_enum engine_sel:3;
+                       uint32_t num_queues:3;
+               } bitfields2;
+               uint32_t ordinal2;
+       };
+
+       union {
+               struct {
+                       uint32_t reserved3:1;
+                       uint32_t check_disable:1;
+                       uint32_t doorbell_offset:26;
+                       uint32_t reserved4:4;
+               } bitfields3;
+               uint32_t ordinal3;
+       };
+
+       uint32_t mqd_addr_lo;
+       uint32_t mqd_addr_hi;
+       uint32_t wptr_addr_lo;
+       uint32_t wptr_addr_hi;
+};
+#endif
+
+/*--------------------MES_QUERY_STATUS--------------------*/
+
+#ifndef PM4_MES_QUERY_STATUS_DEFINED
+#define PM4_MES_QUERY_STATUS_DEFINED
+enum mes_query_status_interrupt_sel_enum {
+       interrupt_sel__mes_query_status__completion_status = 0,
+       interrupt_sel__mes_query_status__process_status = 1,
+       interrupt_sel__mes_query_status__queue_status = 2
+};
+
+enum mes_query_status_command_enum {
+       command__mes_query_status__interrupt_only = 0,
+       command__mes_query_status__fence_only_immediate = 1,
+       command__mes_query_status__fence_only_after_write_ack = 2,
+       command__mes_query_status__fence_wait_for_write_ack_send_interrupt = 3
+};
+
+enum mes_query_status_engine_sel_enum {
+       engine_sel__mes_query_status__compute = 0,
+       engine_sel__mes_query_status__sdma0_queue = 2,
+       engine_sel__mes_query_status__sdma1_queue = 3
+};
+
+struct pm4_mes_query_status {
+       union {
+               union PM4_MES_TYPE_3_HEADER   header;            /* header */
+               uint32_t            ordinal1;
+       };
+
+       union {
+               struct {
+                       uint32_t context_id:28;
+                       enum mes_query_status_interrupt_sel_enum        
interrupt_sel:2;
+                       enum mes_query_status_command_enum command:2;
+               } bitfields2;
+               uint32_t ordinal2;
+       };
+
+       union {
+               struct {
+                       uint32_t pasid:16;
+                       uint32_t reserved1:16;
+               } bitfields3a;
+               struct {
+                       uint32_t reserved2:2;
+                       uint32_t doorbell_offset:26;
+                       enum mes_query_status_engine_sel_enum engine_sel:3;
+                       uint32_t reserved3:1;
+               } bitfields3b;
+               uint32_t ordinal3;
+       };
+
+       uint32_t addr_lo;
+       uint32_t addr_hi;
+       uint32_t data_lo;
+       uint32_t data_hi;
+};
+#endif
+
+/*--------------------MES_UNMAP_QUEUES--------------------*/
+
+#ifndef PM4_MES_UNMAP_QUEUES_DEFINED
+#define PM4_MES_UNMAP_QUEUES_DEFINED
+enum mes_unmap_queues_action_enum {
+       action__mes_unmap_queues__preempt_queues = 0,
+       action__mes_unmap_queues__reset_queues = 1,
+       action__mes_unmap_queues__disable_process_queues = 2,
+       action__mes_unmap_queues__reserved = 3
+};
+
+enum mes_unmap_queues_queue_sel_enum {
+       queue_sel__mes_unmap_queues__perform_request_on_specified_queues = 0,
+       queue_sel__mes_unmap_queues__perform_request_on_pasid_queues = 1,
+       queue_sel__mes_unmap_queues__unmap_all_queues = 2,
+       queue_sel__mes_unmap_queues__unmap_all_non_static_queues = 3
+};
+
+enum mes_unmap_queues_engine_sel_enum {
+       engine_sel__mes_unmap_queues__compute = 0,
+       engine_sel__mes_unmap_queues__sdma0 = 2,
+       engine_sel__mes_unmap_queues__sdmal = 3
+};
+
+struct pm4_mes_unmap_queues {
+       union {
+               union PM4_MES_TYPE_3_HEADER   header;            /* header */
+               uint32_t            ordinal1;
+       };
+
+       union {
+               struct {
+                       enum mes_unmap_queues_action_enum action:2;
+                       uint32_t reserved1:2;
+                       enum mes_unmap_queues_queue_sel_enum queue_sel:2;
+                       uint32_t reserved2:20;
+                       enum mes_unmap_queues_engine_sel_enum engine_sel:3;
+                       uint32_t num_queues:3;
+               } bitfields2;
+               uint32_t ordinal2;
+       };
+
+       union {
+               struct {
+                       uint32_t pasid:16;
+                       uint32_t reserved3:16;
+               } bitfields3a;
+               struct {
+                       uint32_t reserved4:2;
+                       uint32_t doorbell_offset0:26;
+                       int32_t reserved5:4;
+               } bitfields3b;
+               uint32_t ordinal3;
+       };
+
+       union {
+       struct {
+                       uint32_t reserved6:2;
+                       uint32_t doorbell_offset1:26;
+                       uint32_t reserved7:4;
+               } bitfields4;
+               uint32_t ordinal4;
+       };
+
+       union {
+               struct {
+                       uint32_t reserved8:2;
+                       uint32_t doorbell_offset2:26;
+                       uint32_t reserved9:4;
+               } bitfields5;
+               uint32_t ordinal5;
+       };
+
+       union {
+               struct {
+                       uint32_t reserved10:2;
+                       uint32_t doorbell_offset3:26;
+                       uint32_t reserved11:4;
+               } bitfields6;
+               uint32_t ordinal6;
+       };
+};
+#endif
+
+#ifndef PM4_MEC_RELEASE_MEM_DEFINED
+#define PM4_MEC_RELEASE_MEM_DEFINED
+
+enum mec_release_mem_event_index_enum {
+       event_index__mec_release_mem__end_of_pipe = 5,
+       event_index__mec_release_mem__shader_done = 6
+};
+
+enum mec_release_mem_cache_policy_enum {
+       cache_policy__mec_release_mem__lru = 0,
+       cache_policy__mec_release_mem__stream = 1
+};
+
+enum mec_release_mem_pq_exe_status_enum {
+       pq_exe_status__mec_release_mem__default = 0,
+       pq_exe_status__mec_release_mem__phase_update = 1
+};
+
+enum mec_release_mem_dst_sel_enum {
+       dst_sel__mec_release_mem__memory_controller = 0,
+       dst_sel__mec_release_mem__tc_l2 = 1,
+       dst_sel__mec_release_mem__queue_write_pointer_register = 2,
+       dst_sel__mec_release_mem__queue_write_pointer_poll_mask_bit = 3
+};
+
+enum mec_release_mem_int_sel_enum {
+       int_sel__mec_release_mem__none = 0,
+       int_sel__mec_release_mem__send_interrupt_only = 1,
+       int_sel__mec_release_mem__send_interrupt_after_write_confirm = 2,
+       int_sel__mec_release_mem__send_data_after_write_confirm = 3,
+       int_sel__mec_release_mem__unconditionally_send_int_ctxid = 4,
+       
int_sel__mec_release_mem__conditionally_send_int_ctxid_based_on_32_bit_compare 
= 5,
+       
int_sel__mec_release_mem__conditionally_send_int_ctxid_based_on_64_bit_compare 
= 6
+};
+
+enum mec_release_mem_data_sel_enum {
+       data_sel__mec_release_mem__none = 0,
+       data_sel__mec_release_mem__send_32_bit_low = 1,
+       data_sel__mec_release_mem__send_64_bit_data = 2,
+       data_sel__mec_release_mem__send_gpu_clock_counter = 3,
+       data_sel__mec_release_mem__send_cp_perfcounter_hi_lo = 4,
+       data_sel__mec_release_mem__store_gds_data_to_memory = 5
+};
+
+struct pm4_mec_release_mem {
+       union {
+               union PM4_MES_TYPE_3_HEADER header;     /*header */
+               unsigned int ordinal1;
+       };
+
+       union {
+               struct {
+                       unsigned int event_type:6;
+                       unsigned int reserved1:2;
+                       enum mec_release_mem_event_index_enum event_index:4;
+                       unsigned int tcl1_vol_action_ena:1;
+                       unsigned int tc_vol_action_ena:1;
+                       unsigned int reserved2:1;
+                       unsigned int tc_wb_action_ena:1;
+                       unsigned int tcl1_action_ena:1;
+                       unsigned int tc_action_ena:1;
+                       uint32_t reserved3:1;
+                       uint32_t tc_nc_action_ena:1;
+                       uint32_t tc_wc_action_ena:1;
+                       uint32_t tc_md_action_ena:1;
+                       uint32_t reserved4:3;
+                       enum mec_release_mem_cache_policy_enum cache_policy:2;
+                       uint32_t reserved5:2;
+                       enum mec_release_mem_pq_exe_status_enum pq_exe_status:1;
+                       uint32_t reserved6:2;
+               } bitfields2;
+               unsigned int ordinal2;
+       };
+
+       union {
+               struct {
+                       uint32_t reserved7:16;
+                       enum mec_release_mem_dst_sel_enum dst_sel:2;
+                       uint32_t reserved8:6;
+                       enum mec_release_mem_int_sel_enum int_sel:3;
+                       uint32_t reserved9:2;
+                       enum mec_release_mem_data_sel_enum data_sel:3;
+               } bitfields3;
+               unsigned int ordinal3;
+       };
+
+       union {
+               struct {
+                       uint32_t reserved10:2;
+                       unsigned int address_lo_32b:30;
+               } bitfields4;
+               struct {
+                       uint32_t reserved11:3;
+                       uint32_t address_lo_64b:29;
+               } bitfields4b;
+               uint32_t reserved12;
+               unsigned int ordinal4;
+       };
+
+       union {
+               uint32_t address_hi;
+               uint32_t reserved13;
+               uint32_t ordinal5;
+       };
+
+       union {
+               uint32_t data_lo;
+               uint32_t cmp_data_lo;
+               struct {
+                       uint32_t dw_offset:16;
+                       uint32_t num_dwords:16;
+               } bitfields6c;
+               uint32_t reserved14;
+               uint32_t ordinal6;
+       };
+
+       union {
+               uint32_t data_hi;
+               uint32_t cmp_data_hi;
+               uint32_t reserved15;
+               uint32_t reserved16;
+               uint32_t ordinal7;
+       };
+
+       uint32_t int_ctxid;
+
+};
+
+#endif
+
+enum {
+       CACHE_FLUSH_AND_INV_TS_EVENT = 0x00000014
+};
+#endif
+
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h 
b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
index 873a8fb..b68299a 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
@@ -900,6 +900,7 @@ struct packet_manager_funcs {
 };
 
 extern const struct packet_manager_funcs kfd_vi_pm_funcs;
+extern const struct packet_manager_funcs kfd_v9_pm_funcs;
 
 int pm_init(struct packet_manager *pm, struct device_queue_manager *dqm);
 void pm_uninit(struct packet_manager *pm);
@@ -916,6 +917,11 @@ int pm_send_unmap_queue(struct packet_manager *pm, enum 
kfd_queue_type type,
 
 void pm_release_ib(struct packet_manager *pm);
 
+/* Following PM funcs can be shared among VI and AI */
+unsigned int pm_build_pm4_header(unsigned int opcode, size_t packet_size);
+int pm_set_resources_vi(struct packet_manager *pm, uint32_t *buffer,
+                               struct scheduling_resources *res);
+
 uint64_t kfd_get_number_elems(struct kfd_dev *kfd);
 
 /* Events */
-- 
2.7.4

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Reply via email to