drm/msm/a690: Remove revn and name

robclark · robclark · commit 317ab1b90e59 · 2023-07-15T08:12:01.000-07:00
These fields are deprecated. But any userspace new enough to support a690 also knows how to identify the GPU based on chip-id. Signed-off-by: Rob Clark <robdclark@chromium.org> Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Patchwork: https://patchwork.freedesktop.org/patch/545552/
diff --git a/drivers/gpu/drm/msm/adreno/adreno_device.c b/drivers/gpu/drm/msm/adreno/adreno_device.c
@@ -369,8 +369,6 @@ static const struct adreno_info gpulist[] = {
 		.hwcg = a640_hwcg,
 	}, {
 		.rev = ADRENO_REV(6, 9, 0, ANY_ID),
-		.revn = 690,
-		.name = "A690",
 		.fw = {
 			[ADRENO_FW_SQE] = "a660_sqe.fw",
 			[ADRENO_FW_GMU] = "a690_gmu.bin",
diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.h b/drivers/gpu/drm/msm/adreno/adreno_gpu.h
@@ -310,7 +310,8 @@ static inline int adreno_is_a680(const struct adreno_gpu *gpu)
 
 static inline int adreno_is_a690(const struct adreno_gpu *gpu)
 {
-	return adreno_is_revn(gpu, 690);
+	/* 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 */

Original file line number	Diff line number	Diff line change
`@@ -310,7 +310,8 @@ static inline int adreno_is_a680(const struct adreno_gpu *gpu)`
`310`	`310`
`311`	`311`	`static inline int adreno_is_a690(const struct adreno_gpu *gpu)`
`312`	`312`	`{`
`313`		`- return adreno_is_revn(gpu, 690);`
	`313`	`+ /* The order of args is important here to handle ANY_ID correctly */`
	`314`	`+ return adreno_cmp_rev(ADRENO_REV(6, 9, 0, ANY_ID), gpu->rev);`
`314`	`315`	`};`
`315`	`316`
`316`	`317`	`/* check for a615, a616, a618, a619 or any derivatives */`