History

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

Jonathan Marek committed 5 years ago

Commit 9ef36441 parent d12e3392 files · +2 −4Browse files

Unified · Split

2 files
  1. drivers/gpu/drm/msm/msm_gem.c +1 −3
  2. include/uapi/drm/msm_drm.h +1 −1
drivers/gpu/drm/msm/msm_gem.c+1−3
@@ -213,10 +213,8 @@ void msm_gem_put_pages(struct drm_gem_object *obj) · 212 unmodified lines
213213
214214 static pgprot_t msm_gem_pgprot(struct msm_gem_object *msm_obj, pgprot_t prot)
215215 {
216− if (msm_obj->flags & MSM_BO_WC)
216+ if (msm_obj->flags & (MSM_BO_WC|MSM_BO_UNCACHED))
217217 return pgprot_writecombine(prot);
218− if (msm_obj->flags & MSM_BO_UNCACHED)
219− return pgprot_noncached(prot);
220218 return prot;
221219 }
222220
include/uapi/drm/msm_drm.h+1−1
@@ -94,7 +94,7 @@ struct drm_msm_param { · 93 unmodified lines
9494 /* cache modes */
9595 #define MSM_BO_CACHED 0x00010000
9696 #define MSM_BO_WC 0x00020000
97−#define MSM_BO_UNCACHED 0x00040000
97+#define MSM_BO_UNCACHED 0x00040000 /* deprecated, use MSM_BO_WC */
9898 #define MSM_BO_CACHED_COHERENT 0x080000
9999
100100 #define MSM_BO_FLAGS (MSM_BO_SCANOUT | \