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
aee582de
Commit
aee582de
authored
Sep 27, 2010
by
Ben Skeggs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/nouveau: run perflvl and M table scripts on mem clock change
Signed-off-by:
Ben Skeggs
<
bskeggs@redhat.com
>
parent
5c6dc657
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
0 deletions
+25
-0
drivers/gpu/drm/nouveau/nouveau_drv.h
drivers/gpu/drm/nouveau/nouveau_drv.h
+2
-0
drivers/gpu/drm/nouveau/nouveau_perf.c
drivers/gpu/drm/nouveau/nouveau_perf.c
+1
-0
drivers/gpu/drm/nouveau/nv50_pm.c
drivers/gpu/drm/nouveau/nv50_pm.c
+22
-0
No files found.
drivers/gpu/drm/nouveau/nouveau_drv.h
View file @
aee582de
...
...
@@ -385,6 +385,8 @@ struct nouveau_pm_level {
u8
voltage
;
u8
fanspeed
;
u16
memscript
;
};
struct
nouveau_pm_temp_sensor_constants
{
...
...
drivers/gpu/drm/nouveau/nouveau_perf.c
View file @
aee582de
...
...
@@ -160,6 +160,7 @@ nouveau_perf_init(struct drm_device *dev)
perflvl
->
memory
=
ROM16
(
entry
[
12
])
*
1000
;
break
;
case
0x30
:
perflvl
->
memscript
=
ROM16
(
entry
[
2
]);
case
0x35
:
perflvl
->
fanspeed
=
entry
[
6
];
perflvl
->
voltage
=
entry
[
7
];
...
...
drivers/gpu/drm/nouveau/nv50_pm.c
View file @
aee582de
...
...
@@ -24,6 +24,7 @@
#include "drmP.h"
#include "nouveau_drv.h"
#include "nouveau_bios.h"
#include "nouveau_pm.h"
/*XXX: boards using limits 0x40 need fixing, the register layout
...
...
@@ -33,6 +34,7 @@
*/
struct
nv50_pm_state
{
struct
nouveau_pm_level
*
perflvl
;
struct
pll_lims
pll
;
enum
pll_types
type
;
int
N
,
M
,
P
;
...
...
@@ -77,6 +79,7 @@ nv50_pm_clock_pre(struct drm_device *dev, struct nouveau_pm_level *perflvl,
if
(
!
state
)
return
ERR_PTR
(
-
ENOMEM
);
state
->
type
=
id
;
state
->
perflvl
=
perflvl
;
ret
=
get_pll_limits
(
dev
,
id
,
&
state
->
pll
);
if
(
ret
<
0
)
{
...
...
@@ -98,11 +101,30 @@ void
nv50_pm_clock_set
(
struct
drm_device
*
dev
,
void
*
pre_state
)
{
struct
nv50_pm_state
*
state
=
pre_state
;
struct
nouveau_pm_level
*
perflvl
=
state
->
perflvl
;
u32
reg
=
state
->
pll
.
reg
,
tmp
;
struct
bit_entry
BIT_M
;
u16
script
;
int
N
=
state
->
N
;
int
M
=
state
->
M
;
int
P
=
state
->
P
;
if
(
state
->
type
==
PLL_MEMORY
&&
perflvl
->
memscript
&&
bit_table
(
dev
,
'M'
,
&
BIT_M
)
==
0
&&
BIT_M
.
version
==
1
&&
BIT_M
.
length
>=
0x0b
)
{
script
=
ROM16
(
BIT_M
.
data
[
0x05
]);
if
(
script
)
nouveau_bios_run_init_table
(
dev
,
script
,
NULL
);
script
=
ROM16
(
BIT_M
.
data
[
0x07
]);
if
(
script
)
nouveau_bios_run_init_table
(
dev
,
script
,
NULL
);
script
=
ROM16
(
BIT_M
.
data
[
0x09
]);
if
(
script
)
nouveau_bios_run_init_table
(
dev
,
script
,
NULL
);
nouveau_bios_run_init_table
(
dev
,
perflvl
->
memscript
,
NULL
);
}
if
(
state
->
pll
.
vco2
.
maxfreq
)
{
if
(
state
->
type
==
PLL_MEMORY
)
{
nv_wr32
(
dev
,
0x100210
,
0
);
...
...
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