From: Konrad Dybcio Date: Fri, 19 Jul 2024 10:03:26 +0000 (+0200) Subject: drm/msm/a6xx: Evaluate adreno_is_a650_family in pdc_in_aop check X-Git-Tag: v6.12-rc1~126^2~9^2~18 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1b3975efc1a923327577dbf77476688674fcffb7;p=thirdparty%2Fkernel%2Flinux.git drm/msm/a6xx: Evaluate adreno_is_a650_family in pdc_in_aop check A650 family includes A660 family (they've got a big family), A650 itself, and some more A6XX_GEN3 SKUs, all of which should fall into the same branch of the if-condition. Simplify that. Signed-off-by: Konrad Dybcio Patchwork: https://patchwork.freedesktop.org/patch/605206/ Signed-off-by: Rob Clark --- diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c index cb538a262d1c1..6f168f1f32d83 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c @@ -525,8 +525,7 @@ static void a6xx_gmu_rpmh_init(struct a6xx_gmu *gmu) if (IS_ERR(pdcptr)) goto err; - if (adreno_is_a650(adreno_gpu) || - adreno_is_a660_family(adreno_gpu) || + if (adreno_is_a650_family(adreno_gpu) || adreno_is_a7xx(adreno_gpu)) pdc_in_aop = true; else if (adreno_is_a618(adreno_gpu) || adreno_is_a640_family(adreno_gpu))