From: Konrad Dybcio Date: Tue, 8 Aug 2023 21:02:45 +0000 (+0200) Subject: drm/msm/a6xx: Bail out early if setting GPU OOB fails X-Git-Tag: kvm-x86-next-2023.09.07~104^2~2^2 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=34b149ecae852d13ae3275e707fce93081ef5e4a;p=users%2Fdwmw2%2Flinux.git 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 # on SM8550-QRD Tested-by: Dmitry Baryshkov # sm8450 Signed-off-by: Konrad Dybcio Patchwork: https://patchwork.freedesktop.org/patch/551830/ Signed-off-by: Rob Clark --- diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c index 6dd6d72bcd860..d4e85e24002fb 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c @@ -1201,7 +1201,9 @@ static int hw_init(struct msm_gpu *gpu) if (!adreno_has_gmu_wrapper(adreno_gpu)) { /* Make sure the GMU keeps the GPU on while we set it up */ - a6xx_gmu_set_oob(&a6xx_gpu->gmu, GMU_OOB_GPU_SET); + ret = a6xx_gmu_set_oob(&a6xx_gpu->gmu, GMU_OOB_GPU_SET); + if (ret) + return ret; } /* Clear GBIF halt in case GX domain was not collapsed */