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
32a232c5
Commit
32a232c5
authored
May 19, 2017
by
Ben Skeggs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/nouveau/disp/dp: use new devinit script interpreter entry-point
Signed-off-by:
Ben Skeggs
<
bskeggs@redhat.com
>
parent
9648da5a
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
30 additions
and
38 deletions
+30
-38
drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.c
drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.c
+30
-38
No files found.
drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.c
View file @
32a232c5
...
@@ -222,14 +222,6 @@ nvkm_dp_train_links(struct nvkm_dp *dp)
...
@@ -222,14 +222,6 @@ nvkm_dp_train_links(struct nvkm_dp *dp)
struct
nvkm_disp
*
disp
=
dp
->
outp
.
disp
;
struct
nvkm_disp
*
disp
=
dp
->
outp
.
disp
;
struct
nvkm_subdev
*
subdev
=
&
disp
->
engine
.
subdev
;
struct
nvkm_subdev
*
subdev
=
&
disp
->
engine
.
subdev
;
struct
nvkm_bios
*
bios
=
subdev
->
device
->
bios
;
struct
nvkm_bios
*
bios
=
subdev
->
device
->
bios
;
struct
nvbios_init
init
=
{
.
subdev
=
subdev
,
.
bios
=
bios
,
.
offset
=
0x0000
,
.
outp
=
&
dp
->
outp
.
info
,
.
crtc
=
-
1
,
.
execute
=
1
,
};
struct
lt_state
lt
=
{
struct
lt_state
lt
=
{
.
dp
=
dp
,
.
dp
=
dp
,
};
};
...
@@ -250,14 +242,18 @@ nvkm_dp_train_links(struct nvkm_dp *dp)
...
@@ -250,14 +242,18 @@ nvkm_dp_train_links(struct nvkm_dp *dp)
if
(
dp
->
version
<
0x30
)
{
if
(
dp
->
version
<
0x30
)
{
while
((
ior
->
dp
.
bw
*
2700
)
<
nvbios_rd16
(
bios
,
lnkcmp
))
while
((
ior
->
dp
.
bw
*
2700
)
<
nvbios_rd16
(
bios
,
lnkcmp
))
lnkcmp
+=
4
;
lnkcmp
+=
4
;
init
.
offset
=
nvbios_rd16
(
bios
,
lnkcmp
+
2
);
lnkcmp
=
nvbios_rd16
(
bios
,
lnkcmp
+
2
);
}
else
{
}
else
{
while
(
ior
->
dp
.
bw
<
nvbios_rd08
(
bios
,
lnkcmp
))
while
(
ior
->
dp
.
bw
<
nvbios_rd08
(
bios
,
lnkcmp
))
lnkcmp
+=
3
;
lnkcmp
+=
3
;
init
.
offset
=
nvbios_rd16
(
bios
,
lnkcmp
+
1
);
lnkcmp
=
nvbios_rd16
(
bios
,
lnkcmp
+
1
);
}
}
nvbios_exec
(
&
init
);
nvbios_init
(
subdev
,
lnkcmp
,
init
.
outp
=
&
dp
->
outp
.
info
;
init
.
or
=
ior
->
id
;
init
.
link
=
ior
->
asy
.
link
;
);
}
}
ret
=
ior
->
func
->
dp
.
links
(
ior
,
dp
->
aux
);
ret
=
ior
->
func
->
dp
.
links
(
ior
,
dp
->
aux
);
...
@@ -293,42 +289,38 @@ nvkm_dp_train_links(struct nvkm_dp *dp)
...
@@ -293,42 +289,38 @@ nvkm_dp_train_links(struct nvkm_dp *dp)
static
void
static
void
nvkm_dp_train_fini
(
struct
nvkm_dp
*
dp
)
nvkm_dp_train_fini
(
struct
nvkm_dp
*
dp
)
{
{
struct
nvkm_subdev
*
subdev
=
&
dp
->
outp
.
disp
->
engine
.
subdev
;
struct
nvbios_init
init
=
{
.
subdev
=
subdev
,
.
bios
=
subdev
->
device
->
bios
,
.
outp
=
&
dp
->
outp
.
info
,
.
crtc
=
-
1
,
.
execute
=
1
,
};
/* Execute AfterLinkTraining script from DP Info table. */
/* Execute AfterLinkTraining script from DP Info table. */
init
.
offset
=
dp
->
info
.
script
[
1
],
nvbios_init
(
&
dp
->
outp
.
disp
->
engine
.
subdev
,
dp
->
info
.
script
[
1
],
nvbios_exec
(
&
init
);
init
.
outp
=
&
dp
->
outp
.
info
;
init
.
or
=
dp
->
outp
.
ior
->
id
;
init
.
link
=
dp
->
outp
.
ior
->
asy
.
link
;
);
}
}
static
void
static
void
nvkm_dp_train_init
(
struct
nvkm_dp
*
dp
)
nvkm_dp_train_init
(
struct
nvkm_dp
*
dp
)
{
{
struct
nvkm_subdev
*
subdev
=
&
dp
->
outp
.
disp
->
engine
.
subdev
;
struct
nvbios_init
init
=
{
.
subdev
=
subdev
,
.
bios
=
subdev
->
device
->
bios
,
.
outp
=
&
dp
->
outp
.
info
,
.
crtc
=
-
1
,
.
execute
=
1
,
};
/* Execute EnableSpread/DisableSpread script from DP Info table. */
/* Execute EnableSpread/DisableSpread script from DP Info table. */
if
(
dp
->
dpcd
[
DPCD_RC03
]
&
DPCD_RC03_MAX_DOWNSPREAD
)
if
(
dp
->
dpcd
[
DPCD_RC03
]
&
DPCD_RC03_MAX_DOWNSPREAD
)
{
init
.
offset
=
dp
->
info
.
script
[
2
];
nvbios_init
(
&
dp
->
outp
.
disp
->
engine
.
subdev
,
dp
->
info
.
script
[
2
],
else
init
.
outp
=
&
dp
->
outp
.
info
;
init
.
offset
=
dp
->
info
.
script
[
3
];
init
.
or
=
dp
->
outp
.
ior
->
id
;
nvbios_exec
(
&
init
);
init
.
link
=
dp
->
outp
.
ior
->
asy
.
link
;
);
}
else
{
nvbios_init
(
&
dp
->
outp
.
disp
->
engine
.
subdev
,
dp
->
info
.
script
[
3
],
init
.
outp
=
&
dp
->
outp
.
info
;
init
.
or
=
dp
->
outp
.
ior
->
id
;
init
.
link
=
dp
->
outp
.
ior
->
asy
.
link
;
);
}
/* Execute BeforeLinkTraining script from DP Info table. */
/* Execute BeforeLinkTraining script from DP Info table. */
init
.
offset
=
dp
->
info
.
script
[
0
];
nvbios_init
(
&
dp
->
outp
.
disp
->
engine
.
subdev
,
dp
->
info
.
script
[
0
],
nvbios_exec
(
&
init
);
init
.
outp
=
&
dp
->
outp
.
info
;
init
.
or
=
dp
->
outp
.
ior
->
id
;
init
.
link
=
dp
->
outp
.
ior
->
asy
.
link
;
);
}
}
static
const
struct
dp_rates
{
static
const
struct
dp_rates
{
...
...
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