[v3,3/8] drm/omap: accept NULL for dma_addr in omap_gem_pin

Jean-Jacques Hiblot jjhiblot at ti.com
Tue Oct 8 15:55:23 UTC 2019


On 07/10/2019 13:25, Jean-Jacques Hiblot wrote:
> From: Tomi Valkeinen <tomi.valkeinen at ti.com>
>
> Allow NULL to be passed in 'dma_addr' for omap_gem_pin(), in case the
> caller does not need the dma_addr.
>
> Signed-off-by: Tomi Valkeinen <tomi.valkeinen at ti.com>
> ---
>   drivers/gpu/drm/omapdrm/omap_gem.c | 6 ++++--
>   1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/omapdrm/omap_gem.c b/drivers/gpu/drm/omapdrm/omap_gem.c
> index 9201c21e206f..a6562d23d314 100644
> --- a/drivers/gpu/drm/omapdrm/omap_gem.c
> +++ b/drivers/gpu/drm/omapdrm/omap_gem.c
> @@ -819,9 +819,11 @@ int omap_gem_pin(struct drm_gem_object *obj, dma_addr_t *dma_addr)
>   			refcount_inc(&omap_obj->dma_addr_cnt);
>   		}
>   
> -		*dma_addr = omap_obj->dma_addr;
> +		if (dma_addr)
> +			*dma_addr = omap_obj->dma_addr;
>   	} else if (omap_gem_is_contiguous(omap_obj)) {
> -		*dma_addr = omap_obj->dma_addr;
> +		if (dma_addr)
> +			*dma_addr = omap_obj->dma_addr;
>   	} else {
>   		ret = -EINVAL;
>   		goto fail;
Reviewed-by: Jean-Jacques Hiblot <jjhiblot at ti.com>


More information about the dri-devel mailing list