Merge tag 'v5.3-rc3' into drm-next-5.4

Linux 5.3-rc3

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

1 files changed, 1 insertions, 3 deletions

diff --git a/include/uapi/drm/vmwgfx_drm.h b/include/uapi/drm/vmwgfx_drm.h
index 02cab33f2f25..399f58317cff 100644
--- a/include/uapi/drm/vmwgfx_drm.h
+++ b/include/uapi/drm/vmwgfx_drm.h
@@ -891,13 +891,11 @@ struct drm_vmw_shader_arg {
  *                                      surface.
  * @drm_vmw_surface_flag_create_buffer: Create a backup buffer if none is
  *                                      given.
- * @drm_vmw_surface_flag_coherent:      Back surface with coherent memory.
  */
 enum drm_vmw_surface_flags {
         drm_vmw_surface_flag_shareable = (1 << 0),
         drm_vmw_surface_flag_scanout = (1 << 1),
-        drm_vmw_surface_flag_create_buffer = (1 << 2),
-        drm_vmw_surface_flag_coherent = (1 << 3),
+        drm_vmw_surface_flag_create_buffer = (1 << 2)
 };
 
 /**