Merge "msm: kgsl: Initialize coresight at boot time" (60d83900) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/gpu/msm/adreno.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -1116,6 +1116,9 @@ static int adreno_probe(struct platform_device *pdev)

		kgsl_pwrscale_init(&pdev->dev, CONFIG_MSM_ADRENO_DEFAULT_GOVERNOR);

		/* Initialize coresight for the target */
		adreno_coresight_init(adreno_dev);

		adreno_input_handler.private = device;

		#ifdef CONFIG_INPUT
		@@ -1274,9 +1277,6 @@ static int adreno_init(struct kgsl_device *device)
		if (ret)
		return ret;

		/* Initialize coresight for the target */
		adreno_coresight_init(adreno_dev);

		adreno_perfcounter_init(adreno_dev);
		adreno_fault_detect_init(adreno_dev);

+8 −6

Original line number	Diff line number	Diff line
		@@ -61,7 +61,7 @@ ssize_t adreno_coresight_show_register(struct device *dev,
		}
		mutex_unlock(&device->mutex);

		return snprintf(buf, PAGE_SIZE, "0x%X", val);
		return snprintf(buf, PAGE_SIZE, "0x%X\n", val);
		}

		ssize_t adreno_coresight_store_register(struct device *dev,
		@@ -243,12 +243,14 @@ static int adreno_coresight_enable(struct coresight_device *csdev)
		coresight->registers[i].value =
		coresight->registers[i].initial;

		if (kgsl_state_is_awake(device)) {
		ret = kgsl_active_count_get(device);
		if (!ret) {
		ret = _adreno_coresight_set(adreno_dev);
		kgsl_active_count_put(device);
		}
		}
		}

		mutex_unlock(&device->mutex);

		@@ -305,7 +307,7 @@ int adreno_coresight_init(struct adreno_device *adreno_dev)
		if (gpudev->coresight == NULL)
		return -ENODEV;

		if (adreno_dev->csdev != NULL)
		if (!IS_ERR_OR_NULL(adreno_dev->csdev))
		return 0;

		memset(&desc, 0, sizeof(desc));