drm/msm/a2xx: Pass the revision information
Subsystems (3)
PATCH 1/1 drm/msm/a2xx: Pass the revision information
From: Fabio Estevam <[email protected]>
Since commit cc943f43ece7 ("drm/msm/adreno: warn if chip revn is verified before being set") the following run-time warning is observed:
------------[ cut here ]------------ WARNING: CPU: 0 PID: 1 at drivers/gpu/drm/msm/adreno/adreno_gpu.h:171 a2xx_gpu_init+0x138/0x184 Modules linked in: CPU: 0 PID: 1 Comm: swapper/0 Not tainted 6.4.0-rc7-next-20230620 #993
Fix the problem by assigning the GPU revision fields like it is done in a6xx_gpu.
Fixes cc943f43ece7 ("drm/msm/adreno: warn if chip revn is verified before being set")
Signed-off-by Fabio Estevam <[email protected]>
--- drivers/gpu/drm/msm/adreno/a2xx_gpu.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
drivers/gpu/drm/msm/adreno/a2xx_gpu.c +19 -0
@@ -520,6 +520,8 @@ struct msm_gpu *a2xx_gpu_init(struct drm_device *dev)struct msm_gpu *gpu;struct msm_drm_private *priv = dev->dev_private;struct platform_device *pdev = priv->gpu_pdev; +struct adreno_platform_config *config = pdev->dev.platform_data; +const struct adreno_info *info;int ret;if (!pdev) {
@@ -540,6 +542,23 @@ struct msm_gpu *a2xx_gpu_init(struct drm_device *dev) gpu->perfcntrs = perfcntrs; gpu->num_perfcntrs =ARRAY_SIZE (perfcntrs); +/* +* We need to know the platform type before calling into adreno_gpu_init +* so that the hw_apriv flag can be correctly set. Snoop into the info +* and grab the revision number +*/ + info =adreno_info (config->rev); +if (!info) +return ERR_PTR (-EINVAL ); + +/* Assign these early so that we can use the is_aXYZ helpers */ +/* Numeric revision IDs (e.g. 630) */ + adreno_gpu->revn = info->revn; +/* New-style ADRENO_REV()-only */ + adreno_gpu->rev = info->rev; +/* Quirk data */ + adreno_gpu->info = info; +if (adreno_is_a20x (adreno_gpu)) adreno_gpu->registers = a200_registers;else if (adreno_is_a225 (adreno_gpu))
Signature · 1 line
2.34.1