Skip to content

Commit

Permalink
drm/panfrost: Check for error num after setting mask
Browse files Browse the repository at this point in the history
[ Upstream commit 44ab30b ]

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: f3ba912 ("drm/panfrost: Add initial panfrost driver")
Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn>
[Steve: fix Fixes: line]
Reviewed-by: Steven Price <steven.price@arm.com>
Signed-off-by: Steven Price <steven.price@arm.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220106030326.2620942-1-jiasheng@iscas.ac.cn
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
JiangJias authored and gregkh committed Apr 8, 2022
1 parent 400705c commit 96586f1
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion drivers/gpu/drm/panfrost/panfrost_gpu.c
Expand Up @@ -360,8 +360,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");
Expand Down

0 comments on commit 96586f1

Please sign in to comment.