From: Francisco Jerez <currojerez@riseup.net>
To: linux-pm@vger.kernel.org, intel-gfx@lists.freedesktop.org,
Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Cc: Eero Tamminen <eero.t.tamminen@intel.com>,
"Rafael J. Wysocki" <rjw@rjwysocki.net>
Subject: [PATCH 4/9] Revert "cpufreq: intel_pstate: Simplify intel_pstate_adjust_pstate()"
Date: Tue, 27 Mar 2018 23:38:40 -0700 [thread overview]
Message-ID: <20180328063845.4884-5-currojerez@riseup.net> (raw)
In-Reply-To: <20180328063845.4884-1-currojerez@riseup.net>
This reverts commit a891283e56362543d1d276e192266069ef52075b. The
previous approach of taking an explicit P-state target as argument
makes it more easily reusable by a future commit.
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
---
drivers/cpufreq/intel_pstate.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
index e21645f0fd3a..ef8f46ff7168 100644
--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
@@ -1499,15 +1499,13 @@ static void intel_pstate_update_pstate(struct cpudata *cpu, int pstate)
wrmsrl(MSR_IA32_PERF_CTL, pstate_funcs.get_val(cpu, pstate));
}
-static void intel_pstate_adjust_pstate(struct cpudata *cpu)
+static void intel_pstate_adjust_pstate(struct cpudata *cpu, int target_pstate)
{
int from = cpu->pstate.current_pstate;
struct sample *sample;
- int target_pstate;
update_turbo_state();
- target_pstate = get_target_pstate_use_cpu_load(cpu);
target_pstate = intel_pstate_prepare_request(cpu, target_pstate);
trace_cpu_frequency(target_pstate * cpu->pstate.scaling, cpu->cpu);
intel_pstate_update_pstate(cpu, target_pstate);
@@ -1557,8 +1555,12 @@ static void intel_pstate_update_util(struct update_util_data *data, u64 time,
return;
set_pstate:
- if (intel_pstate_sample(cpu, time))
- intel_pstate_adjust_pstate(cpu);
+ if (intel_pstate_sample(cpu, time)) {
+ int target_pstate;
+
+ target_pstate = get_target_pstate_use_cpu_load(cpu);
+ intel_pstate_adjust_pstate(cpu, target_pstate);
+ }
}
static struct pstate_funcs core_funcs = {
--
2.16.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2018-03-28 6:38 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-28 6:38 [PATCH 0/9] GPU-bound energy efficiency improvements for the intel_pstate driver Francisco Jerez
2018-03-28 6:38 ` [PATCH 1/9] cpufreq: Implement infrastructure keeping track of aggregated IO active time Francisco Jerez
2018-03-28 6:38 ` [PATCH 2/9] Revert "cpufreq: intel_pstate: Replace bxt_funcs with core_funcs" Francisco Jerez
2018-03-28 6:38 ` [PATCH 3/9] Revert "cpufreq: intel_pstate: Shorten a couple of long names" Francisco Jerez
2018-03-28 6:38 ` Francisco Jerez [this message]
2018-03-28 6:38 ` [PATCH 5/9] Revert "cpufreq: intel_pstate: Drop ->update_util from pstate_funcs" Francisco Jerez
2018-03-28 6:38 ` [PATCH 6/9] cpufreq/intel_pstate: Implement variably low-pass filtering controller for small core Francisco Jerez
2018-03-28 6:38 ` [PATCH 7/9] SQUASH: cpufreq/intel_pstate: Enable LP controller based on ACPI FADT profile Francisco Jerez
2018-03-28 6:38 ` [PATCH 8/9] OPTIONAL: cpufreq/intel_pstate: Expose LP controller parameters via debugfs Francisco Jerez
2018-03-28 6:38 ` [PATCH 9/9] drm/i915/execlists: Report GPU rendering as IO activity to cpufreq Francisco Jerez
2018-03-28 8:02 ` Chris Wilson
2018-03-28 18:55 ` Francisco Jerez
2018-03-28 19:20 ` Chris Wilson
2018-03-28 23:19 ` Chris Wilson
2018-03-29 0:32 ` Francisco Jerez
2018-03-29 1:01 ` Chris Wilson
2018-03-29 1:20 ` Chris Wilson
2018-03-30 18:50 ` [PATCH 0/9] GPU-bound energy efficiency improvements for the intel_pstate driver Francisco Jerez
2018-04-10 22:28 ` Francisco Jerez
2018-04-11 3:14 ` Srinivas Pandruvada
2018-04-11 16:10 ` Francisco Jerez
2018-04-11 16:26 ` Francisco Jerez
2018-04-11 17:35 ` Juri Lelli
2018-04-12 21:38 ` Francisco Jerez
2018-04-12 6:17 ` Srinivas Pandruvada
2018-04-14 2:00 ` Francisco Jerez
2018-04-14 4:01 ` Srinivas Pandruvada
2018-04-16 14:04 ` Eero Tamminen
2018-04-16 17:27 ` Srinivas Pandruvada
2018-04-12 8:58 ` Peter Zijlstra
2018-04-12 18:34 ` Francisco Jerez
2018-04-12 19:33 ` Peter Zijlstra
2018-04-12 19:55 ` Francisco Jerez
2018-04-13 18:15 ` Peter Zijlstra
2018-04-14 1:57 ` Francisco Jerez
2018-04-14 9:49 ` Peter Zijlstra
2018-04-17 14:03 ` Chris Wilson
2018-04-17 15:34 ` Srinivas Pandruvada
2018-04-17 19:27 ` Francisco Jerez
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180328063845.4884-5-currojerez@riseup.net \
--to=currojerez@riseup.net \
--cc=eero.t.tamminen@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=linux-pm@vger.kernel.org \
--cc=rjw@rjwysocki.net \
--cc=srinivas.pandruvada@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).