drm: Branch 'master'

 include/drm/amdgpu_drm.h |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 4462303700fd982eb5fdd266ee04d0543f4f6bf0
Author: Flora Cui <[email protected]>
Date:   Fri Jul 22 11:56:52 2016 +0800

    amdgpu: expose the AMDGPU_GEM_CREATE_VRAM_CLEARED flag
    
    With this flag specified, VRAM buffer will be cleared at
    allocation time.
    
    Signed-off-by: Flora Cui <[email protected]>
    Reviewed-by: Alexandre Demers <[email protected]>

diff --git a/include/drm/amdgpu_drm.h b/include/drm/amdgpu_drm.h
index fbdd118..d43895e 100644
--- a/include/drm/amdgpu_drm.h
+++ b/include/drm/amdgpu_drm.h
@@ -73,6 +73,8 @@
 #define AMDGPU_GEM_CREATE_NO_CPU_ACCESS		(1 << 1)
 /* Flag that USWC attributes should be used for GTT */
 #define AMDGPU_GEM_CREATE_CPU_GTT_USWC		(1 << 2)
+/* Flag that the memory should be in VRAM and cleared */
+#define AMDGPU_GEM_CREATE_VRAM_CLEARED		(1 << 3)
 
 struct drm_amdgpu_gem_create_in  {
 	/** the requested memory size */

------------------------------------------------------------------------------
--