Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
f1a91645
Commit
f1a91645
authored
Mar 24, 2017
by
Rafael J. Wysocki
Browse files
Options
Browse Files
Download
Plain Diff
Merge back intel_pstate updates for 4.12.
parents
64897b20
5f98ced1
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
14 deletions
+4
-14
drivers/cpufreq/intel_pstate.c
drivers/cpufreq/intel_pstate.c
+4
-14
No files found.
drivers/cpufreq/intel_pstate.c
View file @
f1a91645
...
@@ -922,14 +922,6 @@ static void intel_pstate_hwp_set(struct cpufreq_policy *policy)
...
@@ -922,14 +922,6 @@ static void intel_pstate_hwp_set(struct cpufreq_policy *policy)
}
}
}
}
static
int
intel_pstate_hwp_set_policy
(
struct
cpufreq_policy
*
policy
)
{
if
(
hwp_active
)
intel_pstate_hwp_set
(
policy
);
return
0
;
}
static
int
intel_pstate_hwp_save_state
(
struct
cpufreq_policy
*
policy
)
static
int
intel_pstate_hwp_save_state
(
struct
cpufreq_policy
*
policy
)
{
{
struct
cpudata
*
cpu_data
=
all_cpu_data
[
policy
->
cpu
];
struct
cpudata
*
cpu_data
=
all_cpu_data
[
policy
->
cpu
];
...
@@ -944,20 +936,17 @@ static int intel_pstate_hwp_save_state(struct cpufreq_policy *policy)
...
@@ -944,20 +936,17 @@ static int intel_pstate_hwp_save_state(struct cpufreq_policy *policy)
static
int
intel_pstate_resume
(
struct
cpufreq_policy
*
policy
)
static
int
intel_pstate_resume
(
struct
cpufreq_policy
*
policy
)
{
{
int
ret
;
if
(
!
hwp_active
)
if
(
!
hwp_active
)
return
0
;
return
0
;
mutex_lock
(
&
intel_pstate_limits_lock
);
mutex_lock
(
&
intel_pstate_limits_lock
);
all_cpu_data
[
policy
->
cpu
]
->
epp_policy
=
0
;
all_cpu_data
[
policy
->
cpu
]
->
epp_policy
=
0
;
intel_pstate_hwp_set
(
policy
);
ret
=
intel_pstate_hwp_set_policy
(
policy
);
mutex_unlock
(
&
intel_pstate_limits_lock
);
mutex_unlock
(
&
intel_pstate_limits_lock
);
return
ret
;
return
0
;
}
}
static
void
intel_pstate_update_policies
(
void
)
static
void
intel_pstate_update_policies
(
void
)
...
@@ -2130,7 +2119,8 @@ static int intel_pstate_set_policy(struct cpufreq_policy *policy)
...
@@ -2130,7 +2119,8 @@ static int intel_pstate_set_policy(struct cpufreq_policy *policy)
intel_pstate_set_update_util_hook
(
policy
->
cpu
);
intel_pstate_set_update_util_hook
(
policy
->
cpu
);
intel_pstate_hwp_set_policy
(
policy
);
if
(
hwp_active
)
intel_pstate_hwp_set
(
policy
);
mutex_unlock
(
&
intel_pstate_limits_lock
);
mutex_unlock
(
&
intel_pstate_limits_lock
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment