drm/amdgpu: resvert "disable bulk moves for now"

Submitted by Christian König on Sept. 12, 2019, 10:15 a.m.

Details

Message ID 20190912101535.71686-1-christian.koenig@amd.com
State New
Headers show
Series "drm/amdgpu: resvert "disable bulk moves for now"" ( rev: 1 ) in AMD X.Org drivers

Not browsing as part of any series.

Commit Message

Christian König Sept. 12, 2019, 10:15 a.m.
This reverts commit a213c2c7e235cfc0e0a161a558f7fdf2fb3a624a.

The changes to fix this should have landed in 5.1.

Signed-off-by: Christian König <christian.koenig@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 2 --
 1 file changed, 2 deletions(-)

Patch hide | download patch | download mbox

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
index 48349e4f0701..fd3fbaa73fa3 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));
 

Comments

RB on it to go ahead.

-David

在 2019/9/12 18:15, Christian König 写道:
> This reverts commit a213c2c7e235cfc0e0a161a558f7fdf2fb3a624a.

>

> The changes to fix this should have landed in 5.1.

>

> Signed-off-by: Christian König <christian.koenig@amd.com>

> ---

>   drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 2 --

>   1 file changed, 2 deletions(-)

>

> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c

> index 48349e4f0701..fd3fbaa73fa3 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));

>
Just to double check: We do have that enabled in the DKMS package for a 
while and doesn't encounter any more problems with it, correct?

Thanks,
Christian.

Am 12.09.19 um 16:02 schrieb Chunming Zhou:
> RB on it to go ahead.
>
> -David
>
> 在 2019/9/12 18:15, Christian König 写道:
>> This reverts commit a213c2c7e235cfc0e0a161a558f7fdf2fb3a624a.
>>
>> The changes to fix this should have landed in 5.1.
>>
>> Signed-off-by: Christian König <christian.koenig@amd.com>
>> ---
>>    drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 2 --
>>    1 file changed, 2 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
>> index 48349e4f0701..fd3fbaa73fa3 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));
>>