drm/msm/a6xx: Fix missing ARRAY_SIZE() check
Subsystems (4)
PATCH 1/1 drm/msm/a6xx: Fix missing ARRAY_SIZE() check
From: Rob Clark <[email protected]>
Fixes f6d62d091cfd ("drm/msm/a6xx: add support for Adreno 660 GPU")
Signed-off-by Rob Clark <[email protected]>
Reviewed-by Dmitry Baryshkov <[email protected]>
--- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/gpu/drm/msm/adreno/a6xx_gpu.c +8 -4
@@ -683,19 +683,23 @@ static void a6xx_set_cp_protect(struct msm_gpu *gpu) {struct adreno_gpu *adreno_gpu =to_adreno_gpu (gpu);const u32 *regs = a6xx_protect; -unsigned i, count =ARRAY_SIZE (a6xx_protect), count_max =32 ; - -BUILD_BUG_ON (ARRAY_SIZE (a6xx_protect) >32 ); -BUILD_BUG_ON (ARRAY_SIZE (a650_protect) >48 ); +unsigned i, count, count_max;if (adreno_is_a650 (adreno_gpu)) { regs = a650_protect; count =ARRAY_SIZE (a650_protect); count_max =48 ; +BUILD_BUG_ON (ARRAY_SIZE (a650_protect) >48 ); }else if (adreno_is_a660_family (adreno_gpu)) { regs = a660_protect; count =ARRAY_SIZE (a660_protect); count_max =48 ; +BUILD_BUG_ON (ARRAY_SIZE (a660_protect) >48 ); + }else { + regs = a6xx_protect; + count =ARRAY_SIZE (a6xx_protect); + count_max =32 ; +BUILD_BUG_ON (ARRAY_SIZE (a6xx_protect) >32 ); }/*
Signature · 1 line
2.35.1
Quoted 31 lines · Rob Clark
From: Rob Clark <[email protected]>
Fixes f6d62d091cfd ("drm/msm/a6xx: add support for Adreno 660 GPU")Signed-off-by Rob Clark <[email protected]>Reviewed-by Dmitry Baryshkov <[email protected]>--- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)drivers/gpu/drm/msm/adreno/a6xx_gpu.c +2
-4@@ -683,19 +683,23 @@ static void a6xx_set_cp_protect(struct msm_gpu *gpu) {struct adreno_gpu *adreno_gpu =to_adreno_gpu (gpu);const u32 *regs = a6xx_protect; -unsigned i, count =ARRAY_SIZE (a6xx_protect), count_max =32 ; - -BUILD_BUG_ON (ARRAY_SIZE (a6xx_protect) >32 ); -BUILD_BUG_ON (ARRAY_SIZE (a650_protect) >48 ); +unsigned i, count, count_max;if (adreno_is_a650 (adreno_gpu)) { regs = a650_protect; count =ARRAY_SIZE (a650_protect); count_max =48 ; +BUILD_BUG_ON (ARRAY_SIZE (a650_protect) >48 ); }else if (adreno_is_a660_family (adreno_gpu)) { regs = a660_protect; count =ARRAY_SIZE (a660_protect);
drivers/gpu/drm/msm/adreno/a6xx_gpu.c static void a6xx_set_cp_protect(struct msm_gpu *gpu) · line 705
Quoted 10 lines
drivers/gpu/drm/msm/adreno/a6xx_gpu.c +6
-0count_max =48 ; +BUILD_BUG_ON (ARRAY_SIZE (a660_protect) >48 ); + }else { + regs = a6xx_protect; + count =ARRAY_SIZE (a6xx_protect); + count_max =32 ; +BUILD_BUG_ON (ARRAY_SIZE (a6xx_protect) >32 ); }/*
Reviewed-by Akhil P Oommen <[email protected]>
-Akhil.