summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/msm/msm_gem.c
diff options
context:
space:
mode:
authorJonathan Marek <jonathan@marek.ca>2021-04-23 15:08:21 -0400
committerRob Clark <robdclark@chromium.org>2021-06-23 07:32:14 -0700
commit9ef364432db4a11ff2dbee398d7ed06e93bdfe5e (patch)
treef60efa08b56feb018541d1f4850c05a5678fc9fb /drivers/gpu/drm/msm/msm_gem.c
parentd12e339044a00ecae993b06672c38c168a92f0c3 (diff)
downloadlinux-9ef364432db4a11ff2dbee398d7ed06e93bdfe5e.tar.bz2
drm/msm: deprecate MSM_BO_UNCACHED (map as writecombine instead)
There shouldn't be any reason to ever use uncached over writecombine, so just use writecombine for MSM_BO_UNCACHED. Note: userspace never used MSM_BO_UNCACHED anyway Signed-off-by: Jonathan Marek <jonathan@marek.ca> Acked-by: Jordan Crouse <jordan@cosmicpenguin.net> Link: https://lore.kernel.org/r/20210423190833.25319-6-jonathan@marek.ca Signed-off-by: Rob Clark <robdclark@chromium.org>
Diffstat (limited to 'drivers/gpu/drm/msm/msm_gem.c')
-rw-r--r--drivers/gpu/drm/msm/msm_gem.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c
index 8d19a0f289fd..1865919368f2 100644
--- a/drivers/gpu/drm/msm/msm_gem.c
+++ b/drivers/gpu/drm/msm/msm_gem.c
@@ -213,10 +213,8 @@ void msm_gem_put_pages(struct drm_gem_object *obj)
static pgprot_t msm_gem_pgprot(struct msm_gem_object *msm_obj, pgprot_t prot)
{
- if (msm_obj->flags & MSM_BO_WC)
+ if (msm_obj->flags & (MSM_BO_WC|MSM_BO_UNCACHED))
return pgprot_writecombine(prot);
- if (msm_obj->flags & MSM_BO_UNCACHED)
- return pgprot_noncached(prot);
return prot;
}