Skip to content

Commit 34b149e

Browse files
konradybciorobclark
authored andcommitted
drm/msm/a6xx: Bail out early if setting GPU OOB fails
If the GMU can't guarantee the required resources are up, trying to bring up the GPU is a lost cause. Return early if setting GPU OOB fails. Tested-by: Neil Armstrong <neil.armstrong@linaro.org> # on SM8550-QRD Tested-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> # sm8450 Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org> Patchwork: https://patchwork.freedesktop.org/patch/551830/ Signed-off-by: Rob Clark <robdclark@chromium.org>
1 parent c5597e5 commit 34b149e

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1201,7 +1201,9 @@ static int hw_init(struct msm_gpu *gpu)
12011201

12021202
if (!adreno_has_gmu_wrapper(adreno_gpu)) {
12031203
/* Make sure the GMU keeps the GPU on while we set it up */
1204-
a6xx_gmu_set_oob(&a6xx_gpu->gmu, GMU_OOB_GPU_SET);
1204+
ret = a6xx_gmu_set_oob(&a6xx_gpu->gmu, GMU_OOB_GPU_SET);
1205+
if (ret)
1206+
return ret;
12051207
}
12061208

12071209
/* Clear GBIF halt in case GX domain was not collapsed */

0 commit comments

Comments
 (0)