nouveau: remove the block parameter to nouveau_range_fault

The parameter is always false, so remove it as well as the -EAGAIN
handling that can only happen for the non-blocking case.

Link: https://lore.kernel.org/r/20190724065258.16603-4-hch@lst.de
Tested-by: Ralph Campbell <rcampbell@nvidia.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Jason Gunthorpe <jgg@mellanox.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>

diff --git a/drivers/gpu/drm/nouveau/nouveau_svm.c b/drivers/gpu/drm/nouveau/nouveau_svm.c
index 6c1b04de0db86b4404c2ddc5910db16768e46fdf..e3097492b4ad49b778773930fc36c19a0ce33280 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_svm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_svm.c
@@ -485,8 +485,7 @@ nouveau_range_done(struct hmm_range *range)
 }
 
 static int
-nouveau_range_fault(struct hmm_mirror *mirror, struct hmm_range *range,
-                   bool block)
+nouveau_range_fault(struct hmm_mirror *mirror, struct hmm_range *range)
 {
        long ret;
 
@@ -504,13 +503,12 @@ nouveau_range_fault(struct hmm_mirror *mirror, struct hmm_range *range,
                return -EAGAIN;
        }
 
-       ret = hmm_range_fault(range, block);
+       ret = hmm_range_fault(range, true);
        if (ret <= 0) {
                if (ret == -EBUSY || !ret) {
                        up_read(&range->vma->vm_mm->mmap_sem);
                        ret = -EBUSY;
-               } else if (ret == -EAGAIN)
-                       ret = -EBUSY;
+               }
                hmm_range_unregister(range);
                return ret;
        }
@@ -691,7 +689,7 @@ nouveau_svm_fault(struct nvif_notify *notify)
                range.values = nouveau_svm_pfn_values;
                range.pfn_shift = NVIF_VMM_PFNMAP_V0_ADDR_SHIFT;
 again:
-               ret = nouveau_range_fault(&svmm->mirror, &range, true);
+               ret = nouveau_range_fault(&svmm->mirror, &range);
                if (ret == 0) {
                        mutex_lock(&svmm->mutex);
                        if (!nouveau_range_done(&range)) {