Merge tag 'drm-msm-next-2021-06-23b' of https://gitlab.freedesktop.org/drm/msm into drm-next

* devcoredump support for display errors * dpu: irq cleanup/refactor * dpu: dt bindings conversion to yaml * dsi: dt bindings conversion to yaml * mdp5: alpha/blend_mode/zpos support * a6xx: cached coherent buffer support * a660 support * gpu iova fault improvements: - info about which block triggered the fault, etc - generation of gpu devcoredump on fault * assortment of other cleanups and fixes

Dave Airlie committed 5 years ago

Commit 334200b2 parents 61c0cb8 e88bbc9133 files · +7203 −6274Browse files

Showing the changes to include/uapi (1 of 133 files). Show all

Unified · Split

include/uapi/drm/msm_drm.h+3−4

@@ -94,13 +94,12 @@ struct drm_msm_param { · 93 unmodified lines
94	94	/* cache modes */
95	95	#define MSM_BO_CACHED 0x00010000
96	96	#define MSM_BO_WC 0x00020000
97		−#define MSM_BO_UNCACHED 0x00040000
	97	+#define MSM_BO_UNCACHED 0x00040000 /* deprecated, use MSM_BO_WC */
	98	+#define MSM_BO_CACHED_COHERENT 0x080000
98	99
99	100	#define MSM_BO_FLAGS (MSM_BO_SCANOUT \| \
100	101	MSM_BO_GPU_READONLY \| \
101		− MSM_BO_CACHED \| \
102		− MSM_BO_WC \| \
103		− MSM_BO_UNCACHED)
	102	+ MSM_BO_CACHE_MASK)
104	103
105	104	struct drm_msm_gem_new {
106	105	__u64 size; /* in */