Merge remote-tracking branch 'origin/master' into marshmallow-x86

diff --git a/intel/Android.mk b/intel/Android.mk
index 838a93b..76fbcdd 100644 (file)
--- a/intel/Android.mk
+++ b/intel/Android.mk
@@ -31,13 +31,13 @@ LOCAL_MODULE := libdrm_intel
 LOCAL_MODULE_TAGS := optional
 
 LOCAL_SRC_FILES := $(patsubst %.h, , $(LIBDRM_INTEL_FILES))
+
+LOCAL_SHARED_LIBRARIES := libdrm
+LOCAL_STATIC_LIBRARIES := libpciaccess
+
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
 
 LOCAL_CFLAGS := \
        -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1
 
-LOCAL_SHARED_LIBRARIES := \
-       libdrm \
-       libpciaccess
-
 include $(BUILD_SHARED_LIBRARY)

diff --git a/intel/intel_chipset.h b/intel/intel_chipset.h
index 41fc0da..91b1794 100644 (file)
--- a/intel/intel_chipset.h
+++ b/intel/intel_chipset.h
@@ -159,6 +159,8 @@
 #define PCI_CHIP_VALLEYVIEW_1          0x0f31
 #define PCI_CHIP_VALLEYVIEW_2          0x0f32
 #define PCI_CHIP_VALLEYVIEW_3          0x0f33
+#define PCI_CHIP_VALLEYVIEW_M          0x0157
+#define PCI_CHIP_VALLEYVIEW_D          0x0155
 
 #define PCI_CHIP_CHERRYVIEW_0          0x22b0
 #define PCI_CHIP_CHERRYVIEW_1          0x22b1
@@ -294,6 +296,8 @@
                                 (devid) == PCI_CHIP_IVYBRIDGE_S_GT2)
 
 #define IS_VALLEYVIEW(devid)   ((devid) == PCI_CHIP_VALLEYVIEW_PO || \
+                                (devid) == PCI_CHIP_VALLEYVIEW_D || \
+                                (devid) == PCI_CHIP_VALLEYVIEW_M || \
                                 (devid) == PCI_CHIP_VALLEYVIEW_1 || \
                                 (devid) == PCI_CHIP_VALLEYVIEW_2 || \
                                 (devid) == PCI_CHIP_VALLEYVIEW_3)