Merge tag libdrm-2.4.100 into q-x86

[android-x86/external-libdrm.git] / intel / intel_chipset.h

diff --git a/intel/intel_chipset.h b/intel/intel_chipset.h
index 0a48e0d..b397d02 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
@@ -241,6 +243,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)
@@ -331,8 +335,8 @@
 #include <stdbool.h>
 #include <libdrm_macros.h>
 
-drm_private bool intel_is_genx(unsigned int devid, int gen);
-drm_private bool intel_get_genx(unsigned int devid, int *gen);
+drm_public bool intel_is_genx(unsigned int devid, int gen);
+drm_public bool intel_get_genx(unsigned int devid, int *gen);
 
 #define IS_GEN9(devid) intel_is_genx(devid, 9)
 #define IS_GEN10(devid) intel_is_genx(devid, 10)