2 files changed, 10 insertions, 8 deletions

diff --git a/drivers/gpu/drm/amd/amdkfd/Kconfig b/drivers/gpu/drm/amd/amdkfd/Kconfig
index ed2f06c9f346..3858820a0055 100644
--- a/drivers/gpu/drm/amd/amdkfd/Kconfig
+++ b/drivers/gpu/drm/amd/amdkfd/Kconfig
@@ -6,5 +6,6 @@ config HSA_AMD
         tristate "HSA kernel driver for AMD GPU devices"
         depends on DRM_AMDGPU && X86_64
         imply AMD_IOMMU_V2
+        select MMU_NOTIFIER
         help
           Enable this if you want to use HSA features on AMD GPU devices.
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
index cd679cf1fd30..59808a39ecf4 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
@@ -749,12 +749,13 @@ static int kfd_ioctl_get_clock_counters(struct file *filep,
         struct timespec64 time;
 
         dev = kfd_device_by_id(args->gpu_id);
-        if (dev == NULL)
-                return -EINVAL;
-
-        /* Reading GPU clock counter from KGD */
-        args->gpu_clock_counter =
-                dev->kfd2kgd->get_gpu_clock_counter(dev->kgd);
+        if (dev)
+                /* Reading GPU clock counter from KGD */
+                args->gpu_clock_counter =
+                        dev->kfd2kgd->get_gpu_clock_counter(dev->kgd);
+        else
+                /* Node without GPU resource */
+                args->gpu_clock_counter = 0;
 
         /* No access to rdtsc. Using raw monotonic time */
         getrawmonotonic64(&time);
@@ -1147,7 +1148,7 @@ err_unlock:
         return ret;
 }
 
-bool kfd_dev_is_large_bar(struct kfd_dev *dev)
+static bool kfd_dev_is_large_bar(struct kfd_dev *dev)
 {
         struct kfd_local_mem_info mem_info;
 
@@ -1421,7 +1422,7 @@ static int kfd_ioctl_unmap_memory_from_gpu(struct file *filep,
 
         pdd = kfd_get_process_device_data(dev, p);
         if (!pdd) {
-                err = PTR_ERR(pdd);
+                err = -EINVAL;
                 goto bind_process_to_device_failed;
         }