Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7603d6f2 authored by Akhil P Oommen's avatar Akhil P Oommen
Browse files

adreno_tz: Remove partner devfreq management 



Remove partner (bus) devfreq management from the adreno governor.
Partner devfreq can be managed directly from the device driver.

Change-Id: I745361c2b585e0dd91f208e09ec3001d7ecba717
Signed-off-by: default avatarAkhil P Oommen <akhilpo@codeaurora.org>
parent 8cf3847e

drivers/devfreq/governor_msm_adreno_tz.c

+2 −120
Original line number Diff line number Diff line 
/* Copyright (c) 2010-2018, The Linux Foundation. All rights reserved.

/* Copyright (c) 2010-2019, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -62,14 +62,6 @@ static u64 suspend_time; 
static u64 suspend_start;

static unsigned long acc_total, acc_relative_busy;



static struct msm_adreno_extended_profile *partner_gpu_profile;

static void do_partner_start_event(struct work_struct *work);

static void do_partner_stop_event(struct work_struct *work);

static void do_partner_suspend_event(struct work_struct *work);

static void do_partner_resume_event(struct work_struct *work);



static struct workqueue_struct *workqueue;



/*

 * Returns GPU suspend time in millisecond.

 */
@@ -415,32 +407,6 @@ static int tz_get_target_freq(struct devfreq *devfreq, unsigned long *freq) 
	return 0;

}



static int tz_notify(struct notifier_block *nb, unsigned long type, void *devp)

{

	int result = 0;

	struct devfreq *devfreq = devp;



	switch (type) {

	case ADRENO_DEVFREQ_NOTIFY_IDLE:

	case ADRENO_DEVFREQ_NOTIFY_RETIRE:

		mutex_lock(&devfreq->lock);

		result = update_devfreq(devfreq);

		mutex_unlock(&devfreq->lock);

		/* Nofifying partner bus governor if any */

		if (partner_gpu_profile && partner_gpu_profile->bus_devfreq) {

			mutex_lock(&partner_gpu_profile->bus_devfreq->lock);

			update_devfreq(partner_gpu_profile->bus_devfreq);

			mutex_unlock(&partner_gpu_profile->bus_devfreq->lock);

		}

		break;

	/* ignored by this governor */

	case ADRENO_DEVFREQ_NOTIFY_SUBMIT:

	default:

		break;

	}

	return notifier_from_errno(result);

}



static int tz_start(struct devfreq *devfreq)

{

	struct devfreq_msm_adreno_tz_data *priv;
@@ -460,10 +426,8 @@ static int tz_start(struct devfreq *devfreq) 
	 * from the container of the device profile

	 */

	devfreq->data = gpu_profile->private_data;

	partner_gpu_profile = gpu_profile;



	priv = devfreq->data;

	priv->nb.notifier_call = tz_notify;



	out = 1;

	if (devfreq->profile->max_state < MSM_ADRENO_MAX_PWRLEVELS) {
@@ -475,15 +439,6 @@ static int tz_start(struct devfreq *devfreq) 
		return -EINVAL;

	}



	INIT_WORK(&gpu_profile->partner_start_event_ws,

					do_partner_start_event);

	INIT_WORK(&gpu_profile->partner_stop_event_ws,

					do_partner_stop_event);

	INIT_WORK(&gpu_profile->partner_suspend_event_ws,

					do_partner_suspend_event);

	INIT_WORK(&gpu_profile->partner_resume_event_ws,

					do_partner_resume_event);



	ret = tz_init(priv, tz_pwrlevels, sizeof(tz_pwrlevels), &version,

				sizeof(version));

	if (ret != 0 || version > MAX_TZ_VERSION) {
@@ -494,24 +449,18 @@ static int tz_start(struct devfreq *devfreq) 
	for (i = 0; adreno_tz_attr_list[i] != NULL; i++)

		device_create_file(&devfreq->dev, adreno_tz_attr_list[i]);



	return kgsl_devfreq_add_notifier(devfreq->dev.parent, &priv->nb);

	return 0;

}



static int tz_stop(struct devfreq *devfreq)

{

	int i;

	struct devfreq_msm_adreno_tz_data *priv = devfreq->data;



	kgsl_devfreq_del_notifier(devfreq->dev.parent, &priv->nb);



	for (i = 0; adreno_tz_attr_list[i] != NULL; i++)

		device_remove_file(&devfreq->dev, adreno_tz_attr_list[i]);



	flush_workqueue(workqueue);



	/* leaving the governor and cleaning the pointer to private data */

	devfreq->data = NULL;

	partner_gpu_profile = NULL;

	return 0;

}
@@ -531,21 +480,12 @@ static int tz_handler(struct devfreq *devfreq, unsigned int event, void *data) 
{

	int result;



	struct msm_adreno_extended_profile *gpu_profile = container_of(

					(devfreq->profile),

					struct msm_adreno_extended_profile,

					profile);



	switch (event) {

	case DEVFREQ_GOV_START:

		result = tz_start(devfreq);

		break;



	case DEVFREQ_GOV_STOP:

		/* Queue the stop work before the TZ is stopped */

		if (partner_gpu_profile && partner_gpu_profile->bus_devfreq)

			queue_work(workqueue,

				&gpu_profile->partner_stop_event_ws);

		spin_lock(&suspend_lock);

		suspend_start = 0;

		spin_unlock(&suspend_lock);
@@ -576,60 +516,9 @@ static int tz_handler(struct devfreq *devfreq, unsigned int event, void *data) 
		break;

	}



	if (partner_gpu_profile && partner_gpu_profile->bus_devfreq)

		switch (event) {

		case DEVFREQ_GOV_START:

			queue_work(workqueue,

					&gpu_profile->partner_start_event_ws);

			break;

		case DEVFREQ_GOV_SUSPEND:

			queue_work(workqueue,

					&gpu_profile->partner_suspend_event_ws);

			break;

		case DEVFREQ_GOV_RESUME:

			queue_work(workqueue,

					&gpu_profile->partner_resume_event_ws);

			break;

		}



	return result;

}



static void _do_partner_event(struct work_struct *work, unsigned int event)

{

	struct devfreq *bus_devfreq;



	if (partner_gpu_profile == NULL)

		return;



	bus_devfreq = partner_gpu_profile->bus_devfreq;



	if (bus_devfreq != NULL &&

		bus_devfreq->governor &&

		bus_devfreq->governor->event_handler)

		bus_devfreq->governor->event_handler(bus_devfreq, event, NULL);

}



static void do_partner_start_event(struct work_struct *work)

{

	_do_partner_event(work, DEVFREQ_GOV_START);

}



static void do_partner_stop_event(struct work_struct *work)

{

	_do_partner_event(work, DEVFREQ_GOV_STOP);

}



static void do_partner_suspend_event(struct work_struct *work)

{

	_do_partner_event(work, DEVFREQ_GOV_SUSPEND);

}



static void do_partner_resume_event(struct work_struct *work)

{

	_do_partner_event(work, DEVFREQ_GOV_RESUME);

}





static struct devfreq_governor msm_adreno_tz = {

	.name = "msm-adreno-tz",
@@ -639,11 +528,6 @@ static struct devfreq_governor msm_adreno_tz = { 


static int __init msm_adreno_tz_init(void)

{

	workqueue = create_freezable_workqueue("governor_msm_adreno_tz_wq");



	if (workqueue == NULL)

		return -ENOMEM;



	return devfreq_add_governor(&msm_adreno_tz);

}

subsys_initcall(msm_adreno_tz_init);
@@ -655,8 +539,6 @@ static void __exit msm_adreno_tz_exit(void) 
	if (ret)

		pr_err(TAG "failed to remove governor %d\n", ret);



	if (workqueue != NULL)

		destroy_workqueue(workqueue);

}



module_exit(msm_adreno_tz_exit);

include/linux/msm_adreno_devfreq.h

+1 −17
Original line number Diff line number Diff line 
/* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2016-2019, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -17,22 +17,12 @@ 
#include <linux/devfreq.h>

#include <linux/notifier.h>



#define ADRENO_DEVFREQ_NOTIFY_SUBMIT	1

#define ADRENO_DEVFREQ_NOTIFY_RETIRE	2

#define ADRENO_DEVFREQ_NOTIFY_IDLE	3



#define DEVFREQ_FLAG_WAKEUP_MAXFREQ	0x2

#define DEVFREQ_FLAG_FAST_HINT		0x4

#define DEVFREQ_FLAG_SLOW_HINT		0x8



struct device;



int kgsl_devfreq_add_notifier(struct device *device,

	struct notifier_block *block);



int kgsl_devfreq_del_notifier(struct device *device,

	struct notifier_block *block);



/* same as KGSL_MAX_PWRLEVELS */

#define MSM_ADRENO_MAX_PWRLEVELS 10
@@ -73,12 +63,6 @@ struct devfreq_msm_adreno_tz_data { 


struct msm_adreno_extended_profile {

	struct devfreq_msm_adreno_tz_data *private_data;

	struct devfreq *bus_devfreq;

	struct workqueue_struct *partner_wq;

	struct work_struct partner_start_event_ws;

	struct work_struct partner_stop_event_ws;

	struct work_struct partner_suspend_event_ws;

	struct work_struct partner_resume_event_ws;

	struct devfreq_dev_profile profile;

};