Skip to content

Commit 317ab1b

Browse files
committed
drm/msm/a690: Remove revn and name
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 <[email protected]> Reviewed-by: Dmitry Baryshkov <[email protected]> Patchwork: https://patchwork.freedesktop.org/patch/545552/
1 parent 7164360 commit 317ab1b

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -369,8 +369,6 @@ static const struct adreno_info gpulist[] = {
369369
.hwcg = a640_hwcg,
370370
}, {
371371
.rev = ADRENO_REV(6, 9, 0, ANY_ID),
372-
.revn = 690,
373-
.name = "A690",
374372
.fw = {
375373
[ADRENO_FW_SQE] = "a660_sqe.fw",
376374
[ADRENO_FW_GMU] = "a690_gmu.bin",

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,8 @@ static inline int adreno_is_a680(const struct adreno_gpu *gpu)
310310

311311
static inline int adreno_is_a690(const struct adreno_gpu *gpu)
312312
{
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);
314315
};
315316

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

0 commit comments

Comments
 (0)