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
1c4997fe
Commit
1c4997fe
authored
Jul 01, 2014
by
Rob Clark
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/msm: no mmu is only error if not using vram carveout
Signed-off-by:
Rob Clark
<
robdclark@gmail.com
>
parent
036c1708
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
8 deletions
+7
-8
drivers/gpu/drm/msm/msm_gem.c
drivers/gpu/drm/msm/msm_gem.c
+7
-8
No files found.
drivers/gpu/drm/msm/msm_gem.c
View file @
1c4997fe
...
...
@@ -278,24 +278,23 @@ int msm_gem_get_iova_locked(struct drm_gem_object *obj, int id,
uint32_t
*
iova
)
{
struct
msm_gem_object
*
msm_obj
=
to_msm_bo
(
obj
);
struct
drm_device
*
dev
=
obj
->
dev
;
int
ret
=
0
;
if
(
!
msm_obj
->
domain
[
id
].
iova
)
{
struct
msm_drm_private
*
priv
=
obj
->
dev
->
dev_private
;
struct
msm_mmu
*
mmu
=
priv
->
mmus
[
id
];
struct
page
**
pages
=
get_pages
(
obj
);
if
(
!
mmu
)
{
dev_err
(
dev
->
dev
,
"null MMU pointer
\n
"
);
return
-
EINVAL
;
}
if
(
IS_ERR
(
pages
))
return
PTR_ERR
(
pages
);
if
(
iommu_present
(
&
platform_bus_type
))
{
uint32_t
offset
=
(
uint32_t
)
mmap_offset
(
obj
);
struct
msm_mmu
*
mmu
=
priv
->
mmus
[
id
];
uint32_t
offset
;
if
(
WARN_ON
(
!
mmu
))
return
-
EINVAL
;
offset
=
(
uint32_t
)
mmap_offset
(
obj
);
ret
=
mmu
->
funcs
->
map
(
mmu
,
offset
,
msm_obj
->
sgt
,
obj
->
size
,
IOMMU_READ
|
IOMMU_WRITE
);
msm_obj
->
domain
[
id
].
iova
=
offset
;
...
...
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