Merge "msm: kgsl: Remove srcu notifier support" (9b7ce3bc) · Commits · e / devices / android_kernel_xiaomi_sm6125

drivers/gpu/msm/kgsl_pwrscale.c

+0 −48

Original line number	Diff line number	Diff line
		@@ -687,51 +687,6 @@ int kgsl_devfreq_get_cur_freq(struct device dev, unsigned long freq)
		}
		EXPORT_SYMBOL(kgsl_devfreq_get_cur_freq);

		/*
		* kgsl_devfreq_add_notifier - add a fine grained notifier.
		* @dev: The device
		* @nb: Notifier block that will receive updates.
		*
		* Add a notifier to receive ADRENO_DEVFREQ_NOTIFY_* events
		* from the device.
		*/
		int kgsl_devfreq_add_notifier(struct device *dev,
		struct notifier_block *nb)
		{
		struct kgsl_device *device = dev_get_drvdata(dev);

		if (device == NULL)
		return -ENODEV;

		if (nb == NULL)
		return -EINVAL;

		return srcu_notifier_chain_register(&device->pwrscale.nh, nb);
		}
		EXPORT_SYMBOL(kgsl_devfreq_add_notifier);

		/*
		* kgsl_devfreq_del_notifier - remove a fine grained notifier.
		* @dev: The device
		* @nb: The notifier block.
		*
		* Remove a notifier registered with kgsl_devfreq_add_notifier().
		*/
		int kgsl_devfreq_del_notifier(struct device dev, struct notifier_block nb)
		{
		struct kgsl_device *device = dev_get_drvdata(dev);

		if (device == NULL)
		return -ENODEV;

		if (nb == NULL)
		return -EINVAL;

		return srcu_notifier_chain_unregister(&device->pwrscale.nh, nb);
		}
		EXPORT_SYMBOL(kgsl_devfreq_del_notifier);


		/*
		* kgsl_busmon_get_dev_status - devfreq_dev_profile.get_dev_status callback
		* @dev: see devfreq.h
		@@ -954,8 +909,6 @@ int kgsl_pwrscale_init(struct device dev, const char governor)

		dev_pm_opp_register_notifier(dev, &pwr->nb);

		srcu_init_notifier_head(&pwrscale->nh);

		profile->initial_freq =
		pwr->pwrlevels[pwr->default_pwrlevel].gpu_freq;
		/* Let's start with 10 ms and tune in later */
		@@ -1112,7 +1065,6 @@ void kgsl_pwrscale_close(struct kgsl_device *device)
		kgsl_midframe = NULL;
		device->pwrscale.bus_devfreq = NULL;
		device->pwrscale.devfreqptr = NULL;
		srcu_cleanup_notifier_head(&device->pwrscale.nh);
		dev_pm_opp_unregister_notifier(&device->pdev->dev, &pwr->nb);
		for (i = 0; i < KGSL_PWREVENT_MAX; i++)
		kfree(pwrscale->history[i].events);

drivers/gpu/msm/kgsl_pwrscale.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -81,7 +81,6 @@ struct kgsl_pwr_history {
		* @time - Last submitted sample timestamp
		* @on_time - Timestamp when gpu busy begins
		* @freq_change_time - Timestamp of last freq change or popp update
		* @nh - Notifier for the partner devfreq bus device
		* @devfreq_wq - Main devfreq workqueue
		* @devfreq_suspend_ws - Pass device suspension to devfreq
		* @devfreq_resume_ws - Pass device resume to devfreq
		@@ -110,7 +109,6 @@ struct kgsl_pwrscale {
		ktime_t time;
		s64 on_time;
		s64 freq_change_time;
		struct srcu_notifier_head nh;
		struct workqueue_struct *devfreq_wq;
		struct work_struct devfreq_suspend_ws;
		struct work_struct devfreq_resume_ws;