Skip to content

Commit db07ce5

Browse files
Fabio Estevamrobclark
authored andcommitted
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: 21af872 ("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>
1 parent 1bfa795 commit db07ce5

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -540,17 +540,17 @@ struct msm_gpu *a2xx_gpu_init(struct drm_device *dev)
540540
gpu->perfcntrs = perfcntrs;
541541
gpu->num_perfcntrs = ARRAY_SIZE(perfcntrs);
542542

543+
ret = adreno_gpu_init(dev, pdev, adreno_gpu, &funcs, 1);
544+
if (ret)
545+
goto fail;
546+
543547
if (adreno_is_a20x(adreno_gpu))
544548
adreno_gpu->registers = a200_registers;
545549
else if (adreno_is_a225(adreno_gpu))
546550
adreno_gpu->registers = a225_registers;
547551
else
548552
adreno_gpu->registers = a220_registers;
549553

550-
ret = adreno_gpu_init(dev, pdev, adreno_gpu, &funcs, 1);
551-
if (ret)
552-
goto fail;
553-
554554
if (!gpu->aspace) {
555555
dev_err(dev->dev, "No memory protection without MMU\n");
556556
if (!allow_vram_carveout) {

0 commit comments

Comments
 (0)