Commit cc2ccd19 authored by Neil Armstrong's avatar Neil Armstrong Committed by Rob Clark
Browse files

drm/msm/adreno: fix a743 and a740 cx mem init 



Disable the call to qcom_scm_gpu_init_regs() for a730 and a740
after init failures on the HDK8550 and HDK8450 platforms:
msm_dpu ae01000.display-controller: failed to load adreno gpu
msm_dpu ae01000.display-controller: failed to bind 3d00000.gpu (ops a3xx_ops [msm]): -5
msm_dpu ae01000.display-controller: adev bind failed: -5

While debugging, it happens the call to:
qcom_scm_gpu_init_regs(QCOM_SCM_GPU_ALWAYS_EN_REQ)
returns -5 and makes the gpu fail to initialize.

Remove the scm call since it's not done downstream either and
works fine without.

Fixes: 14b27d5d ("drm/msm/a7xx: Initialize a750 "software fuse"")
Signed-off-by: default avatarNeil Armstrong <neil.armstrong@linaro.org>
Reviewed-by: default avatarConnor Abbott <cwabbott0@gmail.com>
Patchwork: https://patchwork.freedesktop.org/patch/600972/


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

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

+3 −8
Original line number Diff line number Diff line
@@ -1739,16 +1739,11 @@ static int a7xx_cx_mem_init(struct a6xx_gpu *a6xx_gpu) 
					 REG_A7XX_CX_MISC_SW_FUSE_VALUE);

		adreno_gpu->has_ray_tracing =

			!!(fuse_val & A7XX_CX_MISC_SW_FUSE_VALUE_RAYTRACING);

	} else {

		if (adreno_is_a740(adreno_gpu)) {

	} else if (adreno_is_a740(adreno_gpu)) {

		/* Raytracing is always enabled on a740 */

		adreno_gpu->has_ray_tracing = true;

	}



		if (qcom_scm_is_available())

			return qcom_scm_gpu_init_regs(QCOM_SCM_GPU_ALWAYS_EN_REQ);

	}



	return 0;

}