[PATCH] drm/amdgpu: Revert "Fix IB allocation sizes for page table updates"

[Felix Kuehling]

On 2017-08-31 09:59 AM, Christian König wrote:
> Am 31.08.2017 um 15:42 schrieb Kuehling, Felix:
>> Reviewed-by: Felix Kuehling <Felix.Kuehling at amd.com>
>
> Thanks.
>
>> Sorry, I didn't think this one through. I'll keep looking for the
>> real problem.
>
> Is it possible that you merged my earlier patch to handle all fragment
> sizes?
>
> Cause earlier versions had exactly that problem.

I don't think so. We merge from amd-staging-4.12. Was your earlier patch
already submitted to the branch?

Regards,
  Felix

>
> Christian.
>
>> ________________________________________
>> From: amd-gfx <amd-gfx-bounces at lists.freedesktop.org> on behalf of
>> Christian König <deathsimple at vodafone.de>
>> Sent: Thursday, August 31, 2017 3:45:48 AM
>> To: amd-gfx at lists.freedesktop.org
>> Subject: [PATCH] drm/amdgpu: Revert "Fix IB allocation sizes for page
>> table updates"
>>
>> From: Christian König <christian.koenig at amd.com>
>>
>> The IB allocation sizes where correct.
>>
>> This reverts commit d1551e7c7211fa135c4d79f09e237f5f9779e421.
>>
>> Signed-off-by: Christian König <christian.koenig at amd.com>
>> ---
>>   drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 4 ++--
>>   1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
>> index 473273d..b08f031 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
>> @@ -1037,7 +1037,7 @@ static int amdgpu_vm_update_level(struct
>> amdgpu_device *adev,
>>                  ndw = 64;
>>
>>                  /* assume the worst case */
>> -               ndw += parent->last_entry_used * 10;
>> +               ndw += parent->last_entry_used * 6;
>>
>>                  pd_addr = amdgpu_bo_gpu_offset(parent->base.bo);
>>
>> @@ -1542,7 +1542,7 @@ static int amdgpu_vm_bo_update_mapping(struct
>> amdgpu_device *adev,
>>          ndw = 64;
>>
>>          /* one PDE write for each huge page */
>> -       ndw += ((nptes >> adev->vm_manager.block_size) + 1) * 10;
>> +       ndw += ((nptes >> adev->vm_manager.block_size) + 1) * 6;
>>
>>          if (pages_addr) {
>>                  /* copy commands needed */
>> -- 
>> 2.7.4
>>
>> _______________________________________________
>> amd-gfx mailing list
>> amd-gfx at lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
>> _______________________________________________
>> amd-gfx mailing list
>> amd-gfx at lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
>
>