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>.
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
