drm/amdkfd: DIQ should not use HIQ way to allocate memory

In the mqd_diq_sdma buffer, there should be only one HIQ mqd. All DIQs
should be allocated somewhere else using the regular way.

Signed-off-by: Yong Zhao <Yong.Zhao@amd.com>
Reviewed-by: Oak Zeng <Oak.Zeng@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c
index b08694ec65d7de876f47f2b5051f19e34a8af910..19f0fe547c57582e42282cce14f5c3d154d1f888 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c
@@ -400,7 +400,7 @@ struct mqd_manager *mqd_manager_init_cik(enum KFD_MQD_TYPE type,
 #endif
                break;
        case KFD_MQD_TYPE_DIQ:
-               mqd->allocate_mqd = allocate_hiq_mqd;
+               mqd->allocate_mqd = allocate_mqd;
                mqd->init_mqd = init_mqd_hiq;
                mqd->free_mqd = free_mqd;
                mqd->load_mqd = load_mqd;

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v10.c b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v10.c
index 5a0e30441be897b605b3486ad42b6cc3ff68010b..8d21325b5cbb9d201c608e08ec1edc49810d28ed 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v10.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v10.c
@@ -432,7 +432,7 @@ struct mqd_manager *mqd_manager_init_v10(enum KFD_MQD_TYPE type,
                pr_debug("%s@%i\n", __func__, __LINE__);
                break;
        case KFD_MQD_TYPE_DIQ:
-               mqd->allocate_mqd = allocate_hiq_mqd;
+               mqd->allocate_mqd = allocate_mqd;
                mqd->init_mqd = init_mqd_hiq;
                mqd->free_mqd = free_mqd;
                mqd->load_mqd = load_mqd;

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c
index bdbcea22ad1215acc277c6a5c1419a2586976a32..df77d67ec9aa5c3502f0c01a009b2f6c7c91f066 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c
@@ -471,7 +471,7 @@ struct mqd_manager *mqd_manager_init_v9(enum KFD_MQD_TYPE type,
 #endif
                break;
        case KFD_MQD_TYPE_DIQ:
-               mqd->allocate_mqd = allocate_hiq_mqd;
+               mqd->allocate_mqd = allocate_mqd;
                mqd->init_mqd = init_mqd_hiq;
                mqd->free_mqd = free_mqd;
                mqd->load_mqd = load_mqd;

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c
index c9e1151b5a570067ea12575b2f5ca9968549a4ac..3b6b5671964c78d840905fd51b48c10f1435397e 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c
@@ -452,7 +452,7 @@ struct mqd_manager *mqd_manager_init_vi(enum KFD_MQD_TYPE type,
 #endif
                break;
        case KFD_MQD_TYPE_DIQ:
-               mqd->allocate_mqd = allocate_hiq_mqd;
+               mqd->allocate_mqd = allocate_mqd;
                mqd->init_mqd = init_mqd_hiq;
                mqd->free_mqd = free_mqd;
                mqd->load_mqd = load_mqd;