drm: Branch 'master'

 intel/intel_bufmgr_gem.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 44f220ad6200dbccebea2287b874fda7665efe4d
Author: Dongwon Kim <[email protected]>
Date:   Fri Jan 13 16:07:00 2017 -0800

    intel: update global_name before HASH_ADD
    
    bo->global_name should be updated first before a hash value
    for the entry is calculated with it by HASH_ADD macro.
    
    Signed-off-by: Dongwon Kim <[email protected]>
    Signed-off-by: Chris Wilson <[email protected]>

diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c
index 75949b9..c47cb9b 100644
--- a/intel/intel_bufmgr_gem.c
+++ b/intel/intel_bufmgr_gem.c
@@ -2736,11 +2736,12 @@ drm_intel_gem_bo_flink(drm_intel_bo *bo, uint32_t * name)
 
 		pthread_mutex_lock(&bufmgr_gem->lock);
 		if (!bo_gem->global_name) {
+			bo_gem->global_name = flink.name;
+			bo_gem->reusable = false;
+
 			HASH_ADD(name_hh, bufmgr_gem->name_table,
 				 global_name, sizeof(bo_gem->global_name),
 				 bo_gem);
-			bo_gem->global_name = flink.name;
-			bo_gem->reusable = false;
 		}
 		pthread_mutex_unlock(&bufmgr_gem->lock);
 	}

------------------------------------------------------------------------------
Developer Access Program for Intel Xeon Phi Processors
Access to Intel Xeon Phi processor-based developer platforms.
With one year of Intel Parallel Studio XE.
Training and support from Colfax.
Order your platform today. http://sdm.link/xeonphi
--