Commit db07ce5d authored Jun 20, 2023 by Fabio Estevam Committed by Rob Clark Aug 07, 2023

drm/msm/a2xx: Call adreno_gpu_init() earlier



The adreno_is_a20x() and adreno_is_a225() functions rely on the
GPU revision, but such information is retrieved inside adreno_gpu_init(),
which is called afterwards.

Fix this problem by caling adreno_gpu_init() earlier, so that
the GPU information revision is available when adreno_is_a20x()
and adreno_is_a225() run.

Tested on a imx53-qsb board.

Fixes: 21af872c ("drm/msm/adreno: add a2xx")
Signed-off-by: Fabio Estevam <festevam@denx.de>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Patchwork: https://patchwork.freedesktop.org/patch/543456/


Signed-off-by: Rob Clark <robdclark@chromium.org>

parent 1bfa7951

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

+4 −4

Original line number	Diff line number	Diff line
		@@ -540,6 +540,10 @@ struct msm_gpu a2xx_gpu_init(struct drm_device dev)
		gpu->perfcntrs = perfcntrs;
		gpu->num_perfcntrs = ARRAY_SIZE(perfcntrs);

		ret = adreno_gpu_init(dev, pdev, adreno_gpu, &funcs, 1);
		if (ret)
		goto fail;

		if (adreno_is_a20x(adreno_gpu))
		adreno_gpu->registers = a200_registers;
		else if (adreno_is_a225(adreno_gpu))
		@@ -547,10 +551,6 @@ struct msm_gpu a2xx_gpu_init(struct drm_device dev)
		else
		adreno_gpu->registers = a220_registers;

		ret = adreno_gpu_init(dev, pdev, adreno_gpu, &funcs, 1);
		if (ret)
		goto fail;

		if (!gpu->aspace) {
		dev_err(dev->dev, "No memory protection without MMU\n");
		if (!allow_vram_carveout) {