Commit 34b149ec authored by Konrad Dybcio's avatar Konrad Dybcio Committed by Rob Clark
Browse files

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: default avatarKonrad Dybcio <konrad.dybcio@linaro.org>
Patchwork: https://patchwork.freedesktop.org/patch/551830/


Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
parent c5597e58

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

+3 −1
Original line number Diff line number Diff line
@@ -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 */