drm/amdgpu/userq: add a helper to check which IPs are enabled

Add a helper to get a mask of IPs which support user queues.
Use this in the INFO IOCTL to get the IP mask to replace
the current code.

Reviewed-by: Prike Liang <Prike.Liang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
index 3d319687c1c9cbf8a98db6271b56b5c420e8c696..151366ecc0af6127c6f9be68ecfeadf5ff62286d 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
@@ -1009,12 +1009,7 @@ out:
                        }
                }
 
-               if (adev->userq_funcs[AMDGPU_HW_IP_GFX])
-                       dev_info->userq_ip_mask |= (1 << AMDGPU_HW_IP_GFX);
-               if (adev->userq_funcs[AMDGPU_HW_IP_COMPUTE])
-                       dev_info->userq_ip_mask |= (1 << AMDGPU_HW_IP_COMPUTE);
-               if (adev->userq_funcs[AMDGPU_HW_IP_DMA])
-                       dev_info->userq_ip_mask |= (1 << AMDGPU_HW_IP_DMA);
+               dev_info->userq_ip_mask = amdgpu_userqueue_get_supported_ip_mask(adev);
 
                ret = copy_to_user(out, dev_info,
                                   min((size_t)size, sizeof(*dev_info))) ? -EFAULT : 0;

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_userqueue.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_userqueue.c
index 8f6510b78deeec45afb7a5e8fa1beca1aee9eee7..59488acd89fa8e0187d17428b0fc445d01c7b4dd 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_userqueue.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_userqueue.c
@@ -31,6 +31,19 @@
 #include "amdgpu_userqueue.h"
 #include "amdgpu_userq_fence.h"
 
+u32 amdgpu_userqueue_get_supported_ip_mask(struct amdgpu_device *adev)
+{
+       int i;
+       u32 userq_ip_mask = 0;
+
+       for (i = 0; i < AMDGPU_HW_IP_NUM; i++) {
+               if (adev->userq_funcs[i])
+                       userq_ip_mask |= (1 << i);
+       }
+
+       return userq_ip_mask;
+}
+
 static void
 amdgpu_userqueue_cleanup(struct amdgpu_userq_mgr *uq_mgr,
                         struct amdgpu_usermode_queue *queue,

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_userqueue.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_userqueue.h
index b2da513b3d02187f6da7805f8fe4b5407e2a8173..b49f147eb69cb4ec3ff598b49b29ea239946c0f3 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_userqueue.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_userqueue.h
@@ -113,6 +113,8 @@ uint64_t amdgpu_userqueue_get_doorbell_index(struct amdgpu_userq_mgr *uq_mgr,
                                             struct amdgpu_db_info *db_info,
                                             struct drm_file *filp);
 
+u32 amdgpu_userqueue_get_supported_ip_mask(struct amdgpu_device *adev);
+
 int amdgpu_userq_suspend(struct amdgpu_device *adev);
 int amdgpu_userq_resume(struct amdgpu_device *adev);