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
nexedi
linux
Commits
2228c6fe
Commit
2228c6fe
authored
Jul 14, 2011
by
Roy Spliet
Committed by
Ben Skeggs
Sep 20, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/nouveau/pm: Document and expose CL and WR for 0x1002Cx
Signed-off-by:
Roy Spliet
<
r.spliet@student.tudelft.nl
>
parent
9a782488
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
14 deletions
+21
-14
drivers/gpu/drm/nouveau/nouveau_drv.h
drivers/gpu/drm/nouveau/nouveau_drv.h
+6
-1
drivers/gpu/drm/nouveau/nouveau_mem.c
drivers/gpu/drm/nouveau/nouveau_mem.c
+15
-13
No files found.
drivers/gpu/drm/nouveau/nouveau_drv.h
View file @
2228c6fe
...
...
@@ -438,6 +438,9 @@ struct nouveau_pm_memtiming {
u32
reg_6
;
u32
reg_7
;
u32
reg_8
;
/* To be written to 0x1002c0 */
u8
CL
;
u8
WR
;
};
struct
nouveau_pm_tbl_header
{
...
...
@@ -448,7 +451,9 @@ struct nouveau_pm_tbl_header{
};
struct
nouveau_pm_tbl_entry
{
u8
tUNK_0
,
tUNK_1
,
tUNK_2
;
u8
tWR
;
u8
tUNK_1
;
u8
tCL
;
u8
tRP
;
/* Byte 3 */
u8
empty_4
;
u8
tRAS
;
/* Byte 5 */
...
...
drivers/gpu/drm/nouveau/nouveau_mem.c
View file @
2228c6fe
...
...
@@ -519,10 +519,10 @@ void nv40_mem_timing_entry(struct drm_device *dev, struct nouveau_pm_tbl_header
/* XXX: I don't trust the -1's and +1's... they must come
* from somewhere! */
timing
->
reg_1
=
(
e
->
t
UNK_0
+
2
+
magic_number
)
<<
24
|
timing
->
reg_1
=
(
e
->
t
WR
+
2
+
magic_number
)
<<
24
|
1
<<
16
|
(
e
->
tUNK_1
+
2
+
magic_number
)
<<
8
|
(
e
->
t
UNK_2
+
2
-
magic_number
);
(
e
->
t
CL
+
2
-
magic_number
);
timing
->
reg_2
=
(
magic_number
<<
24
|
e
->
tUNK_12
<<
16
|
e
->
tUNK_11
<<
8
|
e
->
tUNK_10
);
timing
->
reg_2
|=
0x20200000
;
...
...
@@ -555,13 +555,13 @@ void nv50_mem_timing_entry(struct drm_device *dev, struct bit_entry *P, struct n
/* XXX: I don't trust the -1's and +1's... they must come
* from somewhere! */
timing
->
reg_1
=
(
e
->
t
UNK_0
+
unk19
+
1
+
magic_number
)
<<
24
|
timing
->
reg_1
=
(
e
->
t
WR
+
unk19
+
1
+
magic_number
)
<<
24
|
max
(
unk18
,
(
u8
)
1
)
<<
16
|
(
e
->
tUNK_1
+
unk19
+
1
+
magic_number
)
<<
8
;
if
(
dev_priv
->
chipset
==
0xa8
)
{
timing
->
reg_1
|=
(
e
->
t
UNK_2
-
1
);
timing
->
reg_1
|=
(
e
->
t
CL
-
1
);
}
else
{
timing
->
reg_1
|=
(
e
->
t
UNK_2
+
2
-
magic_number
);
timing
->
reg_1
|=
(
e
->
t
CL
+
2
-
magic_number
);
}
timing
->
reg_2
=
(
e
->
tUNK_12
<<
16
|
e
->
tUNK_11
<<
8
|
e
->
tUNK_10
);
...
...
@@ -570,17 +570,17 @@ void nv50_mem_timing_entry(struct drm_device *dev, struct bit_entry *P, struct n
if
(
P
->
version
==
1
)
{
timing
->
reg_2
|=
magic_number
<<
24
;
timing
->
reg_3
=
(
0x14
+
e
->
t
UNK_2
)
<<
24
|
timing
->
reg_3
=
(
0x14
+
e
->
t
CL
)
<<
24
|
0x16
<<
16
|
(
e
->
t
UNK_2
-
1
)
<<
8
|
(
e
->
t
UNK_2
-
1
);
(
e
->
t
CL
-
1
)
<<
8
|
(
e
->
t
CL
-
1
);
timing
->
reg_4
=
(
nv_rd32
(
dev
,
0x10022c
)
&
0xffff0000
)
|
e
->
tUNK_13
<<
8
|
e
->
tUNK_13
;
timing
->
reg_5
|=
(
e
->
t
UNK_2
+
2
)
<<
8
;
timing
->
reg_7
=
0x4000202
|
(
e
->
t
UNK_2
-
1
)
<<
16
;
timing
->
reg_5
|=
(
e
->
t
CL
+
2
)
<<
8
;
timing
->
reg_7
=
0x4000202
|
(
e
->
t
CL
-
1
)
<<
16
;
}
else
{
timing
->
reg_2
|=
(
unk19
-
1
)
<<
24
;
/* XXX: reg_10022c for recentish cards pretty much unknown*/
timing
->
reg_3
=
e
->
t
UNK_2
-
1
;
timing
->
reg_3
=
e
->
t
CL
-
1
;
timing
->
reg_4
=
(
unk20
<<
24
|
unk21
<<
16
|
e
->
tUNK_13
<<
8
|
e
->
tUNK_13
);
/* XXX: +6? */
...
...
@@ -603,8 +603,8 @@ void nv50_mem_timing_entry(struct drm_device *dev, struct bit_entry *P, struct n
void
nvc0_mem_timing_entry
(
struct
drm_device
*
dev
,
struct
nouveau_pm_tbl_header
*
hdr
,
struct
nouveau_pm_tbl_entry
*
e
,
struct
nouveau_pm_memtiming
*
timing
)
{
timing
->
reg_0
=
(
e
->
tRC
<<
24
|
(
e
->
tRFC
&
0x7f
)
<<
17
|
e
->
tRAS
<<
8
|
e
->
tRP
);
timing
->
reg_1
=
(
nv_rd32
(
dev
,
0x10f294
)
&
0xff000000
)
|
(
e
->
tUNK_11
&
0x0f
)
<<
20
|
(
e
->
tUNK_19
<<
7
)
|
(
e
->
t
UNK_2
&
0x0f
);
timing
->
reg_2
=
(
nv_rd32
(
dev
,
0x10f298
)
&
0xff0000ff
)
|
e
->
t
UNK_0
<<
16
|
e
->
tUNK_1
<<
8
;
timing
->
reg_1
=
(
nv_rd32
(
dev
,
0x10f294
)
&
0xff000000
)
|
(
e
->
tUNK_11
&
0x0f
)
<<
20
|
(
e
->
tUNK_19
<<
7
)
|
(
e
->
t
CL
&
0x0f
);
timing
->
reg_2
=
(
nv_rd32
(
dev
,
0x10f298
)
&
0xff0000ff
)
|
e
->
t
WR
<<
16
|
e
->
tUNK_1
<<
8
;
timing
->
reg_3
=
e
->
tUNK_20
<<
9
|
e
->
tUNK_13
;
timing
->
reg_4
=
(
nv_rd32
(
dev
,
0x10f2a0
)
&
0xfff000ff
)
|
e
->
tUNK_12
<<
15
;
NV_DEBUG
(
dev
,
"Entry %d: 290: %08x %08x %08x %08x
\n
"
,
timing
->
id
,
...
...
@@ -686,6 +686,8 @@ nouveau_mem_timing_init(struct drm_device *dev)
continue
;
timing
->
id
=
i
;
timing
->
WR
=
entry
[
0
];
timing
->
CL
=
entry
[
2
];
if
(
dev_priv
->
card_type
<=
NV_40
)
{
nv40_mem_timing_entry
(
dev
,
hdr
,(
struct
nouveau_pm_tbl_entry
*
)
entry
,
magic_number
,
&
pm
->
memtimings
.
timing
[
i
]);
...
...
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