Merge "msm: kgsl: Enable power scaling" into msm-4.14 (3cc8678e) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/gpu/msm/adreno.c

+2 −0

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

		adreno_sysfs_init(adreno_dev);

		kgsl_pwrscale_init(&pdev->dev, CONFIG_QCOM_ADRENO_DEFAULT_GOVERNOR);

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

+13 −2

Original line number	Diff line number	Diff line
		@@ -288,8 +288,19 @@ void kgsl_pwrscale_enable(struct kgsl_device *device)
		if (WARN_ON(!mutex_is_locked(&device->mutex)))
		return;

		if (device->pwrscale.devfreqptr) {
		queue_work(device->pwrscale.devfreq_wq,
		&device->pwrscale.devfreq_resume_ws);
		device->pwrscale.enabled = true;
		} else {
		/*
		* Don't enable it if devfreq is not set and let the device
		* run at default level;
		*/
		kgsl_pwrctrl_pwrlevel_change(device,
		device->pwrctrl.default_pwrlevel);
		device->pwrscale.enabled = false;
		return;
		}
		}
		EXPORT_SYMBOL(kgsl_pwrscale_enable);

+1 −1

Original line number	Diff line number	Diff line
		@@ -144,7 +144,7 @@ bool kgsl_popp_check(struct kgsl_device *device);


		#define KGSL_PWRSCALE_INIT(_priv_data) { \
		.enabled = false, \
		.enabled = true, \
		.gpu_profile = { \
		.private_data = _priv_data, \
		.profile = { \