drm/amdkfd: bail out early if no get_atc_vmid_pasid_mapping_info

it makes no sense to continue with an undefined vmid.

Fixes: c8b0507f40deea ("drm/amdkfd: judge get_atc_vmid_pasid_mapping_info before call")
Signed-off-by: Yifan Zhang <yifan1.zhang@amd.com>
Reported-by: Nathan Chancellor <nathan@kernel.org>
Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
index 77364afdc606488c54d2540853fde5caf7facf90..acf4f79758501367b6b63733c392ca33e4e23010 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
@@ -500,21 +500,24 @@ static int dbgdev_wave_reset_wavefronts(struct kfd_dev *dev, struct kfd_process
 
        pr_debug("Killing all process wavefronts\n");
 
+       if (!dev->kfd2kgd->get_atc_vmid_pasid_mapping_info) {
+               pr_err("no vmid pasid mapping supported \n");
+               return -EOPNOTSUPP;
+       }
+
        /* Scan all registers in the range ATC_VMID8_PASID_MAPPING ..
         * ATC_VMID15_PASID_MAPPING
         * to check which VMID the current process is mapped to.
         */
 
-       if (dev->kfd2kgd->get_atc_vmid_pasid_mapping_info) {
-               for (vmid = first_vmid_to_scan; vmid <= last_vmid_to_scan; vmid++) {
-                       status = dev->kfd2kgd->get_atc_vmid_pasid_mapping_info
-                                       (dev->adev, vmid, &queried_pasid);
+       for (vmid = first_vmid_to_scan; vmid <= last_vmid_to_scan; vmid++) {
+               status = dev->kfd2kgd->get_atc_vmid_pasid_mapping_info
+                               (dev->adev, vmid, &queried_pasid);
 
-                       if (status && queried_pasid == p->pasid) {
-                               pr_debug("Killing wave fronts of vmid %d and pasid 0x%x\n",
-                                               vmid, p->pasid);
-                               break;
-                       }
+               if (status && queried_pasid == p->pasid) {
+                       pr_debug("Killing wave fronts of vmid %d and pasid 0x%x\n",
+                                       vmid, p->pasid);
+                       break;
                }
        }