[PATCH] drm/cma-helper: Fix drm_gem_cma_free_object()

[Noralf Trønnes]

Den 08.05.2019 08.33, skrev Oleksandr Andrushchenko:
> On 5/7/19 7:04 PM, Noralf Trønnes wrote:
>> Hi,
>>
>> Could someone please have a look at this one?
>>
>> Noralf.
>>
>> Den 26.04.2019 14.47, skrev Noralf Trønnes:
>>> The logic for freeing an imported buffer with a virtual address is
>>> broken. It will free the buffer instead of unmapping the dma buf.
>>> Fix by reversing the if ladder and first check if the buffer is
>>> imported.
>>>
>>> Fixes: b9068cde51ee ("drm/cma-helper: Add DRM_GEM_CMA_VMAP_DRIVER_OPS")
>>> Cc: stable at vger.kernel.org
>>> Reported-by: "Li, Tingqian" <tingqian.li at intel.com>
>>> Signed-off-by: Noralf Trønnes <noralf at tronnes.org>
> Reviewed-by: Oleksandr Andrushchenko <oleksandr_andrushchenko at epam.com>

Thanks Oleksandr, applied to drm-misc-next-fixes.

Noralf.

>>> ---
>>>
>>>   drivers/gpu/drm/drm_gem_cma_helper.c | 8 ++++----
>>>   1 file changed, 4 insertions(+), 4 deletions(-)
>>>
>>> diff --git a/drivers/gpu/drm/drm_gem_cma_helper.c
>>> b/drivers/gpu/drm/drm_gem_cma_helper.c
>>> index cc26625b4b33..e01ceed09e67 100644
>>> --- a/drivers/gpu/drm/drm_gem_cma_helper.c
>>> +++ b/drivers/gpu/drm/drm_gem_cma_helper.c
>>> @@ -186,13 +186,13 @@ void drm_gem_cma_free_object(struct
>>> drm_gem_object *gem_obj)
>>>         cma_obj = to_drm_gem_cma_obj(gem_obj);
>>>   -    if (cma_obj->vaddr) {
>>> -        dma_free_wc(gem_obj->dev->dev, cma_obj->base.size,
>>> -                cma_obj->vaddr, cma_obj->paddr);
>>> -    } else if (gem_obj->import_attach) {
>>> +    if (gem_obj->import_attach) {
>>>           if (cma_obj->vaddr)
>>>               dma_buf_vunmap(gem_obj->import_attach->dmabuf,
>>> cma_obj->vaddr);
>>>           drm_prime_gem_destroy(gem_obj, cma_obj->sgt);
>>> +    } else if (cma_obj->vaddr) {
>>> +        dma_free_wc(gem_obj->dev->dev, cma_obj->base.size,
>>> +                cma_obj->vaddr, cma_obj->paddr);
>>>       }
>>>         drm_gem_object_release(gem_obj);
>>>
>> _______________________________________________
>> dri-devel mailing list
>> dri-devel at lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/dri-devel
>