From: Dave Airlie <airlied@redhat.com>
Date: Tue, 31 Jan 2017 22:39:35 +0000 (+1000)
Subject: Merge branch 'drm-next-4.11' of git://people.freedesktop.org/~agd5f/linux into drm... 
X-Git-Tag: v4.14-rc1~1422^2~31
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=29a73d906bd386839015602c4bd35ef2e3531abc;p=platform%2Fkernel%2Flinux-rpi3.git

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

This is the main feature pull for radeon and amdgpu for 4.11.  Highlights:
- Power and clockgating improvements
- Preliminary SR-IOV support
- ttm buffer priority support
- ttm eviction fixes
- Removal of the ttm lru callbacks
- Remove SI DPM quirks due to MC firmware issues
- Handle VFCT with multiple vbioses
- Powerplay improvements
- Lots of driver cleanups

* 'drm-next-4.11' of git://people.freedesktop.org/~agd5f/linux: (120 commits)
  drm/amdgpu: fix amdgpu_bo_va_mapping flags
  drm/amdgpu: access stolen VRAM directly on CZ (v2)
  drm/amdgpu: access stolen VRAM directly on KV/KB (v2)
  drm/amdgpu: fix kernel panic when dpm disabled on Kv.
  drm/amdgpu: fix dpm bug on Kv.
  drm/amd/powerplay: fix regresstion issue can't set manual dpm mode.
  drm/amdgpu: handle vfct with multiple vbios images
  drm/radeon: handle vfct with multiple vbios images
  drm/amdgpu: move misc si headers into amdgpu
  drm/amdgpu: remove unused header si_reg.h
  drm/radeon: drop pitcairn dpm quirks
  drm/amdgpu: drop pitcairn dpm quirks
  drm: radeon: radeon_ttm: Handle return NULL error from ioremap_nocache
  drm/amd/amdgpu/amdgpu_ttm: Handle return NULL error from ioremap_nocache
  drm/amdgpu: add new virtual display ID
  drm/amd/amdgpu: remove the uncessary parameter for ib scheduler
  drm/amdgpu: Bring bo creation in line with radeon driver (v2)
  drm/amd/powerplay: fix misspelling in header guard
  drm/ttm: revert "add optional LRU removal callback v2"
  drm/ttm: revert "implement LRU add callbacks v2"
  ...
---

29a73d906bd386839015602c4bd35ef2e3531abc
diff --cc drivers/gpu/drm/ttm/ttm_bo.c
index 86e3b23,e7ab026..4562e53
--- a/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/drivers/gpu/drm/ttm/ttm_bo.c
@@@ -1670,10 -1668,16 +1668,15 @@@ static int ttm_bo_swapout(struct ttm_me
  	struct ttm_buffer_object *bo;
  	int ret = -EBUSY;
  	int put_count;
 -	uint32_t swap_placement = (TTM_PL_FLAG_CACHED | TTM_PL_FLAG_SYSTEM);
+ 	unsigned i;
  
  	spin_lock(&glob->lru_lock);
- 	list_for_each_entry(bo, &glob->swap_lru, swap) {
- 		ret = __ttm_bo_reserve(bo, false, true, NULL);
+ 	for (i = 0; i < TTM_MAX_BO_PRIORITY; ++i) {
+ 		list_for_each_entry(bo, &glob->swap_lru[i], swap) {
+ 			ret = __ttm_bo_reserve(bo, false, true, NULL);
+ 			if (!ret)
+ 				break;
+ 		}
  		if (!ret)
  			break;
  	}