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

Some more radeon and amdgpu stuff for drm-next.  Mostly just bug fixes
for new features and cleanups.

* 'drm-next-4.6' of git://people.freedesktop.org/~agd5f/linux:
  drm/amdgpu: fix rb bitmap & cu bitmap calculation
  drm/amdgpu: trace the pd_addr in vm_grab_id as well
  drm/amdgpu: fix VM faults caused by vm_grab_id() v4
  drm/amdgpu: update radeon acpi header
  drm/radeon: update radeon acpi header
  drm/amd: cleanup get_mfd_cell_dev()
  drm/amdgpu: fix error handling in amdgpu_bo_list_set
  drm/amd/powerplay: fix code style warning.
  drm/amd: Do not make DRM_AMD_ACP default to y
  drm/amdgpu/gfx: fix off by one in rb rework (v2)

1 files changed, 4 insertions, 3 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
index b5bdd5d59b58..db14a7bbb8f4 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
@@ -75,6 +75,7 @@ int amdgpu_ib_get(struct amdgpu_device *adev, struct amdgpu_vm *vm,
         }
 
         ib->vm = vm;
+        ib->vm_id = 0;
 
         return 0;
 }
@@ -139,7 +140,7 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs,
                 return -EINVAL;
         }
 
-        if (vm && !ibs->grabbed_vmid) {
+        if (vm && !ibs->vm_id) {
                 dev_err(adev->dev, "VM IB without ID\n");
                 return -EINVAL;
         }
@@ -152,10 +153,10 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs,
 
         if (vm) {
                 /* do context switch */
-                amdgpu_vm_flush(ring, vm, last_vm_update);
+                amdgpu_vm_flush(ring, ib->vm_id, ib->vm_pd_addr);
 
                 if (ring->funcs->emit_gds_switch)
-                        amdgpu_ring_emit_gds_switch(ring, ib->vm->ids[ring->idx].id,
+                        amdgpu_ring_emit_gds_switch(ring, ib->vm_id,
                                                     ib->gds_base, ib->gds_size,
                                                     ib->gws_base, ib->gws_size,
                                                     ib->oa_base, ib->oa_size);