drm: Branch 'master' - 5 commits

 amdgpu/Makefile.sources          |    1 +
 configure.ac                     |    2 +-
 freedreno/freedreno-symbol-check |    1 +
 intel/Makefile.sources           |    3 ++-
 intel/intel_bufmgr_gem.c         |   30 +++++++++++++++++++++++++++++-
 5 files changed, 34 insertions(+), 3 deletions(-)

New commits:
commit 8cf431271a8ad33c35859da2fb0387e6bccecd44
Author: Matt Turner <[email protected]>
Date:   Mon Nov 14 10:34:47 2016 -0800

    Bump version for release

diff --git a/configure.ac b/configure.ac
index ac6b106..1c7a7fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
 
 AC_PREREQ([2.63])
 AC_INIT([libdrm],
-        [2.4.71],
+        [2.4.72],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=DRI],
         [libdrm])
 
commit b91bcbf6ab76c84a348b3e0bec0ee212e94a432a
Author: Matt Turner <[email protected]>
Date:   Mon Nov 14 10:23:17 2016 -0800

    freedreno: Add fd_ringbuffer_flush2 to symbol check.

diff --git a/freedreno/freedreno-symbol-check b/freedreno/freedreno-symbol-check
index 7b31a34..ad367fc 100755
--- a/freedreno/freedreno-symbol-check
+++ b/freedreno/freedreno-symbol-check
@@ -49,6 +49,7 @@ fd_ringbuffer_timestamp
 fd_ringmarker_del
 fd_ringmarker_dwords
 fd_ringmarker_flush
+fd_ringbuffer_flush2
 fd_ringmarker_mark
 fd_ringmarker_new
 EOF
commit 01db192f974ead239c7122c04ef83e2cc9a8db50
Author: Matt Turner <[email protected]>
Date:   Mon Nov 14 10:16:27 2016 -0800

    amdgpu: Add amdgpu_asic_id.h to Makefile.sources.

diff --git a/amdgpu/Makefile.sources b/amdgpu/Makefile.sources
index 0c0b9a9..487b9e0 100644
--- a/amdgpu/Makefile.sources
+++ b/amdgpu/Makefile.sources
@@ -1,4 +1,5 @@
 LIBDRM_AMDGPU_FILES := \
+	amdgpu_asic_id.h \
 	amdgpu_bo.c \
 	amdgpu_cs.c \
 	amdgpu_device.c \
commit 51002c0440b0e410efa3845f2633826aad7f3aa3
Author: Matt Turner <[email protected]>
Date:   Mon Nov 14 10:13:22 2016 -0800

    intel: Add uthash.h to Makefile.sources.

diff --git a/intel/Makefile.sources b/intel/Makefile.sources
index 7b2272c..6947ab7 100644
--- a/intel/Makefile.sources
+++ b/intel/Makefile.sources
@@ -6,7 +6,8 @@ LIBDRM_INTEL_FILES := \
 	intel_decode.c \
 	intel_chipset.h \
 	mm.c \
-	mm.h
+	mm.h \
+	uthash.h
 
 LIBDRM_INTEL_H_FILES := \
 	intel_bufmgr.h \
commit 319108f9475f0165c9b4885efc8cf3b7e042b7fb
Author: Neil Roberts <[email protected]>
Date:   Mon Nov 9 16:27:52 2015 +0100

    intel: Allow some codenames in INTEL_DEVID_OVERRIDE
    
    As well as allowing a hexadecimal PCI ID number, the
    INTEL_DEVID_OVERRIDE environment variable can now contain one of a few
    short codenames. The codenames are stored in a small table to map them
    to a corresponding PCI ID. This makes it easier to use without having
    to look up the PCI IDs manually.
    
    The PCI IDs used are the same as those chosen for the -p option of
    run.c in shader-db but SKL has been added as well.
    
    Reviewed-by: Matt Turner <[email protected]>

diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c
index 1792796..15c79b3 100644
--- a/intel/intel_bufmgr_gem.c
+++ b/intel/intel_bufmgr_gem.c
@@ -3060,6 +3060,34 @@ drm_intel_bufmgr_gem_set_vma_cache_size(drm_intel_bufmgr *bufmgr, int limit)
 	drm_intel_gem_bo_purge_vma_cache(bufmgr_gem);
 }
 
+static int
+parse_devid_override(const char *devid_override)
+{
+	static const struct {
+		const char *name;
+		int pci_id;
+	} name_map[] = {
+		{ "brw", PCI_CHIP_I965_GM },
+		{ "g4x", PCI_CHIP_GM45_GM },
+		{ "ilk", PCI_CHIP_ILD_G },
+		{ "snb", PCI_CHIP_SANDYBRIDGE_M_GT2_PLUS },
+		{ "ivb", PCI_CHIP_IVYBRIDGE_S_GT2 },
+		{ "hsw", PCI_CHIP_HASWELL_CRW_E_GT3 },
+		{ "byt", PCI_CHIP_VALLEYVIEW_3 },
+		{ "bdw", 0x1620 | BDW_ULX },
+		{ "skl", PCI_CHIP_SKYLAKE_DT_GT2 },
+		{ "kbl", PCI_CHIP_KABYLAKE_DT_GT2 },
+	};
+	unsigned int i;
+
+	for (i = 0; i < ARRAY_SIZE(name_map); i++) {
+		if (!strcmp(name_map[i].name, devid_override))
+			return name_map[i].pci_id;
+	}
+
+	return strtod(devid_override, NULL);
+}
+
 /**
  * Get the PCI ID for the device.  This can be overridden by setting the
  * INTEL_DEVID_OVERRIDE environment variable to the desired ID.
@@ -3076,7 +3104,7 @@ get_pci_device_id(drm_intel_bufmgr_gem *bufmgr_gem)
 		devid_override = getenv("INTEL_DEVID_OVERRIDE");
 		if (devid_override) {
 			bufmgr_gem->no_exec = true;
-			return strtod(devid_override, NULL);
+			return parse_devid_override(devid_override);
 		}
 	}
 

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