Commit 75a5227c authored by Rob Clark's avatar Rob Clark
Browse files

drm/msm/adreno: Bring the a630 family together 



All of these are derivatives of a630.

Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
Reviewed-by: default avatarKonrad Dybcio <konrad.dybcio@linaro.org>
Patchwork: https://patchwork.freedesktop.org/patch/549770/
parent c928a05e

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

+1 −1
Original line number Diff line number Diff line
@@ -1617,7 +1617,7 @@ int a6xx_gmu_init(struct a6xx_gpu *a6xx_gpu, struct device_node *node) 
			SZ_256K - SZ_16K, 0x44000, "dcache");

		if (ret)

			goto err_memory;

	} else if (adreno_is_a630(adreno_gpu) || adreno_is_a615_family(adreno_gpu)) {

	} else if (adreno_is_a630_family(adreno_gpu)) {

		/* HFI v1, has sptprac */

		gmu->legacy = true;

drivers/gpu/drm/msm/adreno/adreno_gpu.h

+5 −4
Original line number Diff line number Diff line
@@ -339,12 +339,13 @@ static inline int adreno_is_a690(const struct adreno_gpu *gpu) 
{

	/* The order of args is important here to handle ANY_ID correctly */

	return adreno_cmp_rev(ADRENO_REV(6, 9, 0, ANY_ID), gpu->rev);

};

}



/* check for a615, a616, a618, a619 or any derivatives */

static inline int adreno_is_a615_family(const struct adreno_gpu *gpu)

/* check for a615, a616, a618, a619 or any a630 derivatives */

static inline int adreno_is_a630_family(const struct adreno_gpu *gpu)

{

	return adreno_is_revn(gpu, 615) ||

	return adreno_is_revn(gpu, 630) ||

		adreno_is_revn(gpu, 615) ||

		adreno_is_revn(gpu, 616) ||

		adreno_is_revn(gpu, 618) ||

		adreno_is_revn(gpu, 619);