drm/msm: Enable clamp_to_idle for 7c3
[ Upstream commit2c1b774810
] This was overlooked. Signed-off-by: Rob Clark <robdclark@chromium.org> Reviewed-by: Douglas Anderson <dianders@chromium.org> Reviewed-by: Chia-I Wu <olvaffe@gmail.com> Patchwork: https://patchwork.freedesktop.org/patch/511693/ Link: https://lore.kernel.org/r/20221115155535.1615278-1-robdclark@gmail.com Stable-dep-of:46d4efcccc
("drm/msm/a6xx: Avoid a nullptr dereference when speedbin setting fails") Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
ac9de7b29e
commit
7904aee9cc
@ -2036,13 +2036,6 @@ struct msm_gpu *a6xx_gpu_init(struct drm_device *dev)
|
|||||||
adreno_cmp_rev(ADRENO_REV(6, 3, 5, ANY_ID), info->rev)))
|
adreno_cmp_rev(ADRENO_REV(6, 3, 5, ANY_ID), info->rev)))
|
||||||
adreno_gpu->base.hw_apriv = true;
|
adreno_gpu->base.hw_apriv = true;
|
||||||
|
|
||||||
/*
|
|
||||||
* For now only clamp to idle freq for devices where this is known not
|
|
||||||
* to cause power supply issues:
|
|
||||||
*/
|
|
||||||
if (info && (info->revn == 618))
|
|
||||||
gpu->clamp_to_idle = true;
|
|
||||||
|
|
||||||
a6xx_llc_slices_init(pdev, a6xx_gpu);
|
a6xx_llc_slices_init(pdev, a6xx_gpu);
|
||||||
|
|
||||||
ret = a6xx_set_supported_hw(&pdev->dev, config->rev);
|
ret = a6xx_set_supported_hw(&pdev->dev, config->rev);
|
||||||
@ -2057,6 +2050,13 @@ struct msm_gpu *a6xx_gpu_init(struct drm_device *dev)
|
|||||||
return ERR_PTR(ret);
|
return ERR_PTR(ret);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* For now only clamp to idle freq for devices where this is known not
|
||||||
|
* to cause power supply issues:
|
||||||
|
*/
|
||||||
|
if (adreno_is_a618(adreno_gpu) || adreno_is_7c3(adreno_gpu))
|
||||||
|
gpu->clamp_to_idle = true;
|
||||||
|
|
||||||
/* Check if there is a GMU phandle and set it up */
|
/* Check if there is a GMU phandle and set it up */
|
||||||
node = of_parse_phandle(pdev->dev.of_node, "qcom,gmu", 0);
|
node = of_parse_phandle(pdev->dev.of_node, "qcom,gmu", 0);
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user