From: Dave Airlie <airlied@redhat.com>
Date: Fri, 30 Sep 2016 03:18:26 +0000 (+1000)
Subject: Merge branch 'drm-next-4.9' of git://people.freedesktop.org/~agd5f/linux into drm... 
X-Git-Tag: v4.9-rc1~41^2~9
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=28a396545a2a5fbdffb2b661ed6c9b6820e28772;p=karo-tx-linux.git

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

Some additional fixes for 4.9:
- The rest of Christian's GTT rework which fixes a long standing bug
  in the GPUVM code among other things
- Changes to the pci shutdown callbacks for certain hypervisors
- Fix hpd interrupt storms on eDP panels which have the hpd interrupt
  enabled by the bios
- misc cleanups and bug fixes

* 'drm-next-4.9' of git://people.freedesktop.org/~agd5f/linux: (33 commits)
  drm/radeon: always apply pci shutdown callbacks
  drm/amdgpu: always apply pci shutdown callbacks (v2)
  drm/amdgpu: improve VM PTE trace points
  drm/amdgpu: fix GART_DEBUGFS define
  drm/amdgpu: free userptrs even if GTT isn't bound
  drm/amd/amdgpu: Various cleanups for DCEv6
  drm/amdgpu: fix BO move offsets
  drm/amdgpu: fix amdgpu_move_blit on 32bit systems
  drm/amdgpu: fix gtt_mgr bo's offset
  drm/amdgpu: fix initializing the VM BO shadow
  drm/amdgpu: fix initializing the VM last eviction counter
  drm/amdgpu: cleanup VM shadow BO unreferencing
  drm/amdgpu: allocate GTT space for shadow VM page tables
  drm/amdgpu: rename all rbo variable to abo v2
  drm/amdgpu: remove unused member from struct amdgpu_bo
  drm/amdgpu: add a custom GTT memory manager v2
  drm/amdgpu/dce6: disable hpd on local panels
  drm/amdgpu/dce8: disable hpd on local panels
  drm/amdgpu/dce11: disable hpd on local panels
  drm/amdgpu/dce10: disable hpd on local panels
  ...
---

28a396545a2a5fbdffb2b661ed6c9b6820e28772
diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
index 160a094e1a93,c80bdc7194e5..887483b8b818
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@@ -246,8 -246,7 +246,8 @@@ static int amdgpu_verify_access(struct 
  
  	if (amdgpu_ttm_tt_get_usermm(bo->ttm))
  		return -EPERM;
- 	return drm_vma_node_verify_access(&rbo->gem_base.vma_node,
 -	return drm_vma_node_verify_access(&abo->gem_base.vma_node, filp);
++	return drm_vma_node_verify_access(&abo->gem_base.vma_node,
 +					  filp->private_data);
  }
  
  static void amdgpu_move_null(struct ttm_buffer_object *bo,