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

Linux 5.3-rc3 Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
2019-08-09 13:07:28 -05:00
parent 6ca523d7eb e21a712a96
commit 3f61fd41f3
16417 changed files with 552986 additions and 428292 deletions
@@ -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)
 };

 /**