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

Commit d1870a33 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "PM / devfreq: Allow the governors to set the target flag"

parents c3fa8b5a 944cc1fe
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ int update_devfreq(struct devfreq *devfreq)
		return -EINVAL;

	/* Reevaluate the proper frequency */
	err = devfreq->governor->get_target_freq(devfreq, &freq);
	err = devfreq->governor->get_target_freq(devfreq, &freq, &flags);
	if (err)
		return err;

+2 −1
Original line number Diff line number Diff line
@@ -64,7 +64,8 @@ static int __secure_tz_entry3(u32 cmd, u32 val1, u32 val2, u32 val3)
}


static int tz_get_target_freq(struct devfreq *devfreq, unsigned long *freq)
static int tz_get_target_freq(struct devfreq *devfreq, unsigned long *freq,
				u32 *flag)
{
	int result = 0;
	struct devfreq_msm_adreno_tz_data *priv = devfreq->data;
+2 −1
Original line number Diff line number Diff line
@@ -14,7 +14,8 @@
#include "governor.h"

static int devfreq_performance_func(struct devfreq *df,
				    unsigned long *freq)
				    unsigned long *freq,
				u32 *flag)
{
	/*
	 * target callback should be able to get floor value as
+2 −1
Original line number Diff line number Diff line
@@ -14,7 +14,8 @@
#include "governor.h"

static int devfreq_powersave_func(struct devfreq *df,
				  unsigned long *freq)
				  unsigned long *freq,
				u32 *flag)
{
	/*
	 * target callback should be able to get ceiling value as
+2 −1
Original line number Diff line number Diff line
@@ -19,7 +19,8 @@
#define DFSO_UPTHRESHOLD	(90)
#define DFSO_DOWNDIFFERENCTIAL	(5)
static int devfreq_simple_ondemand_func(struct devfreq *df,
					unsigned long *freq)
					unsigned long *freq,
					u32 *flag)
{
	struct devfreq_dev_status stat;
	int err = df->profile->get_dev_status(df->dev.parent, &stat);
Loading