Merge branch 'drm-next-4.16' of git://people.freedesktop.org/~agd5f/linux into drm-next

 A few more fixes for 4.16, nothing major.

A few more fixes for 4.16.  This is on top of the pull request from
last week.  Most notable change here is a fix to the link order for
the now separate from amdgpu GPU scheduler to fix crashes when the
modules are build into the kernel rather than as modules.

* 'drm-next-4.16' of git://people.freedesktop.org/~agd5f/linux:
  drm: fix gpu scheduler link order
  drm/amd/display: Demote error print to debug print when ATOM impl missing
  drm/amdgpu: Avoid leaking PM domain on driver unbind (v2)
  drm/amd/amdgpu: Add Polaris version check
  drm/amdgpu: Reenable manual GPU reset from sysfs
  drm/amdgpu: disable MMHUB power gating on raven
  drm/ttm: Don't unreserve swapped BOs that were previously reserved
  drm/ttm: Don't add swapped BOs to swap-LRU list
  drm/amdgpu: only check for ECC on Vega10
  drm/amd/powerplay: Fix smu_table_entry.handle type
  drm/ttm: add VADDR_FLAG_UPDATED_COUNT to correctly update dma_page global count
  drm/radeon: fill in rb backend map on evergreen/ni.
  drm/amdgpu/gfx9: fix ngg enablement to clear gds reserved memory (v2)
  drm/ttm: only free pages rather than update global memory count together
  drm/amdgpu: fix CPU based VM updates
  drm/amdgpu: fix typo in amdgpu_vce_validate_bo
  drm/amdgpu: fix amdgpu_vm_pasid_fault_credit
  drm/ttm: check the return value of register_shrinker
  drm/radeon: fix sparse warning: Should it be static?

1 files changed, 16 insertions, 8 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
index cd1752b6afa9..6fc16eecf2dc 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@ -970,12 +970,16 @@ static void amdgpu_vm_handle_huge_pages(struct amdgpu_pte_update_params *p,
         amdgpu_gart_get_vm_pde(p->adev, AMDGPU_VM_PDB0,
                                &dst, &flags);
 
-        if (parent->base.bo->shadow) {
-                pd_addr = amdgpu_bo_gpu_offset(parent->base.bo->shadow);
-                pde = pd_addr + (entry - parent->entries) * 8;
-                p->func(p, pde, dst, 1, 0, flags);
+        if (p->func == amdgpu_vm_cpu_set_ptes) {
+                pd_addr = (unsigned long)amdgpu_bo_kptr(parent->base.bo);
+        } else {
+                if (parent->base.bo->shadow) {
+                        pd_addr = amdgpu_bo_gpu_offset(parent->base.bo->shadow);
+                        pde = pd_addr + (entry - parent->entries) * 8;
+                        p->func(p, pde, dst, 1, 0, flags);
+                }
+                pd_addr = amdgpu_bo_gpu_offset(parent->base.bo);
         }
-        pd_addr = amdgpu_bo_gpu_offset(parent->base.bo);
         pde = pd_addr + (entry - parent->entries) * 8;
         p->func(p, pde, dst, 1, 0, flags);
 }
@@ -2478,17 +2482,21 @@ bool amdgpu_vm_pasid_fault_credit(struct amdgpu_device *adev,
 
         spin_lock(&adev->vm_manager.pasid_lock);
         vm = idr_find(&adev->vm_manager.pasid_idr, pasid);
-        spin_unlock(&adev->vm_manager.pasid_lock);
-        if (!vm)
+        if (!vm) {
                 /* VM not found, can't track fault credit */
+                spin_unlock(&adev->vm_manager.pasid_lock);
                 return true;
+        }
 
         /* No lock needed. only accessed by IRQ handler */
-        if (!vm->fault_credit)
+        if (!vm->fault_credit) {
                 /* Too many faults in this VM */
+                spin_unlock(&adev->vm_manager.pasid_lock);
                 return false;
+        }
 
         vm->fault_credit--;
+        spin_unlock(&adev->vm_manager.pasid_lock);
         return true;
 }