Skip to content

Commit 1bfa795

Browse files
konradybciorobclark
authored andcommitted
drm/msm/a6xx: Fix up GMU region reservations
Change the order of region allocations to make the addresses match downstream. This shouldn't matter very much, but helps eliminate one more difference when comparing register accesses. Also, make the log region 16K long. That's what it is, unconditionally on A6xx and A7xx. Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org> Patchwork: https://patchwork.freedesktop.org/patch/543338/ Signed-off-by: Rob Clark <robdclark@chromium.org>
1 parent 6ab410e commit 1bfa795

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1646,13 +1646,13 @@ int a6xx_gmu_init(struct a6xx_gpu *a6xx_gpu, struct device_node *node)
16461646
goto err_memory;
16471647
}
16481648

1649-
/* Allocate memory for for the HFI queues */
1650-
ret = a6xx_gmu_memory_alloc(gmu, &gmu->hfi, SZ_16K, 0, "hfi");
1649+
/* Allocate memory for the GMU log region */
1650+
ret = a6xx_gmu_memory_alloc(gmu, &gmu->log, SZ_16K, 0, "log");
16511651
if (ret)
16521652
goto err_memory;
16531653

1654-
/* Allocate memory for the GMU log region */
1655-
ret = a6xx_gmu_memory_alloc(gmu, &gmu->log, SZ_4K, 0, "log");
1654+
/* Allocate memory for for the HFI queues */
1655+
ret = a6xx_gmu_memory_alloc(gmu, &gmu->hfi, SZ_16K, 0, "hfi");
16561656
if (ret)
16571657
goto err_memory;
16581658

0 commit comments

Comments
 (0)