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
af696a61
Commit
af696a61
authored
Jan 15, 2020
by
Ben Skeggs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/nouveau/flcn: reset sec2/gsp falcons harder
Signed-off-by:
Ben Skeggs
<
bskeggs@redhat.com
>
parent
b826f48a
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
2 deletions
+13
-2
drivers/gpu/drm/nouveau/include/nvkm/core/falcon.h
drivers/gpu/drm/nouveau/include/nvkm/core/falcon.h
+1
-0
drivers/gpu/drm/nouveau/include/nvkm/engine/falcon.h
drivers/gpu/drm/nouveau/include/nvkm/engine/falcon.h
+1
-0
drivers/gpu/drm/nouveau/nvkm/engine/sec2/gp102.c
drivers/gpu/drm/nouveau/nvkm/engine/sec2/gp102.c
+10
-1
drivers/gpu/drm/nouveau/nvkm/subdev/gsp/gv100.c
drivers/gpu/drm/nouveau/nvkm/subdev/gsp/gv100.c
+1
-1
No files found.
drivers/gpu/drm/nouveau/include/nvkm/core/falcon.h
View file @
af696a61
...
...
@@ -19,4 +19,5 @@ int nvkm_falcon_v1_enable(struct nvkm_falcon *);
void
nvkm_falcon_v1_disable
(
struct
nvkm_falcon
*
);
void
gp102_sec2_flcn_bind_context
(
struct
nvkm_falcon
*
,
struct
nvkm_memory
*
);
int
gp102_sec2_flcn_enable
(
struct
nvkm_falcon
*
);
#endif
drivers/gpu/drm/nouveau/include/nvkm/engine/falcon.h
View file @
af696a61
...
...
@@ -92,6 +92,7 @@ struct nvkm_falcon_func {
void
(
*
start
)(
struct
nvkm_falcon
*
);
int
(
*
enable
)(
struct
nvkm_falcon
*
falcon
);
void
(
*
disable
)(
struct
nvkm_falcon
*
falcon
);
int
(
*
reset
)(
struct
nvkm_falcon
*
);
struct
{
u32
head
;
...
...
drivers/gpu/drm/nouveau/nvkm/engine/sec2/gp102.c
View file @
af696a61
...
...
@@ -47,6 +47,15 @@ gp102_sec2_intr(struct nvkm_sec2 *sec2)
}
}
int
gp102_sec2_flcn_enable
(
struct
nvkm_falcon
*
falcon
)
{
nvkm_falcon_mask
(
falcon
,
0x3c0
,
0x00000001
,
0x00000001
);
udelay
(
10
);
nvkm_falcon_mask
(
falcon
,
0x3c0
,
0x00000001
,
0x00000000
);
return
nvkm_falcon_v1_enable
(
falcon
);
}
void
gp102_sec2_flcn_bind_context
(
struct
nvkm_falcon
*
falcon
,
struct
nvkm_memory
*
ctx
)
...
...
@@ -99,7 +108,7 @@ gp102_sec2_flcn = {
.
clear_interrupt
=
nvkm_falcon_v1_clear_interrupt
,
.
set_start_addr
=
nvkm_falcon_v1_set_start_addr
,
.
start
=
nvkm_falcon_v1_start
,
.
enable
=
nvkm_falcon_v1
_enable
,
.
enable
=
gp102_sec2_flcn
_enable
,
.
disable
=
nvkm_falcon_v1_disable
,
.
cmdq
=
{
0xa00
,
0xa04
,
8
},
.
msgq
=
{
0xa30
,
0xa34
,
8
},
...
...
drivers/gpu/drm/nouveau/nvkm/subdev/gsp/gv100.c
View file @
af696a61
...
...
@@ -32,7 +32,7 @@ gv100_gsp_flcn = {
.
clear_interrupt
=
nvkm_falcon_v1_clear_interrupt
,
.
set_start_addr
=
nvkm_falcon_v1_set_start_addr
,
.
start
=
nvkm_falcon_v1_start
,
.
enable
=
nvkm_falcon_v1
_enable
,
.
enable
=
gp102_sec2_flcn
_enable
,
.
disable
=
nvkm_falcon_v1_disable
,
};
...
...
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