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
0713b451
Commit
0713b451
authored
Jul 01, 2014
by
Ben Skeggs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/nouveau/dp: fix required link bandwidth calculations
Signed-off-by:
Ben Skeggs
<
bskeggs@redhat.com
>
parent
028791bb
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
9 deletions
+11
-9
drivers/gpu/drm/nouveau/core/engine/disp/nv50.c
drivers/gpu/drm/nouveau/core/engine/disp/nv50.c
+3
-3
drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c
drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c
+3
-3
drivers/gpu/drm/nouveau/core/engine/disp/outpdp.c
drivers/gpu/drm/nouveau/core/engine/disp/outpdp.c
+5
-3
No files found.
drivers/gpu/drm/nouveau/core/engine/disp/nv50.c
View file @
0713b451
...
...
@@ -1516,11 +1516,11 @@ nv50_disp_intr_unk20_2(struct nv50_disp_priv *priv, int head)
}
switch
((
ctrl
&
0x000f0000
)
>>
16
)
{
case
6
:
datarate
=
pclk
*
30
/
8
;
break
;
case
5
:
datarate
=
pclk
*
24
/
8
;
break
;
case
6
:
datarate
=
pclk
*
30
;
break
;
case
5
:
datarate
=
pclk
*
24
;
break
;
case
2
:
default:
datarate
=
pclk
*
18
/
8
;
datarate
=
pclk
*
18
;
break
;
}
...
...
drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c
View file @
0713b451
...
...
@@ -1159,11 +1159,11 @@ nvd0_disp_intr_unk2_2(struct nv50_disp_priv *priv, int head)
if
(
outp
->
info
.
type
==
DCB_OUTPUT_DP
)
{
u32
sync
=
nv_rd32
(
priv
,
0x660404
+
(
head
*
0x300
));
switch
((
sync
&
0x000003c0
)
>>
6
)
{
case
6
:
pclk
=
pclk
*
30
/
8
;
break
;
case
5
:
pclk
=
pclk
*
24
/
8
;
break
;
case
6
:
pclk
=
pclk
*
30
;
break
;
case
5
:
pclk
=
pclk
*
24
;
break
;
case
2
:
default:
pclk
=
pclk
*
18
/
8
;
pclk
=
pclk
*
18
;
break
;
}
...
...
drivers/gpu/drm/nouveau/core/engine/disp/outpdp.c
View file @
0713b451
...
...
@@ -34,7 +34,7 @@ nvkm_output_dp_train(struct nvkm_output *base, u32 datarate, bool wait)
struct
nvkm_output_dp
*
outp
=
(
void
*
)
base
;
bool
retrain
=
true
;
u8
link
[
2
],
stat
[
3
];
u32
rate
;
u32
link
rate
;
int
ret
,
i
;
/* check that the link is trained at a high enough rate */
...
...
@@ -44,8 +44,10 @@ nvkm_output_dp_train(struct nvkm_output *base, u32 datarate, bool wait)
goto
done
;
}
rate
=
link
[
0
]
*
27000
*
(
link
[
1
]
&
DPCD_LC01_LANE_COUNT_SET
);
if
(
rate
<
((
datarate
/
8
)
*
10
))
{
linkrate
=
link
[
0
]
*
27000
*
(
link
[
1
]
&
DPCD_LC01_LANE_COUNT_SET
);
linkrate
=
(
linkrate
*
8
)
/
10
;
/* 8B/10B coding overhead */
datarate
=
(
datarate
+
9
)
/
10
;
/* -> decakilobits */
if
(
linkrate
<
datarate
)
{
DBG
(
"link not trained at sufficient rate
\n
"
);
goto
done
;
}
...
...
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