drm/msm/a690: Remove revn and name
Subsystems (4)
PATCH 1/1 drm/msm/a690: Remove revn and name
From: Rob Clark <[email protected]>
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]>
--- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 2 +- drivers/gpu/drm/msm/adreno/adreno_device.c | 2 -- drivers/gpu/drm/msm/adreno/adreno_gpu.h | 3 ++- 3 files changed, 3 insertions(+), 4 deletions(-)
drivers/gpu/drm/msm/adreno/a6xx_gpu.c +1 -1
@@ -2102,7 +2102,7 @@ struct msm_gpu *a6xx_gpu_init(struct drm_device *dev) info =adreno_info (config->rev);if (info && (info->revn ==650 || info->revn ==660 || - info->revn ==690 || +adreno_cmp_rev (ADRENO_REV (6 ,9 ,0 ,ANY_ID ), info->rev) ||adreno_cmp_rev (ADRENO_REV (6 ,3 ,5 ,ANY_ID ), info->rev))) adreno_gpu->base.hw_apriv = true;
drivers/gpu/drm/msm/adreno/adreno_device.c +0 -2
@@ -357,8 +357,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",
drivers/gpu/drm/msm/adreno/adreno_gpu.h +2 -1
@@ -274,7 +274,8 @@ static inline int adreno_is_a660(struct adreno_gpu *gpu)static inline int adreno_is_a690 (struct adreno_gpu *gpu) { -return gpu->revn ==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 */
Signature · 1 line
2.41.0