Merge tag '6.7-rc-ksmbd-server-fixes' of git://git.samba.org/ksmbd

[linux.git] / drivers / gpu / drm / amd / amdgpu / amdgpu_gem.c

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
index ca4d2d430e28c8f559ba64be1cf3432a1fe5e289..84beeaa4d21ca741124e8e99b563c0e2d2527daa 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
@@ -791,7 +791,7 @@ int amdgpu_gem_va_ioctl(struct drm_device *dev, void *data,
        default:
                break;
        }
-       if (!r && !(args->flags & AMDGPU_VM_DELAY_UPDATE) && !amdgpu_vm_debug)
+       if (!r && !(args->flags & AMDGPU_VM_DELAY_UPDATE) && !adev->debug_vm)
                amdgpu_gem_va_update_vm(adev, &fpriv->vm, bo_va,
                                        args->operation);
 
@@ -962,6 +962,7 @@ static int amdgpu_debugfs_gem_info_show(struct seq_file *m, void *unused)
        list_for_each_entry(file, &dev->filelist, lhead) {
                struct task_struct *task;
                struct drm_gem_object *gobj;
+               struct pid *pid;
                int id;
 
                /*
@@ -971,8 +972,9 @@ static int amdgpu_debugfs_gem_info_show(struct seq_file *m, void *unused)
                 * Therefore, we need to protect this ->comm access using RCU.
                 */
                rcu_read_lock();
-               task = pid_task(file->pid, PIDTYPE_TGID);
-               seq_printf(m, "pid %8d command %s:\n", pid_nr(file->pid),
+               pid = rcu_dereference(file->pid);
+               task = pid_task(pid, PIDTYPE_TGID);
+               seq_printf(m, "pid %8d command %s:\n", pid_nr(pid),
                           task ? task->comm : "<unknown>");
                rcu_read_unlock();