Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

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

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c
index f4370081f6e60bafc3003e100e2eb41911d59951..fe818501c520ba4dc332314ef848b7e48a4a2e32 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c
@@ -332,12 +332,13 @@ int amdgpu_gart_bind(struct amdgpu_device *adev, uint64_t offset,
                adev->gart.pages[p] = pagelist[i];
 #endif
 
-       if (adev->gart.ptr) {
-               r = amdgpu_gart_map(adev, offset, pages, dma_addr, flags,
-                           adev->gart.ptr);
-               if (r)
-                       return r;
-       }
+       if (!adev->gart.ptr)
+               return 0;
+
+       r = amdgpu_gart_map(adev, offset, pages, dma_addr, flags,
+                   adev->gart.ptr);
+       if (r)
+               return r;
 
        mb();
        amdgpu_gart_flush_gpu_tlb(adev, 0);