Merge "msm: kgsl: Add support to get gpu model from device tree" (d11c172c) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/gpu/msm/adreno.c

+83 −7

Original line number	Diff line number	Diff line
		@@ -1217,6 +1217,88 @@ static int adreno_read_speed_bin(struct platform_device *pdev)
		return val;
		}

		static int adreno_read_gpu_model_fuse(struct platform_device *pdev)
		{
		struct nvmem_cell *cell = nvmem_cell_get(&pdev->dev, "gpu_model");
		int ret = PTR_ERR_OR_ZERO(cell);
		void *buf;
		int val = 0;
		size_t len;

		if (ret)
		return ret;

		buf = nvmem_cell_read(cell, &len);
		nvmem_cell_put(cell);

		if (IS_ERR(buf))
		return PTR_ERR(buf);

		memcpy(&val, buf, min(len, sizeof(val)));
		kfree(buf);

		return val;
		}

		static struct device_node *
		adreno_get_gpu_model_node(struct platform_device *pdev)
		{
		struct device_node node, child;
		int fuse_model = adreno_read_gpu_model_fuse(pdev);

		if (fuse_model < 0)
		return NULL;

		node = of_find_node_by_name(pdev->dev.of_node, "qcom,gpu-models");
		if (node == NULL)
		return NULL;

		for_each_child_of_node(node, child) {
		u32 model;

		if (of_property_read_u32(child, "qcom,gpu-model-id", &model))
		continue;

		if (model == fuse_model) {
		of_node_put(node);
		return child;
		}
		}

		of_node_put(node);

		return NULL;
		}

		static const char adreno_get_gpu_model(struct kgsl_device device)
		{
		struct device_node *node;
		static char gpu_model[32];
		const char *model;
		int ret;

		if (strlen(gpu_model))
		return gpu_model;

		node = adreno_get_gpu_model_node(device->pdev);
		if (!node)
		node = of_node_get(device->pdev->dev.of_node);

		ret = of_property_read_string(node, "qcom,gpu-model", &model);
		of_node_put(node);

		if (!ret)
		strlcpy(gpu_model, model, sizeof(gpu_model));
		else
		scnprintf(gpu_model, sizeof(gpu_model), "Adreno%d%d%dv%d",
		ADRENO_CHIPID_CORE(ADRENO_DEVICE(device)->chipid),
		ADRENO_CHIPID_MAJOR(ADRENO_DEVICE(device)->chipid),
		ADRENO_CHIPID_MINOR(ADRENO_DEVICE(device)->chipid),
		ADRENO_CHIPID_PATCH(ADRENO_DEVICE(device)->chipid) + 1);

		return gpu_model;
		}

		#if IS_ENABLED(CONFIG_QCOM_LLCC)
		static int adreno_probe_llcc(struct adreno_device *adreno_dev,
		struct platform_device *pdev)
		@@ -3620,13 +3702,7 @@ static void adreno_regulator_disable_poll(struct kgsl_device *device)
		static void adreno_gpu_model(struct kgsl_device device, char str,
		size_t bufsz)
		{
		struct adreno_device *adreno_dev = ADRENO_DEVICE(device);

		snprintf(str, bufsz, "Adreno%d%d%dv%d",
		ADRENO_CHIPID_CORE(adreno_dev->chipid),
		ADRENO_CHIPID_MAJOR(adreno_dev->chipid),
		ADRENO_CHIPID_MINOR(adreno_dev->chipid),
		ADRENO_CHIPID_PATCH(adreno_dev->chipid) + 1);
		scnprintf(str, bufsz, adreno_get_gpu_model(device));
		}

		static bool adreno_is_hwcg_on(struct kgsl_device *device)