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
55252da1
Commit
55252da1
authored
Mar 11, 2016
by
Ben Skeggs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/nouveau/fifo/gk104: identify fault-recovery members more clearly
Signed-off-by:
Ben Skeggs
<
bskeggs@redhat.com
>
parent
6d39b83f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
10 deletions
+12
-10
drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c
drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c
+8
-8
drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.h
drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.h
+4
-2
No files found.
drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c
View file @
55252da1
...
...
@@ -109,9 +109,9 @@ gk104_fifo_engine(struct gk104_fifo *fifo, u32 engn)
}
static
void
gk104_fifo_recover_work
(
struct
work_struct
*
w
ork
)
gk104_fifo_recover_work
(
struct
work_struct
*
w
)
{
struct
gk104_fifo
*
fifo
=
container_of
(
w
ork
,
typeof
(
*
fifo
),
fault
);
struct
gk104_fifo
*
fifo
=
container_of
(
w
,
typeof
(
*
fifo
),
recover
.
work
);
struct
nvkm_device
*
device
=
fifo
->
base
.
engine
.
subdev
.
device
;
struct
nvkm_engine
*
engine
;
unsigned
long
flags
;
...
...
@@ -119,8 +119,8 @@ gk104_fifo_recover_work(struct work_struct *work)
u64
mask
,
todo
;
spin_lock_irqsave
(
&
fifo
->
base
.
lock
,
flags
);
mask
=
fifo
->
mask
;
fifo
->
mask
=
0ULL
;
mask
=
fifo
->
recover
.
mask
;
fifo
->
recover
.
mask
=
0ULL
;
spin_unlock_irqrestore
(
&
fifo
->
base
.
lock
,
flags
);
for
(
todo
=
mask
;
engn
=
__ffs64
(
todo
),
todo
;
todo
&=
~
(
1
<<
engn
))
...
...
@@ -155,8 +155,8 @@ gk104_fifo_recover(struct gk104_fifo *fifo, struct nvkm_engine *engine,
list_del_init
(
&
chan
->
head
);
chan
->
killed
=
true
;
fifo
->
mask
|=
1ULL
<<
engine
->
subdev
.
index
;
schedule_work
(
&
fifo
->
fault
);
fifo
->
recover
.
mask
|=
1ULL
<<
engine
->
subdev
.
index
;
schedule_work
(
&
fifo
->
recover
.
work
);
}
static
const
struct
nvkm_enum
...
...
@@ -651,7 +651,7 @@ gk104_fifo_fini(struct nvkm_fifo *base)
{
struct
gk104_fifo
*
fifo
=
gk104_fifo
(
base
);
struct
nvkm_device
*
device
=
fifo
->
base
.
engine
.
subdev
.
device
;
flush_work
(
&
fifo
->
fault
);
flush_work
(
&
fifo
->
recover
.
work
);
/* allow mmu fault interrupts, even when we're not using fifo */
nvkm_mask
(
device
,
0x002140
,
0x10000000
,
0x10000000
);
}
...
...
@@ -755,7 +755,7 @@ gk104_fifo_new_(const struct nvkm_fifo_func *func, struct nvkm_device *device,
if
(
!
(
fifo
=
kzalloc
(
sizeof
(
*
fifo
),
GFP_KERNEL
)))
return
-
ENOMEM
;
INIT_WORK
(
&
fifo
->
fault
,
gk104_fifo_recover_work
);
INIT_WORK
(
&
fifo
->
recover
.
work
,
gk104_fifo_recover_work
);
*
pfifo
=
&
fifo
->
base
;
return
nvkm_fifo_ctor
(
func
,
device
,
index
,
nr
,
&
fifo
->
base
);
...
...
drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.h
View file @
55252da1
...
...
@@ -16,8 +16,10 @@ struct gk104_fifo_engn {
struct
gk104_fifo
{
struct
nvkm_fifo
base
;
struct
work_struct
fault
;
u64
mask
;
struct
{
struct
work_struct
work
;
u64
mask
;
}
recover
;
int
pbdma_nr
;
...
...
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