Skip to content

Commit b34a740

Browse files
suijingfenglumag
authored andcommitted
drm/msm: Check return value of of_dma_configure()
Because the of_dma_configure() will returns '-EPROBE_DEFER' if the probe procedure of the specific platform IOMMU driver is not finished yet. It can also return other error code for various reasons. Stop pretending that it will always suceess, quit if it fail. Signed-off-by: Sui Jingfeng <sui.jingfeng@linux.dev> Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com> Fixes: 29ac897 ("drm/msm/a6xx: use msm_gem for GMU memory objects") Fixes: 5a903a4 ("drm/msm/a6xx: Introduce GMU wrapper support") Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Patchwork: https://patchwork.freedesktop.org/patch/622782/ Link: https://lore.kernel.org/r/20241104090738.529848-1-sui.jingfeng@linux.dev Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
1 parent c36c60d commit b34a740

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

drivers/gpu/drm/msm/adreno/a6xx_gmu.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1603,7 +1603,9 @@ int a6xx_gmu_wrapper_init(struct a6xx_gpu *a6xx_gpu, struct device_node *node)
16031603

16041604
gmu->dev = &pdev->dev;
16051605

1606-
of_dma_configure(gmu->dev, node, true);
1606+
ret = of_dma_configure(gmu->dev, node, true);
1607+
if (ret)
1608+
return ret;
16071609

16081610
pm_runtime_enable(gmu->dev);
16091611

@@ -1668,7 +1670,9 @@ int a6xx_gmu_init(struct a6xx_gpu *a6xx_gpu, struct device_node *node)
16681670

16691671
gmu->dev = &pdev->dev;
16701672

1671-
of_dma_configure(gmu->dev, node, true);
1673+
ret = of_dma_configure(gmu->dev, node, true);
1674+
if (ret)
1675+
return ret;
16721676

16731677
/* Fow now, don't do anything fancy until we get our feet under us */
16741678
gmu->idle_level = GMU_IDLE_STATE_ACTIVE;

0 commit comments

Comments
 (0)