drm/amdkfd: rename device_queue_manager_init_v10_navi10()

Drop the navi10 in the name for consistency with other
families.  All gfx10 parts use the same implementation.

Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>
Acked-by: Christian König <christian.koenig@amd.com>
Tested-by: Mike Lothian <mike@fireburn.co.uk>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
index 20aa3b7dbc36257e52426480354e656747296fe2..24ea3a596b382bba1f9f6c30d2d68f4cd377d34d 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
@@ -2577,7 +2577,7 @@ struct device_queue_manager *device_queue_manager_init(struct kfd_node *dev)
                if (KFD_GC_VERSION(dev) >= IP_VERSION(11, 0, 0))
                        device_queue_manager_init_v11(&dqm->asic_ops);
                else if (KFD_GC_VERSION(dev) >= IP_VERSION(10, 1, 1))
-                       device_queue_manager_init_v10_navi10(&dqm->asic_ops);
+                       device_queue_manager_init_v10(&dqm->asic_ops);
                else if (KFD_GC_VERSION(dev) >= IP_VERSION(9, 0, 1))
                        device_queue_manager_init_v9(&dqm->asic_ops);
                else {

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h
index 805d2e4f907a83c49f01da39f4a43d58b40ab739..cf7e182588f8072c5228a97edb032a2c9707fdb0 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h
@@ -273,7 +273,7 @@ void device_queue_manager_init_vi(
                struct device_queue_manager_asic_ops *asic_ops);
 void device_queue_manager_init_v9(
                struct device_queue_manager_asic_ops *asic_ops);
-void device_queue_manager_init_v10_navi10(
+void device_queue_manager_init_v10(
                struct device_queue_manager_asic_ops *asic_ops);
 void device_queue_manager_init_v11(
                struct device_queue_manager_asic_ops *asic_ops);

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager_v10.c b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager_v10.c
index f1a1f5753e652cf919950ab96ccfff258a4c0d99..245a90dfc2f6b3fcd6ab1becea3a819c2cc6cbf8 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager_v10.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager_v10.c
@@ -32,7 +32,7 @@ static int update_qpd_v10(struct device_queue_manager *dqm,
 static void init_sdma_vm_v10(struct device_queue_manager *dqm, struct queue *q,
                            struct qcm_process_device *qpd);
 
-void device_queue_manager_init_v10_navi10(
+void device_queue_manager_init_v10(
        struct device_queue_manager_asic_ops *asic_ops)
 {
        asic_ops->update_qpd = update_qpd_v10;