Backmerge tag 'v4.7' into drm-next

Linux 4.7 As requested by Daniel Vetter as the conflicts were getting messy.
2016-07-26 17:26:29 +10:00
parent c11dea5b02 523d939ef9
commit 5e580523d9
555 changed files with 5374 additions and 3033 deletions
@@ -316,6 +316,20 @@ ttm_bo_reference(struct ttm_buffer_object *bo)
 */
 extern int ttm_bo_wait(struct ttm_buffer_object *bo,
 		       bool interruptible, bool no_wait);
+
+/**
+ * ttm_bo_mem_compat - Check if proposed placement is compatible with a bo
+ *
+ * @placement:  Return immediately if buffer is busy.
+ * @mem:  The struct ttm_mem_reg indicating the region where the bo resides
+ * @new_flags: Describes compatible placement found
+ *
+ * Returns true if the placement is compatible
+ */
+extern bool ttm_bo_mem_compat(struct ttm_placement *placement,
+			      struct ttm_mem_reg *mem,
+			      uint32_t *new_flags);
+
 /**
 * ttm_bo_validate
 *