OSDN Git Service

drm/nouveau/svm: remove useless SVM range check
authorRalph Campbell <rcampbell@nvidia.com>
Wed, 4 Mar 2020 00:13:38 +0000 (16:13 -0800)
committerBen Skeggs <bskeggs@redhat.com>
Tue, 7 Apr 2020 04:37:49 +0000 (14:37 +1000)
When nouveau processes GPU faults, it checks to see if the fault address
falls within the "unmanaged" range which is reserved for fixed allocations
instead of addresses chosen by the core mm code. If start is greater than
or equal to svmm->unmanaged.limit, then limit will also be greater than
svmm->unmanaged.limit which is greater than svmm->unmanaged.start and the
start = max_t(u64, start, svmm->unmanaged.limit) will change nothing.
Just remove the useless lines of code.

Signed-off-by: Ralph Campbell <rcampbell@nvidia.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/nouveau_svm.c

index c567526..8dfa5cb 100644 (file)
@@ -663,9 +663,6 @@ nouveau_svm_fault(struct nvif_notify *notify)
                limit = start + (ARRAY_SIZE(args.phys) << PAGE_SHIFT);
                if (start < svmm->unmanaged.limit)
                        limit = min_t(u64, limit, svmm->unmanaged.start);
-               else
-               if (limit > svmm->unmanaged.start)
-                       start = max_t(u64, start, svmm->unmanaged.limit);
                SVMM_DBG(svmm, "wndw %016llx-%016llx", start, limit);
 
                mm = svmm->notifier.mm;