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
40e6815b
Commit
40e6815b
authored
May 03, 2016
by
Rob Clark
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/msm: fix leak in failed submit path
Signed-off-by:
Rob Clark
<
robdclark@gmail.com
>
parent
6860b56c
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
5 deletions
+13
-5
drivers/gpu/drm/msm/msm_drv.h
drivers/gpu/drm/msm/msm_drv.h
+1
-0
drivers/gpu/drm/msm/msm_gem_submit.c
drivers/gpu/drm/msm/msm_gem_submit.c
+11
-2
drivers/gpu/drm/msm/msm_gpu.c
drivers/gpu/drm/msm/msm_gpu.c
+1
-3
No files found.
drivers/gpu/drm/msm/msm_drv.h
View file @
40e6815b
...
...
@@ -161,6 +161,7 @@ int msm_atomic_commit(struct drm_device *dev,
int
msm_register_mmu
(
struct
drm_device
*
dev
,
struct
msm_mmu
*
mmu
);
void
msm_gem_submit_free
(
struct
msm_gem_submit
*
submit
);
int
msm_ioctl_gem_submit
(
struct
drm_device
*
dev
,
void
*
data
,
struct
drm_file
*
file
);
...
...
drivers/gpu/drm/msm/msm_gem_submit.c
View file @
40e6815b
...
...
@@ -56,6 +56,13 @@ static struct msm_gem_submit *submit_create(struct drm_device *dev,
return
submit
;
}
void
msm_gem_submit_free
(
struct
msm_gem_submit
*
submit
)
{
fence_put
(
submit
->
fence
);
list_del
(
&
submit
->
node
);
kfree
(
submit
);
}
static
int
submit_lookup_objects
(
struct
msm_gem_submit
*
submit
,
struct
drm_msm_gem_submit
*
args
,
struct
drm_file
*
file
)
{
...
...
@@ -324,7 +331,7 @@ static int submit_reloc(struct msm_gem_submit *submit, struct msm_gem_object *ob
return
0
;
}
static
void
submit_cleanup
(
struct
msm_gem_submit
*
submit
,
bool
fail
)
static
void
submit_cleanup
(
struct
msm_gem_submit
*
submit
)
{
unsigned
i
;
...
...
@@ -448,7 +455,9 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *data,
args
->
fence
=
submit
->
fence
->
seqno
;
out:
submit_cleanup
(
submit
,
!!
ret
);
submit_cleanup
(
submit
);
if
(
ret
)
msm_gem_submit_free
(
submit
);
mutex_unlock
(
&
dev
->
struct_mutex
);
return
ret
;
}
drivers/gpu/drm/msm/msm_gpu.c
View file @
40e6815b
...
...
@@ -446,9 +446,7 @@ static void retire_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit)
drm_gem_object_unreference
(
&
msm_obj
->
base
);
}
fence_put
(
submit
->
fence
);
list_del
(
&
submit
->
node
);
kfree
(
submit
);
msm_gem_submit_free
(
submit
);
}
static
void
retire_submits
(
struct
msm_gpu
*
gpu
)
...
...
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