Commit e2f76193 authored by Akhil P Oommen's avatar Akhil P Oommen Committed by Rob Clark
Browse files

drm/msm/adreno: Generate name from chipid for 7c3 



Use a gpu name which is sprintf'ed from the chipid for 7c3 gpu instead of
hardcoding one. This helps to avoid code churn in case of a gpu rename.

Signed-off-by: default avatarAkhil P Oommen <quic_akhilpo@quicinc.com>
Link: https://lore.kernel.org/r/20220226005021.v2.2.I9436e0e300f76b2e6c34136a0b902e8cfd73e0d6@changeid


Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
parent 0737ab95

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

+0 −1
Original line number Diff line number Diff line
@@ -318,7 +318,6 @@ static const struct adreno_info gpulist[] = { 
		.hwcg = a660_hwcg,

	}, {

		.rev = ADRENO_REV(6, 3, 5, ANY_ID),

		.name = "Adreno 7c Gen 3",

		.fw = {

			[ADRENO_FW_SQE] = "a660_sqe.fw",

			[ADRENO_FW_GMU] = "a660_gmu.bin",

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

+13 −2
Original line number Diff line number Diff line
@@ -930,12 +930,23 @@ int adreno_gpu_init(struct drm_device *drm, struct platform_device *pdev, 
	struct adreno_platform_config *config = dev->platform_data;

	struct msm_gpu_config adreno_gpu_config  = { 0 };

	struct msm_gpu *gpu = &adreno_gpu->base;

	struct adreno_rev *rev = &config->rev;

	const char *gpu_name;



	adreno_gpu->funcs = funcs;

	adreno_gpu->info = adreno_info(config->rev);

	adreno_gpu->gmem = adreno_gpu->info->gmem;

	adreno_gpu->revn = adreno_gpu->info->revn;

	adreno_gpu->rev = config->rev;

	adreno_gpu->rev = *rev;



	gpu_name = adreno_gpu->info->name;

	if (!gpu_name) {

		gpu_name = devm_kasprintf(dev, GFP_KERNEL, "%d.%d.%d.%d",

				rev->core, rev->major, rev->minor,

				rev->patchid);

		if (!gpu_name)

			return -ENOMEM;

	}



	adreno_gpu_config.ioname = "kgsl_3d0_reg_memory";
@@ -949,7 +960,7 @@ int adreno_gpu_init(struct drm_device *drm, struct platform_device *pdev, 
	pm_runtime_enable(dev);



	return msm_gpu_init(drm, pdev, &adreno_gpu->base, &funcs->base,

			adreno_gpu->info->name, &adreno_gpu_config);

			gpu_name, &adreno_gpu_config);

}



void adreno_gpu_cleanup(struct adreno_gpu *adreno_gpu)