This will allow it to be used outside of gfx9
Signed-off-by: Kent Russell <[email protected]>
---
drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c | 14 ++++++++++++++
drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.h | 2 ++
drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 14 --------------
3 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c
b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c
index d88d0de58edd..02b52f907f80 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c
@@ -315,3 +315,17 @@ bool kfd_check_hiq_mqd_doorbell_id(struct kfd_node *node,
uint32_t doorbell_id,
return false;
}
+
+bool mqd_on_vram(struct amdgpu_device *adev)
+{
+ if (adev->apu_prefer_gtt)
+ return false;
+
+ switch (amdgpu_ip_version(adev, GC_HWIP, 0)) {
+ case IP_VERSION(9, 4, 3):
+ case IP_VERSION(9, 5, 0):
+ return true;
+ default:
+ return false;
+ }
+}
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.h
b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.h
index 06ca6235ff1b..140ee1fc5d81 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.h
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.h
@@ -201,4 +201,6 @@ uint64_t kfd_mqd_stride(struct mqd_manager *mm,
struct queue_properties *q);
bool kfd_check_hiq_mqd_doorbell_id(struct kfd_node *node, uint32_t doorbell_id,
uint32_t inst);
+bool mqd_on_vram(struct amdgpu_device *adev);
+
#endif /* KFD_MQD_MANAGER_H_ */
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 7232a0117a00..1f9b342ef085 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c
@@ -115,20 +115,6 @@ static void set_priority(struct v9_mqd *m, struct
queue_properties *q)
m->cp_hqd_pipe_priority = pipe_priority_map[q->priority];
}
-static bool mqd_on_vram(struct amdgpu_device *adev)
-{
- if (adev->apu_prefer_gtt)
- return false;
-
- switch (amdgpu_ip_version(adev, GC_HWIP, 0)) {
- case IP_VERSION(9, 4, 3):
- case IP_VERSION(9, 5, 0):
- return true;
- default:
- return false;
- }
-}
-
static struct kfd_mem_obj *allocate_mqd(struct mqd_manager *mm,
struct queue_properties *q)
{
--
2.43.0
