drm/amdkfd: Move mqd_on_vram out of v9 mqd manager
Subsystems (3)
PATCH 1/3 drm/amdkfd: Move mqd_on_vram out of v9 mqd manager
This will allow it to be used outside of gfx9
--- 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(-)
drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c +14 -0
@@ -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; + } +}
drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.h +2 -0
@@ -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_ */
drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c +0 -14
@@ -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) {
Signature · 1 line
2.43.0
PATCH 2/3 drm/amdkfd: Extend MQDs in HBM to gfx942
This has proven stable and performant on gfx943 and gfx950, so extend it to the Aldebaran/gfx942 series
--- drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c +1 -0
@@ -322,6 +322,7 @@ bool mqd_on_vram(struct amdgpu_device *adev)return false;switch (amdgpu_ip_version (adev,GC_HWIP ,0 )) { +case IP_VERSION (9 ,4 ,2 ):case IP_VERSION (9 ,4 ,3 ):case IP_VERSION (9 ,5 ,0 ):return true;
Signature · 1 line
2.43.0
Re: [PATCH 2/3] drm/amdkfd: Extend MQDs in HBM to gfx942
Simple change, makes sense
Change is
________________________________________
From: amd-gfx <[email protected]> on behalf of Kent Russell <[email protected]>
Sent: Wednesday, June 3, 2026 9:27 AM
To: [email protected]
Cc: Russell, Kent
Subject: [PATCH 2/3] drm/amdkfd: Extend MQDs in HBM to gfx942
This has proven stable and performant on gfx943 and gfx950, so extend it to the Aldebaran/gfx942 series
--- drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c +1 -0
@@ -322,6 +322,7 @@ bool mqd_on_vram(struct amdgpu_device *adev)return false;switch (amdgpu_ip_version (adev,GC_HWIP ,0 )) { +case IP_VERSION (9 ,4 ,2 ):case IP_VERSION (9 ,4 ,3 ):case IP_VERSION (9 ,5 ,0 ):return true;
--
2.43.0
PATCH 3/3 drm/amdkfd: Extend MQDs in HBM to gfx944
In reply to Kent RussellThis has proven stable and performant on gfx943 and gfx950, so extend it to gfx944 as well
--- drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c +1 -0
@@ -324,6 +324,7 @@ bool mqd_on_vram(struct amdgpu_device *adev)switch (amdgpu_ip_version (adev,GC_HWIP ,0 )) {case IP_VERSION (9 ,4 ,2 ):case IP_VERSION (9 ,4 ,3 ): +case IP_VERSION (9 ,4 ,4 ):case IP_VERSION (9 ,5 ,0 ):return true;default :
Signature · 1 line
2.43.0
Re: [PATCH 3/3] drm/amdkfd: Extend MQDs in HBM to gfx944
Looks simple enough
________________________________________
From: amd-gfx <[email protected]> on behalf of Kent Russell <[email protected]>
Sent: Wednesday, June 3, 2026 9:27 AM
To: [email protected]
Cc: Russell, Kent
Subject: [PATCH 3/3] drm/amdkfd: Extend MQDs in HBM to gfx944
This has proven stable and performant on gfx943 and gfx950, so extend it to gfx944 as well
--- drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c +1 -0
@@ -324,6 +324,7 @@ bool mqd_on_vram(struct amdgpu_device *adev)switch (amdgpu_ip_version (adev,GC_HWIP ,0 )) {case IP_VERSION (9 ,4 ,2 ):case IP_VERSION (9 ,4 ,3 ): +case IP_VERSION (9 ,4 ,4 ):case IP_VERSION (9 ,5 ,0 ):return true;default :
--
2.43.0
Looks straightforward to me.
Assuming this compiles, it's
________________________________________
From: amd-gfx <[email protected]> on behalf of Kent Russell <[email protected]>
Sent: Wednesday, June 3, 2026 9:27 AM
To: [email protected]
Cc: Russell, Kent
Subject: [PATCH 1/3] drm/amdkfd: Move mqd_on_vram out of v9 mqd manager
This will allow it to be used outside of gfx9
--- 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(-)
drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c +14 -0
@@ -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; + } +}
drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.h +2 -0
@@ -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_ */
drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c +0 -14
@@ -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