drm/amdgpu: Add user queue instance count in HW IP info
Subsystems (3)
PATCH v3 1/1 drm/amdgpu: Add user queue instance count in HW IP info
This change exposes the number of available user queue instances for each hardware IP type (GFX, COMPUTE, SDMA) through the drm_amdgpu_info_hw_ip interface.
Key changes:
1. Added userq_num_instance field to drm_amdgpu_info_hw_ip structure
2. Implemented counting of available HQD slots using:
- mes.gfx_hqd_mask for GFX queues
- mes.compute_hqd_mask for COMPUTE queues
- mes.sdma_hqd_mask for SDMA queues
3. Only counts available instances when user queues are enabled (!disable_uq)
V2: using the adev->mes.gfx_hqd_mask[]/compute_hqd_mask[]/sdma_hqd_mask[] masks
to determine the number of queue slots available for each engine type (Alex)
V3: rename userq_num_instance to userq_num_hqds (Alex)
--- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 17 +++++++++++++++++ include/uapi/drm/amdgpu_drm.h | 2 ++ 2 files changed, 19 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +17 -0
@@ -399,6 +399,7 @@ static int amdgpu_hw_ip_info(struct amdgpu_device *adev,uint32_t ib_size_alignment =0 ;enum amd_ip_block_type type;unsigned int num_rings =0 ; +uint32_t num_hqds =0 ;unsigned int i, j;if (info->query_hw_ip.ip_instance >=AMDGPU_HW_IP_INSTANCE_MAX_COUNT )
@@ -411,6 +412,11 @@ static int amdgpu_hw_ip_info(struct amdgpu_device *adev,if (adev->gfx.gfx_ring[i].sched.ready && !adev->gfx.gfx_ring[i].no_user_submission) ++num_rings; + +if (!adev->gfx.disable_uq) +for (i =0 ; i <AMDGPU_MES_MAX_GFX_PIPES ; i++) + num_hqds +=hweight32 (adev->mes.gfx_hqd_mask[i]); + ib_start_alignment =32 ; ib_size_alignment =32 ;break ;
@@ -420,6 +426,11 @@ static int amdgpu_hw_ip_info(struct amdgpu_device *adev,if (adev->gfx.compute_ring[i].sched.ready && !adev->gfx.compute_ring[i].no_user_submission) ++num_rings; + +if (!adev->sdma.disable_uq) +for (i =0 ; i <AMDGPU_MES_MAX_COMPUTE_PIPES ; i++) + num_hqds +=hweight32 (adev->mes.compute_hqd_mask[i]); + ib_start_alignment =32 ; ib_size_alignment =32 ;break ;
@@ -429,6 +440,11 @@ static int amdgpu_hw_ip_info(struct amdgpu_device *adev,if (adev->sdma.instance[i].ring.sched.ready && !adev->sdma.instance[i].ring.no_user_submission) ++num_rings; + +if (!adev->gfx.disable_uq) +for (i =0 ; i <AMDGPU_MES_MAX_SDMA_PIPES ; i++) + num_hqds +=hweight32 (adev->mes.sdma_hqd_mask[i]); + ib_start_alignment =256 ; ib_size_alignment =4 ;break ;
@@ -570,6 +586,7 @@ static int amdgpu_hw_ip_info(struct amdgpu_device *adev, } result->capabilities_flags =0 ; result->available_rings = (1 << num_rings) -1 ; + result->userq_num_hqds = num_hqds; result->ib_start_alignment = ib_start_alignment; result->ib_size_alignment = ib_size_alignment;return 0 ;
include/uapi/drm/amdgpu_drm.h +2 -0
@@ -1493,6 +1493,8 @@ struct drm_amdgpu_info_hw_ip {__u32 available_rings;/** version info: bits 23:16 major, 15:8 minor, 7:0 revision */ __u32 ip_discovery_version; +/* Userq available hqds */ +__u32 userq_num_hqds; };/* GFX metadata BO sizes and alignment info (in bytes) */
Signature · 1 line
2.34.1
Quoted 39 lines · Jesse Zhang
This change exposes the number of available user queue instances for each hardware IP type (GFX, COMPUTE, SDMA) through the
drm_amdgpu_info_hw_ipinterface.Key changes:
1. Addeduserq_num_instancefield todrm_amdgpu_info_hw_ipstructure
2. Implemented counting of available HQD slots using:
- mes.gfx_hqd_mask for GFX queues
- mes.compute_hqd_mask for COMPUTE queues
- mes.sdma_hqd_mask for SDMA queues
3. Only counts available instances when user queues are enabled (!disable_uq)V2: using the adev->mes.gfx_hqd_mask[]/compute_hqd_mask[]/sdma_hqd_mask[] masks
to determine the number of queue slots available for each engine type (Alex)V3: rename
userq_num_instancetouserq_num_hqds(Alex)Suggested-by Alex Deucher <[email protected]>Signed-off-by Jesse Zhang <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 17 +++++++++++++++++ include/uapi/drm/amdgpu_drm.h | 2 ++ 2 files changed, 19 insertions(+)drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +1
-0@@ -399,6 +399,7 @@ static int amdgpu_hw_ip_info(struct amdgpu_device *adev,uint32_t ib_size_alignment =0 ;enum amd_ip_block_type type;unsigned int num_rings =0 ; +uint32_t num_hqds =0 ;unsigned int i, j;if (info->query_hw_ip.ip_instance >=AMDGPU_HW_IP_INSTANCE_MAX_COUNT )
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c static int amdgpu_hw_ip_info(struct amdgpu_device *adev, · line 419
Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +5
-0@@ -411,6 +412,11 @@ static int amdgpu_hw_ip_info(struct amdgpu_device *adev,if (adev->gfx.gfx_ring[i].sched.ready && !adev->gfx.gfx_ring[i].no_user_submission) ++num_rings; + +if (!adev->gfx.disable_uq) +for (i =0 ; i <AMDGPU_MES_MAX_GFX_PIPES ; i++) + num_hqds +=hweight32 (adev->mes.gfx_hqd_mask[i]); +
I think kernel coding style recommends putting parens around this. E.g.,
if (!adev->gfx.disable_uq) {
for (i = 0; i < AMDGPU_MES_MAX_GFX_PIPES; i++)
num_hqds += hweight32(adev->mes.gfx_hqd_mask[i]);
}Same for the others below. WIth these fixed:
Quoted 51 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +11
-0ib_start_alignment =32 ; ib_size_alignment =32 ;break ;@@ -420,6 +426,11 @@ static int amdgpu_hw_ip_info(struct amdgpu_device *adev,if (adev->gfx.compute_ring[i].sched.ready && !adev->gfx.compute_ring[i].no_user_submission) ++num_rings; + +if (!adev->sdma.disable_uq) +for (i =0 ; i <AMDGPU_MES_MAX_COMPUTE_PIPES ; i++) + num_hqds +=hweight32 (adev->mes.compute_hqd_mask[i]); + ib_start_alignment =32 ; ib_size_alignment =32 ;break ;@@ -429,6 +440,11 @@ static int amdgpu_hw_ip_info(struct amdgpu_device *adev,if (adev->sdma.instance[i].ring.sched.ready && !adev->sdma.instance[i].ring.no_user_submission) ++num_rings; + +if (!adev->gfx.disable_uq) +for (i =0 ; i <AMDGPU_MES_MAX_SDMA_PIPES ; i++) + num_hqds +=hweight32 (adev->mes.sdma_hqd_mask[i]); + ib_start_alignment =256 ; ib_size_alignment =4 ;break ;@@ -570,6 +586,7 @@ static int amdgpu_hw_ip_info(struct amdgpu_device *adev, } result->capabilities_flags =0 ; result->available_rings = (1 << num_rings) -1 ; + result->userq_num_hqds = num_hqds; result->ib_start_alignment = ib_start_alignment; result->ib_size_alignment = ib_size_alignment;return 0 ;include/uapi/drm/amdgpu_drm.h +2
-1@@ -1493,6 +1493,8 @@ struct drm_amdgpu_info_hw_ip {__u32 available_rings;/** version info: bits 23:16 major, 15:8 minor, 7:0 revision */ __u32 ip_discovery_version; +/* Userq available hqds */ +__u32 userq_num_hqds; };/* GFX metadata BO sizes and alignment info (in bytes) */ --2.34.1