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
1ac7b528
Commit
1ac7b528
authored
Aug 04, 2010
by
Ben Skeggs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/nvc0: implement crtc pll setting
Signed-off-by:
Ben Skeggs
<
bskeggs@redhat.com
>
parent
0165d15d
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
4 deletions
+21
-4
drivers/gpu/drm/nouveau/nouveau_bios.c
drivers/gpu/drm/nouveau/nouveau_bios.c
+1
-1
drivers/gpu/drm/nouveau/nv50_crtc.c
drivers/gpu/drm/nouveau/nv50_crtc.c
+20
-3
No files found.
drivers/gpu/drm/nouveau/nouveau_bios.c
View file @
1ac7b528
...
@@ -4828,7 +4828,7 @@ int get_pll_limits(struct drm_device *dev, uint32_t limit_match, struct pll_lims
...
@@ -4828,7 +4828,7 @@ int get_pll_limits(struct drm_device *dev, uint32_t limit_match, struct pll_lims
pll_lim
->
min_p
=
record
[
12
];
pll_lim
->
min_p
=
record
[
12
];
pll_lim
->
max_p
=
record
[
13
];
pll_lim
->
max_p
=
record
[
13
];
/* where did this go to?? */
/* where did this go to?? */
if
(
limit_match
==
0x00614100
||
limit_match
==
0x0061490
0
)
if
(
(
entry
[
0
]
&
0xf0
)
==
0x8
0
)
pll_lim
->
refclk
=
27000
;
pll_lim
->
refclk
=
27000
;
else
else
pll_lim
->
refclk
=
100000
;
pll_lim
->
refclk
=
100000
;
...
...
drivers/gpu/drm/nouveau/nv50_crtc.c
View file @
1ac7b528
...
@@ -264,11 +264,16 @@ nv50_crtc_set_scale(struct nouveau_crtc *nv_crtc, int scaling_mode, bool update)
...
@@ -264,11 +264,16 @@ nv50_crtc_set_scale(struct nouveau_crtc *nv_crtc, int scaling_mode, bool update)
int
int
nv50_crtc_set_clock
(
struct
drm_device
*
dev
,
int
head
,
int
pclk
)
nv50_crtc_set_clock
(
struct
drm_device
*
dev
,
int
head
,
int
pclk
)
{
{
uint32_t
reg
=
NV50_PDISPLAY_CRTC_CLK_CTRL1
(
head
)
;
struct
drm_nouveau_private
*
dev_priv
=
dev
->
dev_private
;
struct
pll_lims
pll
;
struct
pll_lims
pll
;
uint32_t
reg1
,
reg2
;
uint32_t
reg
,
reg
1
,
reg2
;
int
ret
,
N1
,
M1
,
N2
,
M2
,
P
;
int
ret
,
N1
,
M1
,
N2
,
M2
,
P
;
if
(
dev_priv
->
chipset
<
NV_C0
)
reg
=
NV50_PDISPLAY_CRTC_CLK_CTRL1
(
head
);
else
reg
=
0x614140
+
(
head
*
0x800
);
ret
=
get_pll_limits
(
dev
,
reg
,
&
pll
);
ret
=
get_pll_limits
(
dev
,
reg
,
&
pll
);
if
(
ret
)
if
(
ret
)
return
ret
;
return
ret
;
...
@@ -286,7 +291,8 @@ nv50_crtc_set_clock(struct drm_device *dev, int head, int pclk)
...
@@ -286,7 +291,8 @@ nv50_crtc_set_clock(struct drm_device *dev, int head, int pclk)
nv_wr32
(
dev
,
reg
,
0x10000611
);
nv_wr32
(
dev
,
reg
,
0x10000611
);
nv_wr32
(
dev
,
reg
+
4
,
reg1
|
(
M1
<<
16
)
|
N1
);
nv_wr32
(
dev
,
reg
+
4
,
reg1
|
(
M1
<<
16
)
|
N1
);
nv_wr32
(
dev
,
reg
+
8
,
reg2
|
(
P
<<
28
)
|
(
M2
<<
16
)
|
N2
);
nv_wr32
(
dev
,
reg
+
8
,
reg2
|
(
P
<<
28
)
|
(
M2
<<
16
)
|
N2
);
}
else
{
}
else
if
(
dev_priv
->
chipset
<
NV_C0
)
{
ret
=
nv50_calc_pll2
(
dev
,
&
pll
,
pclk
,
&
N1
,
&
N2
,
&
M1
,
&
P
);
ret
=
nv50_calc_pll2
(
dev
,
&
pll
,
pclk
,
&
N1
,
&
N2
,
&
M1
,
&
P
);
if
(
ret
<=
0
)
if
(
ret
<=
0
)
return
0
;
return
0
;
...
@@ -298,6 +304,17 @@ nv50_crtc_set_clock(struct drm_device *dev, int head, int pclk)
...
@@ -298,6 +304,17 @@ nv50_crtc_set_clock(struct drm_device *dev, int head, int pclk)
nv_wr32
(
dev
,
reg
,
0x50000610
);
nv_wr32
(
dev
,
reg
,
0x50000610
);
nv_wr32
(
dev
,
reg
+
4
,
reg1
|
(
P
<<
16
)
|
(
M1
<<
8
)
|
N1
);
nv_wr32
(
dev
,
reg
+
4
,
reg1
|
(
P
<<
16
)
|
(
M1
<<
8
)
|
N1
);
nv_wr32
(
dev
,
reg
+
8
,
N2
);
nv_wr32
(
dev
,
reg
+
8
,
N2
);
}
else
{
ret
=
nv50_calc_pll2
(
dev
,
&
pll
,
pclk
,
&
N1
,
&
N2
,
&
M1
,
&
P
);
if
(
ret
<=
0
)
return
0
;
NV_DEBUG
(
dev
,
"pclk %d out %d N %d fN 0x%04x M %d P %d
\n
"
,
pclk
,
ret
,
N1
,
N2
,
M1
,
P
);
nv_mask
(
dev
,
reg
+
0x0c
,
0x00000000
,
0x00000100
);
nv_wr32
(
dev
,
reg
+
0x04
,
(
P
<<
16
)
|
(
N1
<<
8
)
|
M1
);
nv_wr32
(
dev
,
reg
+
0x10
,
N2
<<
16
);
}
}
return
0
;
return
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