Commit 1bfa7951 authored by Konrad Dybcio's avatar Konrad Dybcio Committed by Rob Clark
Browse files

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: default avatarKonrad Dybcio <konrad.dybcio@linaro.org>
Patchwork: https://patchwork.freedesktop.org/patch/543338/


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

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

+4 −4
Original line number Diff line number Diff line
@@ -1646,13 +1646,13 @@ int a6xx_gmu_init(struct a6xx_gpu *a6xx_gpu, struct device_node *node) 
			goto err_memory;

	}



	/* Allocate memory for for the HFI queues */

	ret = a6xx_gmu_memory_alloc(gmu, &gmu->hfi, SZ_16K, 0, "hfi");

	/* Allocate memory for the GMU log region */

	ret = a6xx_gmu_memory_alloc(gmu, &gmu->log, SZ_16K, 0, "log");

	if (ret)

		goto err_memory;



	/* Allocate memory for the GMU log region */

	ret = a6xx_gmu_memory_alloc(gmu, &gmu->log, SZ_4K, 0, "log");

	/* Allocate memory for for the HFI queues */

	ret = a6xx_gmu_memory_alloc(gmu, &gmu->hfi, SZ_16K, 0, "hfi");

	if (ret)

		goto err_memory;