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
35c33670
Commit
35c33670
authored
Nov 14, 2013
by
Ben Skeggs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/nouveau/pwr: fix missing mutex unlock in a failure path
Signed-off-by:
Ben Skeggs
<
bskeggs@redhat.com
>
parent
09dacc7b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
drivers/gpu/drm/nouveau/core/subdev/pwr/base.c
drivers/gpu/drm/nouveau/core/subdev/pwr/base.c
+5
-5
No files found.
drivers/gpu/drm/nouveau/core/subdev/pwr/base.c
View file @
35c33670
...
@@ -32,6 +32,11 @@ nouveau_pwr_send(struct nouveau_pwr *ppwr, u32 reply[2],
...
@@ -32,6 +32,11 @@ nouveau_pwr_send(struct nouveau_pwr *ppwr, u32 reply[2],
struct
nouveau_subdev
*
subdev
=
nv_subdev
(
ppwr
);
struct
nouveau_subdev
*
subdev
=
nv_subdev
(
ppwr
);
u32
addr
;
u32
addr
;
/* wait for a free slot in the fifo */
addr
=
nv_rd32
(
ppwr
,
0x10a4a0
);
if
(
!
nv_wait_ne
(
ppwr
,
0x10a4b0
,
0xffffffff
,
addr
^
8
))
return
-
EBUSY
;
/* we currently only support a single process at a time waiting
/* we currently only support a single process at a time waiting
* on a synchronous reply, take the PPWR mutex and tell the
* on a synchronous reply, take the PPWR mutex and tell the
* receive handler what we're waiting for
* receive handler what we're waiting for
...
@@ -42,11 +47,6 @@ nouveau_pwr_send(struct nouveau_pwr *ppwr, u32 reply[2],
...
@@ -42,11 +47,6 @@ nouveau_pwr_send(struct nouveau_pwr *ppwr, u32 reply[2],
ppwr
->
recv
.
process
=
process
;
ppwr
->
recv
.
process
=
process
;
}
}
/* wait for a free slot in the fifo */
addr
=
nv_rd32
(
ppwr
,
0x10a4a0
);
if
(
!
nv_wait_ne
(
ppwr
,
0x10a4b0
,
0xffffffff
,
addr
^
8
))
return
-
EBUSY
;
/* acquire data segment access */
/* acquire data segment access */
do
{
do
{
nv_wr32
(
ppwr
,
0x10a580
,
0x00000001
);
nv_wr32
(
ppwr
,
0x10a580
,
0x00000001
);
...
...
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