diff options
| author | Konrad Dybcio <konrad.dybcio@linaro.org> | 2023-08-09 00:02:45 +0300 |
|---|---|---|
| committer | Rob Clark <robdclark@chromium.org> | 2023-08-17 20:09:54 +0300 |
| commit | 34b149ecae852d13ae3275e707fce93081ef5e4a (patch) | |
| tree | fc6e733bd494ef2a39b10b331bb038a78d1d6873 | |
| parent | c5597e58a56c4eb233ae2d15d06ed39fd94b2405 (diff) | |
| download | linux-34b149ecae852d13ae3275e707fce93081ef5e4a.tar.xz | |
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>
| -rw-r--r-- | drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c index 6dd6d72bcd86..d4e85e24002f 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 */ |