Unverified Commit 3d987923 authored Nov 04, 2024 by openeuler-ci-bot Committed by Gitee Nov 04, 2024

!12913 drm/msm/adreno: Assign msm_gpu->pdev earlier to avoid nullptrs

Merge Pull Request from: @ci-robot 
 
PR sync from: Zeng Heng <zengheng4@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/Y7PQE4RKBDAN75XR4ZIGHVH5ODSBQDW3/ 
 
https://gitee.com/src-openeuler/kernel/issues/IB1MDC 
 
Link:https://gitee.com/openeuler/kernel/pulls/12913

 

Reviewed-by: Xie XiuQi <xiexiuqi@huawei.com>
Signed-off-by: Zhang Peng <zhangpeng362@huawei.com>

parents e4a5cbfa c24d2a48

drivers/gpu/drm/msm/adreno/adreno_gpu.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -1071,6 +1071,7 @@ int adreno_gpu_init(struct drm_device drm, struct platform_device pdev,
		adreno_gpu->chip_id = config->chip_id;

		gpu->allow_relocs = config->info->family < ADRENO_6XX_GEN1;
		gpu->pdev = pdev;

		/* Only handle the core clock when GMU is not in use (or is absent). */
		if (adreno_has_gmu_wrapper(adreno_gpu) \|\|

drivers/gpu/drm/msm/msm_gpu.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -927,7 +927,6 @@ int msm_gpu_init(struct drm_device drm, struct platform_device pdev,
		if (IS_ERR(gpu->gpu_cx))
		gpu->gpu_cx = NULL;

		gpu->pdev = pdev;
		platform_set_drvdata(pdev, &gpu->adreno_smmu);

		msm_devfreq_init(gpu);