Merge tag 'amd-drm-next-5.8-2020-05-12' of git://people.freedesktop.org/~agd5f/linux...

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

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
index 93d057f92dcd66eea2770cc08fd1410faac5a9b2..eff1f73302de9da22ef1e3b8456b304c81c16bed 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@ -863,7 +863,6 @@ struct amdgpu_ttm_tt {
 static const uint64_t hmm_range_flags[HMM_PFN_FLAG_MAX] = {
        (1 << 0), /* HMM_PFN_VALID */
        (1 << 1), /* HMM_PFN_WRITE */
-       0 /* HMM_PFN_DEVICE_PRIVATE */
 };
 
 static const uint64_t hmm_range_values[HMM_PFN_VALUE_MAX] = {
@@ -944,7 +943,7 @@ retry:
        range->notifier_seq = mmu_interval_read_begin(&bo->notifier);
 
        down_read(&mm->mmap_sem);
-       r = hmm_range_fault(range, 0);
+       r = hmm_range_fault(range);
        up_read(&mm->mmap_sem);
        if (unlikely(r <= 0)) {
                /*