drm/amdkfd: Enable GWS based on FW Support

Rather than only enabling GWS support based on the hws_gws_support
modparm, also check whether the GPU's HWS firmware supports GWS.
Leave the old modparm in place in case users want to test GWS
on GPUs not yet in the support list.

v2: fix broken syntax from the first patch.

Signed-off-by: Joseph Greathouse <[email protected]>
Reviewed-by: Felix Kuehling <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
index 7aa5ec357391e08520cb3cfe2f7eace94bbbe2c0..719a963c31a2594dd723e69196924bd7f2059eb2 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
@@ -689,13 +689,12 @@ MODULE_PARM_DESC(halt_if_hws_hang, "Halt if HWS hang is detected (0 = off (defau
 
 /**
  * DOC: hws_gws_support(bool)
 
 /**
  * DOC: hws_gws_support(bool)

- * Whether HWS support gws barriers. Default value: false (not supported)
- * This will be replaced with a MEC firmware version check once firmware
- * is ready
+ * Assume that HWS supports GWS barriers regardless of what firmware version
+ * check says. Default value: false (rely on MEC2 firmware version check).

  */
 bool hws_gws_support;
 module_param(hws_gws_support, bool, 0444);
  */
 bool hws_gws_support;
 module_param(hws_gws_support, bool, 0444);

-MODULE_PARM_DESC(hws_gws_support, "MEC FW support gws barriers (false = not supported (Default), true = supported)");
+MODULE_PARM_DESC(hws_gws_support, "Assume MEC2 FW supports GWS barriers (false = rely on FW version check (Default), true = force supported)");

 
 /**
   * DOC: queue_preemption_timeout_ms (int)
 
 /**
   * DOC: queue_preemption_timeout_ms (int)

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
index 5eb1314f500b8ff51f785d53f1fb8755a002510d..f8fa03a12add711f4ac76647a36656bb7f74a6ed 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
@@ -1592,9 +1592,6 @@ static int kfd_ioctl_alloc_queue_gws(struct file *filep,
        struct queue *q;
        struct kfd_dev *dev;
 
        struct queue *q;
        struct kfd_dev *dev;
 

-       if (!hws_gws_support)
-               return -ENODEV;
-

        mutex_lock(&p->mutex);
        q = pqm_get_user_queue(&p->pqm, args->queue_id);
 
        mutex_lock(&p->mutex);
        q = pqm_get_user_queue(&p->pqm, args->queue_id);
 


@@ -1605,6 +1602,11 @@ static int kfd_ioctl_alloc_queue_gws(struct file *filep,
                goto out_unlock;
        }
 
                goto out_unlock;
        }
 

+       if (!dev->gws) {
+               retval = -ENODEV;
+               goto out_unlock;
+       }
+

        if (dev->dqm->sched_policy == KFD_SCHED_POLICY_NO_HWS) {
                retval = -ENODEV;
                goto out_unlock;
        if (dev->dqm->sched_policy == KFD_SCHED_POLICY_NO_HWS) {
                retval = -ENODEV;
                goto out_unlock;

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
index 05bc6d96ec5275b00a5b1eb9a69c506eee43ce44..0491ab2b4a9b3bb7746c45693d329669157b4b38 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
@@ -569,6 +569,23 @@ static void kfd_cwsr_init(struct kfd_dev *kfd)
        }
 }
 
        }
 }
 

+static int kfd_gws_init(struct kfd_dev *kfd)
+{
+       int ret = 0;
+
+       if (kfd->dqm->sched_policy == KFD_SCHED_POLICY_NO_HWS)
+               return 0;
+
+       if (hws_gws_support
+               || (kfd->device_info->asic_family >= CHIP_VEGA10
+                       && kfd->device_info->asic_family <= CHIP_RAVEN
+                       && kfd->mec2_fw_version >= 0x1b3))
+               ret = amdgpu_amdkfd_alloc_gws(kfd->kgd,
+                               amdgpu_amdkfd_get_num_gws(kfd->kgd), &kfd->gws);
+
+       return ret;
+}
+

 bool kgd2kfd_device_init(struct kfd_dev *kfd,
                         struct drm_device *ddev,
                         const struct kgd2kfd_shared_resources *gpu_resources)
 bool kgd2kfd_device_init(struct kfd_dev *kfd,
                         struct drm_device *ddev,
                         const struct kgd2kfd_shared_resources *gpu_resources)


@@ -578,6 +595,8 @@ bool kgd2kfd_device_init(struct kfd_dev *kfd,
        kfd->ddev = ddev;
        kfd->mec_fw_version = amdgpu_amdkfd_get_fw_version(kfd->kgd,
                        KGD_ENGINE_MEC1);
        kfd->ddev = ddev;
        kfd->mec_fw_version = amdgpu_amdkfd_get_fw_version(kfd->kgd,
                        KGD_ENGINE_MEC1);

+       kfd->mec2_fw_version = amdgpu_amdkfd_get_fw_version(kfd->kgd,
+                       KGD_ENGINE_MEC2);

        kfd->sdma_fw_version = amdgpu_amdkfd_get_fw_version(kfd->kgd,
                        KGD_ENGINE_SDMA1);
        kfd->shared_resources = *gpu_resources;
        kfd->sdma_fw_version = amdgpu_amdkfd_get_fw_version(kfd->kgd,
                        KGD_ENGINE_SDMA1);
        kfd->shared_resources = *gpu_resources;


@@ -598,13 +617,6 @@ bool kgd2kfd_device_init(struct kfd_dev *kfd,
        } else
                kfd->max_proc_per_quantum = hws_max_conc_proc;
 
        } else
                kfd->max_proc_per_quantum = hws_max_conc_proc;
 

-       /* Allocate global GWS that is shared by all KFD processes */
-       if (hws_gws_support && amdgpu_amdkfd_alloc_gws(kfd->kgd,
-                       amdgpu_amdkfd_get_num_gws(kfd->kgd), &kfd->gws)) {
-               dev_err(kfd_device, "Could not allocate %d gws\n",
-                       amdgpu_amdkfd_get_num_gws(kfd->kgd));
-               goto out;
-       }

        /* calculate max size of mqds needed for queues */
        size = max_num_of_queues_per_device *
                        kfd->device_info->mqd_size_aligned;
        /* calculate max size of mqds needed for queues */
        size = max_num_of_queues_per_device *
                        kfd->device_info->mqd_size_aligned;


@@ -662,6 +674,15 @@ bool kgd2kfd_device_init(struct kfd_dev *kfd,
                goto device_queue_manager_error;
        }
 
                goto device_queue_manager_error;
        }
 

+       /* If supported on this device, allocate global GWS that is shared
+        * by all KFD processes
+        */
+       if (kfd_gws_init(kfd)) {
+               dev_err(kfd_device, "Could not allocate %d gws\n",
+                       amdgpu_amdkfd_get_num_gws(kfd->kgd));
+               goto gws_error;
+       }
+

        if (kfd_iommu_device_init(kfd)) {
                dev_err(kfd_device, "Error initializing iommuv2\n");
                goto device_iommu_error;
        if (kfd_iommu_device_init(kfd)) {
                dev_err(kfd_device, "Error initializing iommuv2\n");
                goto device_iommu_error;


@@ -691,6 +712,7 @@ bool kgd2kfd_device_init(struct kfd_dev *kfd,
 kfd_topology_add_device_error:
 kfd_resume_error:
 device_iommu_error:
 kfd_topology_add_device_error:
 kfd_resume_error:
 device_iommu_error:

+gws_error:

        device_queue_manager_uninit(kfd->dqm);
 device_queue_manager_error:
        kfd_interrupt_exit(kfd);
        device_queue_manager_uninit(kfd->dqm);
 device_queue_manager_error:
        kfd_interrupt_exit(kfd);


@@ -701,7 +723,7 @@ kfd_doorbell_error:
 kfd_gtt_sa_init_error:
        amdgpu_amdkfd_free_gtt_mem(kfd->kgd, kfd->gtt_mem);
 alloc_gtt_mem_failure:
 kfd_gtt_sa_init_error:
        amdgpu_amdkfd_free_gtt_mem(kfd->kgd, kfd->gtt_mem);
 alloc_gtt_mem_failure:

-       if (hws_gws_support)
+       if (kfd->gws)

                amdgpu_amdkfd_free_gws(kfd->kgd, kfd->gws);
        dev_err(kfd_device,
                "device %x:%x NOT added due to errors\n",
                amdgpu_amdkfd_free_gws(kfd->kgd, kfd->gws);
        dev_err(kfd_device,
                "device %x:%x NOT added due to errors\n",


@@ -720,7 +742,7 @@ void kgd2kfd_device_exit(struct kfd_dev *kfd)
                kfd_doorbell_fini(kfd);
                kfd_gtt_sa_fini(kfd);
                amdgpu_amdkfd_free_gtt_mem(kfd->kgd, kfd->gtt_mem);
                kfd_doorbell_fini(kfd);
                kfd_gtt_sa_fini(kfd);
                amdgpu_amdkfd_free_gtt_mem(kfd->kgd, kfd->gtt_mem);

-               if (hws_gws_support)
+               if (kfd->gws)

                        amdgpu_amdkfd_free_gws(kfd->kgd, kfd->gws);
        }
 
                        amdgpu_amdkfd_free_gws(kfd->kgd, kfd->gws);
        }
 

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
index 5e7f1fb6761bff59c81a0c7ea9fa7b7affe84f0e..43b888b311c7064ed4a1a8c13577f673ef22e9f2 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
@@ -282,6 +282,7 @@ struct kfd_dev {
 
        /* Firmware versions */
        uint16_t mec_fw_version;
 
        /* Firmware versions */
        uint16_t mec_fw_version;

+       uint16_t mec2_fw_version;

        uint16_t sdma_fw_version;
 
        /* Maximum process number mapped to HW scheduler */
        uint16_t sdma_fw_version;
 
        /* Maximum process number mapped to HW scheduler */

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
index 1c090824cad750071f7fcb4c36403825af3b1463..bc4a22df12d79a0badfac7ce937b9c89e90d74d1 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
@@ -1319,7 +1319,7 @@ int kfd_topology_add_device(struct kfd_dev *gpu)
                                gpu->device_info->num_xgmi_sdma_engines;
        dev->node_props.num_sdma_queues_per_engine =
                                gpu->device_info->num_sdma_queues_per_engine;
                                gpu->device_info->num_xgmi_sdma_engines;
        dev->node_props.num_sdma_queues_per_engine =
                                gpu->device_info->num_sdma_queues_per_engine;

-       dev->node_props.num_gws = (hws_gws_support &&
+       dev->node_props.num_gws = (dev->gpu->gws &&

                dev->gpu->dqm->sched_policy != KFD_SCHED_POLICY_NO_HWS) ?
                amdgpu_amdkfd_get_num_gws(dev->gpu->kgd) : 0;
        dev->node_props.num_cp_queues = get_cp_queues_num(dev->gpu->dqm);
                dev->gpu->dqm->sched_policy != KFD_SCHED_POLICY_NO_HWS) ?
                amdgpu_amdkfd_get_num_gws(dev->gpu->kgd) : 0;
        dev->node_props.num_cp_queues = get_cp_queues_num(dev->gpu->dqm);