drm/amdkfd: Add initial VI support for KQ

This patch starts to add support for the VI APU in the KQ (kernel queue)
module.

Because most (more than 90%) of the KQ code is shared among AMD's APUs, we
chose a design that performs most/all the code in the shared KQ file
(kfd_kernel_queue.c). If there is H/W specific code to be executed,
than it is written in an asic-specific extension function for that H/W.

That asic-specific extension function is called from the shared function at the
appropriate time. This requires that for every asic-specific extension function
that is implemented in a specific ASIC, there will be an equivalent
implementation in ALL ASICs, even if those implementations are just stubs.

That way we achieve:

- Maintainability: by having one copy of most of the code, we only need to
  fix bugs at one locations

- Readability: very clear what is the shared code and what is done per ASIC

- Extensibility: very easy to add new H/W specific files/functions

Signed-off-by: Ben Goz <ben.goz@amd.com>
Signed-off-by: Oded Gabbay <oded.gabbay@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdkfd/Makefile b/drivers/gpu/drm/amd/amdkfd/Makefile
index 7558683c6935adec7195d7e2fdc072465e739dfd..cd09c05ee7e4bcdbaf6b2d9f24f448fa1610ef06 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/Makefile
+++ b/drivers/gpu/drm/amd/amdkfd/Makefile
@@ -8,7 +8,8 @@ amdkfd-y        := kfd_module.o kfd_device.o kfd_chardev.o kfd_topology.o \
                kfd_pasid.o kfd_doorbell.o kfd_flat_memory.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_packet_manager.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_interrupt.o

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c
index 731635dace90fb9e1ce1e6d975ea754577ffa838..75950ed7a1bce5de813b0adab1c8203f3f219e9b 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c
@@ -73,13 +73,16 @@ static bool initialize(struct kernel_queue *kq, struct kfd_dev *dev,
                goto err_get_kernel_doorbell;
 
        retval = kfd_gtt_sa_allocate(dev, queue_size, &kq->pq);
-
        if (retval != 0)
                goto err_pq_allocate_vidmem;
 
        kq->pq_kernel_addr = kq->pq->cpu_ptr;
        kq->pq_gpu_addr = kq->pq->gpu_addr;
 
+       retval = kq->ops_asic_specific.initialize(kq, dev, type, queue_size);
+       if (retval == false)
+               goto err_eop_allocate_vidmem;
+
        retval = kfd_gtt_sa_allocate(dev, sizeof(*kq->rptr_kernel),
                                        &kq->rptr_mem);
 
@@ -111,6 +114,8 @@ static bool initialize(struct kernel_queue *kq, struct kfd_dev *dev,
        prop.queue_address = kq->pq_gpu_addr;
        prop.read_ptr = (uint32_t *) kq->rptr_gpu_addr;
        prop.write_ptr = (uint32_t *) kq->wptr_gpu_addr;
+       prop.eop_ring_buffer_address = kq->eop_gpu_addr;
+       prop.eop_ring_buffer_size = PAGE_SIZE;
 
        if (init_queue(&kq->queue, prop) != 0)
                goto err_init_queue;
@@ -156,6 +161,8 @@ err_init_queue:
 err_wptr_allocate_vidmem:
        kfd_gtt_sa_free(dev, kq->rptr_mem);
 err_rptr_allocate_vidmem:
+       kfd_gtt_sa_free(dev, kq->eop_mem);
+err_eop_allocate_vidmem:
        kfd_gtt_sa_free(dev, kq->pq);
 err_pq_allocate_vidmem:
        pr_err("kfd: error init pq\n");
@@ -182,6 +189,7 @@ static void uninitialize(struct kernel_queue *kq)
 
        kfd_gtt_sa_free(kq->dev, kq->rptr_mem);
        kfd_gtt_sa_free(kq->dev, kq->wptr_mem);
+       kq->ops_asic_specific.uninitialize(kq);
        kfd_gtt_sa_free(kq->dev, kq->pq);
        kfd_release_kernel_doorbell(kq->dev,
                                        kq->queue->properties.doorbell_ptr);
@@ -300,6 +308,13 @@ struct kernel_queue *kernel_queue_init(struct kfd_dev *dev,
        kq->ops.sync_with_hw = sync_with_hw;
        kq->ops.rollback_packet = rollback_packet;
 
+       switch (dev->device_info->asic_family) {
+       case CHIP_CARRIZO:
+               kernel_queue_init_vi(&kq->ops_asic_specific);
+       case CHIP_KAVERI:
+               kernel_queue_init_cik(&kq->ops_asic_specific);
+       }
+
        if (kq->ops.initialize(kq, dev, type, KFD_KERNEL_QUEUE_SIZE) == false) {
                pr_err("kfd: failed to init kernel queue\n");
                kfree(kq);
@@ -324,7 +339,7 @@ static __attribute__((unused)) void test_kq(struct kfd_dev *dev)
 
        BUG_ON(!dev);
 
-       pr_debug("kfd: starting kernel queue test\n");
+       pr_err("kfd: starting kernel queue test\n");
 
        kq = kernel_queue_init(dev, KFD_QUEUE_TYPE_HIQ);
        BUG_ON(!kq);
@@ -336,7 +351,7 @@ static __attribute__((unused)) void test_kq(struct kfd_dev *dev)
        kq->ops.submit_packet(kq);
        kq->ops.sync_with_hw(kq, 1000);
 
-       pr_debug("kfd: ending kernel queue test\n");
+       pr_err("kfd: ending kernel queue test\n");
 }
 
 

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.h b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.h
index e01b77b285002919ff17482cdc390d6a39f6f555..2659d936ba732146809ce699c54e0af10ee35668 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.h
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.h
@@ -68,6 +68,7 @@ struct kernel_queue_ops {
 
 struct kernel_queue {
        struct kernel_queue_ops ops;
+       struct kernel_queue_ops ops_asic_specific;
 
        /* data */
        struct kfd_dev          *dev;
@@ -85,6 +86,9 @@ struct kernel_queue {
        struct kfd_mem_obj      *pq;
        uint64_t                pq_gpu_addr;
        uint32_t                *pq_kernel_addr;
+       struct kfd_mem_obj      *eop_mem;
+       uint64_t                eop_gpu_addr;
+       uint32_t                *eop_kernel_addr;
 
        struct kfd_mem_obj      *fence_mem_obj;
        uint64_t                fence_gpu_addr;
@@ -93,4 +97,7 @@ struct kernel_queue {
        struct list_head        list;
 };
 
+void kernel_queue_init_cik(struct kernel_queue_ops *ops);
+void kernel_queue_init_vi(struct kernel_queue_ops *ops);
+
 #endif /* KFD_KERNEL_QUEUE_H_ */

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_cik.c b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_cik.c
new file mode 100644 (file)
index 0000000..a90eb44
--- /dev/null
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_cik.c
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2014 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"
+
+static bool initialize_cik(struct kernel_queue *kq, struct kfd_dev *dev,
+                       enum kfd_queue_type type, unsigned int queue_size);
+static void uninitialize_cik(struct kernel_queue *kq);
+
+void kernel_queue_init_cik(struct kernel_queue_ops *ops)
+{
+       ops->initialize = initialize_cik;
+       ops->uninitialize = uninitialize_cik;
+}
+
+static bool initialize_cik(struct kernel_queue *kq, struct kfd_dev *dev,
+                       enum kfd_queue_type type, unsigned int queue_size)
+{
+       return true;
+}
+
+static void uninitialize_cik(struct kernel_queue *kq)
+{
+}

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_vi.c b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_vi.c
new file mode 100644 (file)
index 0000000..f1d4828
--- /dev/null
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_vi.c
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2014 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"
+
+static bool initialize_vi(struct kernel_queue *kq, struct kfd_dev *dev,
+                       enum kfd_queue_type type, unsigned int queue_size);
+static void uninitialize_vi(struct kernel_queue *kq);
+
+void kernel_queue_init_vi(struct kernel_queue_ops *ops)
+{
+       ops->initialize = initialize_vi;
+       ops->uninitialize = uninitialize_vi;
+}
+
+static bool initialize_vi(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 != 0)
+               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_vi(struct kernel_queue *kq)
+{
+       kfd_gtt_sa_free(kq->dev, kq->eop_mem);
+}