Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
linux
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Martyn Welch
linux
Commits
bbc2cd07
Commit
bbc2cd07
authored
6 years ago
by
Rob Clark
Browse files
Options
Downloads
Patches
Plain Diff
drm/msm: honor GPU_READONLY flag
Signed-off-by:
Rob Clark
<
robdclark@gmail.com
>
parent
895ad6b0
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
drivers/gpu/drm/msm/msm_drv.h
+2
-1
2 additions, 1 deletion
drivers/gpu/drm/msm/msm_drv.h
drivers/gpu/drm/msm/msm_gem.c
+6
-2
6 additions, 2 deletions
drivers/gpu/drm/msm/msm_gem.c
drivers/gpu/drm/msm/msm_gem_vma.c
+3
-2
3 additions, 2 deletions
drivers/gpu/drm/msm/msm_gem_vma.c
with
11 additions
and
5 deletions
drivers/gpu/drm/msm/msm_drv.h
+
2
−
1
View file @
bbc2cd07
...
...
@@ -250,7 +250,8 @@ void msm_gem_purge_vma(struct msm_gem_address_space *aspace,
void
msm_gem_unmap_vma
(
struct
msm_gem_address_space
*
aspace
,
struct
msm_gem_vma
*
vma
);
int
msm_gem_map_vma
(
struct
msm_gem_address_space
*
aspace
,
struct
msm_gem_vma
*
vma
,
struct
sg_table
*
sgt
,
int
npages
);
struct
msm_gem_vma
*
vma
,
int
prot
,
struct
sg_table
*
sgt
,
int
npages
);
void
msm_gem_close_vma
(
struct
msm_gem_address_space
*
aspace
,
struct
msm_gem_vma
*
vma
);
...
...
This diff is collapsed.
Click to expand it.
drivers/gpu/drm/msm/msm_gem.c
+
6
−
2
View file @
bbc2cd07
...
...
@@ -391,6 +391,10 @@ static int msm_gem_pin_iova(struct drm_gem_object *obj,
struct
msm_gem_object
*
msm_obj
=
to_msm_bo
(
obj
);
struct
msm_gem_vma
*
vma
;
struct
page
**
pages
;
int
prot
=
IOMMU_READ
;
if
(
!
(
msm_obj
->
flags
&
MSM_BO_GPU_READONLY
))
prot
|=
IOMMU_WRITE
;
WARN_ON
(
!
mutex_is_locked
(
&
msm_obj
->
lock
));
...
...
@@ -405,8 +409,8 @@ static int msm_gem_pin_iova(struct drm_gem_object *obj,
if
(
IS_ERR
(
pages
))
return
PTR_ERR
(
pages
);
return
msm_gem_map_vma
(
aspace
,
vma
,
msm_obj
->
sg
t
,
obj
->
size
>>
PAGE_SHIFT
);
return
msm_gem_map_vma
(
aspace
,
vma
,
pro
t
,
msm_obj
->
sgt
,
obj
->
size
>>
PAGE_SHIFT
);
}
/* get iova and pin it. Should have a matching put */
...
...
This diff is collapsed.
Click to expand it.
drivers/gpu/drm/msm/msm_gem_vma.c
+
3
−
2
View file @
bbc2cd07
...
...
@@ -68,7 +68,8 @@ void msm_gem_unmap_vma(struct msm_gem_address_space *aspace,
int
msm_gem_map_vma
(
struct
msm_gem_address_space
*
aspace
,
struct
msm_gem_vma
*
vma
,
struct
sg_table
*
sgt
,
int
npages
)
struct
msm_gem_vma
*
vma
,
int
prot
,
struct
sg_table
*
sgt
,
int
npages
)
{
unsigned
size
=
npages
<<
PAGE_SHIFT
;
int
ret
=
0
;
...
...
@@ -86,7 +87,7 @@ msm_gem_map_vma(struct msm_gem_address_space *aspace,
if
(
aspace
->
mmu
)
ret
=
aspace
->
mmu
->
funcs
->
map
(
aspace
->
mmu
,
vma
->
iova
,
sgt
,
size
,
IOMMU_READ
|
IOMMU_WRITE
);
size
,
prot
);
if
(
ret
)
vma
->
mapped
=
false
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment