[PATCH v2] drm/amdgpu: simplify bo_va list when vm bo update (v2)

[Zhang, Jerry (Junwei)]

On 04/19/2018 03:42 PM, Christian König wrote:
> Am 19.04.2018 um 09:40 schrieb Zhang, Jerry (Junwei):
>>
>>
>> On 04/19/2018 03:06 PM, Christian König wrote:
>>> Am 19.04.2018 um 08:53 schrieb Junwei Zhang:
>>>> v2: fix compiling warning
>>>>
>>>> Signed-off-by: Junwei Zhang <Jerry.Zhang at amd.com>
>>>> ---
>>>>   drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 22 ++++++++++------------
>>>>   1 file changed, 10 insertions(+), 12 deletions(-)
>>>>
>>>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
>>>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
>>>> index 8c34060..e3e0375 100644
>>>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
>>>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
>>>> @@ -1509,6 +1509,7 @@ int amdgpu_vm_bo_update(struct amdgpu_device *adev,
>>>>       struct drm_mm_node *nodes;
>>>>       struct dma_fence *exclusive, **last_update;
>>>>       uint64_t flags;
>>>> +    uint32_t mem_type;
>>>>       int r;
>>>>       if (clear || !bo_va->base.bo) {
>>>> @@ -1561,19 +1562,16 @@ int amdgpu_vm_bo_update(struct amdgpu_device *adev,
>>>>       }
>>>>       spin_lock(&vm->status_lock);
>>>> -    if (bo && bo->tbo.resv == vm->root.base.bo->tbo.resv) {
>>>> -        unsigned mem_type = bo->tbo.mem.mem_type;
>>>> +    list_del_init(&bo_va->base.vm_status);
>>>> -        /* If the BO is not in its preferred location add it back to
>>>> -         * the evicted list so that it gets validated again on the
>>>> -         * next command submission.
>>>> -         */
>>>> -        list_del_init(&bo_va->base.vm_status);
>>>> -        if (!(bo->preferred_domains & amdgpu_mem_type_to_domain(mem_type)))
>>>> -            list_add_tail(&bo_va->base.vm_status, &vm->evicted);
>>>> -    } else {
>>>> -        list_del_init(&bo_va->base.vm_status);
>>>> -    }
>>>> +    /* If the BO is not in its preferred location add it back to
>>>> +     * the evicted list so that it gets validated again on the
>>>> +     * next command submission.
>>>> +     */
>>>> +    mem_type = bo->tbo.mem.mem_type;
>>>> +    if (bo && bo->tbo.resv == vm->root.base.bo->tbo.resv &&
>>>> +        !(bo->preferred_domains & amdgpu_mem_type_to_domain(mem_type)))
>>>
>>> The indentation on the line above is wrong, the "!(bo..." should be on the same
>>> column as the "bo &&" above.
>>
>> Thanks to point that out.
>>
>> May I get your RB with that fix?
>
> Yeah, sure patch is Reviewed-by: Christian König <christian.koenig at amd.com>.

Thanks, pushed.

Jerry

>
> Christian.
>
>>
>> Jerry
>>
>>>
>>> Apart from that looks good to me,
>>> Christian.
>>>
>>>> + list_add_tail(&bo_va->base.vm_status, &vm->evicted);
>>>>       spin_unlock(&vm->status_lock);
>>>>       list_splice_init(&bo_va->invalids, &bo_va->valids);
>>>
>> _______________________________________________
>> amd-gfx mailing list
>> amd-gfx at lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
>