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
3607bfd3
Commit
3607bfd3
authored
May 19, 2017
by
Ben Skeggs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/nouveau/disp/nv50-: execute supervisor on its own workqueue
Signed-off-by:
Ben Skeggs
<
bskeggs@redhat.com
>
parent
7d0a01a6
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
3 deletions
+10
-3
drivers/gpu/drm/nouveau/nvkm/engine/disp/gf119.c
drivers/gpu/drm/nouveau/nvkm/engine/disp/gf119.c
+1
-1
drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c
drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c
+8
-2
drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.h
drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.h
+1
-0
No files found.
drivers/gpu/drm/nouveau/nvkm/engine/disp/gf119.c
View file @
3607bfd3
...
...
@@ -459,7 +459,7 @@ gf119_disp_intr(struct nv50_disp *disp)
u32
stat
=
nvkm_rd32
(
device
,
0x6100ac
);
if
(
stat
&
0x00000007
)
{
disp
->
super
=
(
stat
&
0x00000007
);
schedule_work
(
&
disp
->
supervisor
);
queue_work
(
disp
->
wq
,
&
disp
->
supervisor
);
nvkm_wr32
(
device
,
0x6100ac
,
disp
->
super
);
stat
&=
~
0x00000007
;
}
...
...
drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c
View file @
3607bfd3
...
...
@@ -111,6 +111,8 @@ nv50_disp_dtor_(struct nvkm_disp *base)
{
struct
nv50_disp
*
disp
=
nv50_disp
(
base
);
nvkm_event_fini
(
&
disp
->
uevent
);
if
(
disp
->
wq
)
destroy_workqueue
(
disp
->
wq
);
return
disp
;
}
...
...
@@ -136,7 +138,6 @@ nv50_disp_new_(const struct nv50_disp_func *func, struct nvkm_device *device,
if
(
!
(
disp
=
kzalloc
(
sizeof
(
*
disp
),
GFP_KERNEL
)))
return
-
ENOMEM
;
INIT_WORK
(
&
disp
->
supervisor
,
func
->
super
);
disp
->
func
=
func
;
*
pdisp
=
&
disp
->
base
;
...
...
@@ -144,6 +145,11 @@ nv50_disp_new_(const struct nv50_disp_func *func, struct nvkm_device *device,
if
(
ret
)
return
ret
;
disp
->
wq
=
create_singlethread_workqueue
(
"nvkm-disp"
);
if
(
!
disp
->
wq
)
return
-
ENOMEM
;
INIT_WORK
(
&
disp
->
supervisor
,
func
->
super
);
for
(
i
=
0
;
func
->
head
.
new
&&
i
<
heads
;
i
++
)
{
ret
=
func
->
head
.
new
(
&
disp
->
base
,
i
);
if
(
ret
)
...
...
@@ -803,7 +809,7 @@ nv50_disp_intr(struct nv50_disp *disp)
if
(
intr1
&
0x00000070
)
{
disp
->
super
=
(
intr1
&
0x00000070
);
schedule_work
(
&
disp
->
supervisor
);
queue_work
(
disp
->
wq
,
&
disp
->
supervisor
);
nvkm_wr32
(
device
,
0x610024
,
disp
->
super
);
}
}
...
...
drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.h
View file @
3607bfd3
...
...
@@ -12,6 +12,7 @@ struct nv50_disp {
const
struct
nv50_disp_func
*
func
;
struct
nvkm_disp
base
;
struct
workqueue_struct
*
wq
;
struct
work_struct
supervisor
;
u32
super
;
...
...
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