diff options
| author | Dave Airlie <[email protected]> | 2019-10-04 16:27:51 +1000 | 
|---|---|---|
| committer | Dave Airlie <[email protected]> | 2019-10-04 16:27:51 +1000 | 
| commit | 0f83eb8888690d77f76d27d803488c1047fc9a10 (patch) | |
| tree | 7772e3d9fc13288d9932135a170a774aa7ea7179 /drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | |
| parent | 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c (diff) | |
| parent | c0e70e10b11b1b7ca0f537e7ce4404a0459cdc7c (diff) | |
Merge tag 'drm-fixes-5.4-2019-10-02' of git://people.freedesktop.org/~agd5f/linux into drm-fixes
drm-fixes-5.4-2019-10-02:
amdgpu:
- Enable bulk moves
- Power metrics fixes for Navi
- Fix S4 regression
- Add query for tcc disabled mask
- Fix several leaks in error paths
- randconfig fixes
- clang fixes
Signed-off-by: Dave Airlie <[email protected]>
From: Alex Deucher <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 2 | 
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c index e2fb141ff2e5..5251352f5922 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c @@ -603,14 +603,12 @@ void amdgpu_vm_move_to_lru_tail(struct amdgpu_device *adev,  	struct ttm_bo_global *glob = adev->mman.bdev.glob;  	struct amdgpu_vm_bo_base *bo_base; -#if 0  	if (vm->bulk_moveable) {  		spin_lock(&glob->lru_lock);  		ttm_bo_bulk_move_lru_tail(&vm->lru_bulk_move);  		spin_unlock(&glob->lru_lock);  		return;  	} -#endif  	memset(&vm->lru_bulk_move, 0, sizeof(vm->lru_bulk_move));  |