[PATCH] drm/panfrost: Check for error num after setting mask

Steven Price steven.price at arm.com
Wed Jan 12 15:46:52 UTC 2022


On 06/01/2022 03:03, Jiasheng Jiang wrote:
> Because of the possible failure of the dma_supported(), the
> dma_set_mask_and_coherent() may return error num.
> Therefore, it should be better to check it and return the error if
> fails.
> 
> Fixes: d9b631f0a0c4 ("drm/panfrost: Set DMA masks earlier")

That commit just moved the code around, the actual missing error
handling dates from the very beginning (f3ba91228e8e ("drm/panfrost: Add
initial panfrost driver")). But I can fix that up when merging.

> Signed-off-by: Jiasheng Jiang <jiasheng at iscas.ac.cn>

Reviewed-by: Steven Price <steven.price at arm.com>

Thanks,

Steve

> ---
>  drivers/gpu/drm/panfrost/panfrost_gpu.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/panfrost/panfrost_gpu.c b/drivers/gpu/drm/panfrost/panfrost_gpu.c
> index 2aae636f1cf5..107ad2d764ec 100644
> --- a/drivers/gpu/drm/panfrost/panfrost_gpu.c
> +++ b/drivers/gpu/drm/panfrost/panfrost_gpu.c
> @@ -359,8 +359,11 @@ int panfrost_gpu_init(struct panfrost_device *pfdev)
>  
>  	panfrost_gpu_init_features(pfdev);
>  
> -	dma_set_mask_and_coherent(pfdev->dev,
> +	err = dma_set_mask_and_coherent(pfdev->dev,
>  		DMA_BIT_MASK(FIELD_GET(0xff00, pfdev->features.mmu_features)));
> +	if (err)
> +		return err;
> +
>  	dma_set_max_seg_size(pfdev->dev, UINT_MAX);
>  
>  	irq = platform_get_irq_byname(to_platform_device(pfdev->dev), "gpu");
> 



More information about the dri-devel mailing list