drm: Branch 'master'

 intel/intel_chipset.c |    4 ++--
 intel/intel_chipset.h |    5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 473e2d2e67fec52503fe02b7a0ca26c4cd8fdbb6
Author: Emil Velikov <[email protected]>
Date:   Thu Sep 6 16:14:07 2018 +0100

    intel: annotate the intel genx helpers as private
    
    They're used internally and never meant to be part of the API.
    Add the drm_private notation, which should resolve that.
    
    v2: (Rodrigo) Add missing include.
    v3: (Rodrigo) Keep includes grouped per Eric suggestion.
    
    Cc: Eric Engestrom <[email protected]>
    Cc: Lucas De Marchi <[email protected]>
    Cc: Chris Wilson <[email protected]>
    Cc: Rodrigo Vivi <[email protected]>
    Fixes: 4e81d4f9c9b ("intel: add generic functions to check PCI ID")
    Signed-off-by: Emil Velikov <[email protected]>
    Acked-by: Lucas De Marchi <[email protected]>
    Signed-off-by: Rodrigo Vivi <[email protected]>
    Reviewed-by: Eric Engestrom <[email protected]>

diff --git a/intel/intel_chipset.c b/intel/intel_chipset.c
index d5c33cc5..5aa4a2f2 100644
--- a/intel/intel_chipset.c
+++ b/intel/intel_chipset.c
@@ -44,7 +44,7 @@ static const struct pci_device {
 	INTEL_SKL_IDS(9),
 };
 
-bool intel_is_genx(unsigned int devid, int gen)
+drm_private bool intel_is_genx(unsigned int devid, int gen)
 {
 	const struct pci_device *p,
 		  *pend = pciids + sizeof(pciids) / sizeof(pciids[0]);
@@ -66,7 +66,7 @@ bool intel_is_genx(unsigned int devid, int gen)
 	return false;
 }
 
-bool intel_get_genx(unsigned int devid, int *gen)
+drm_private bool intel_get_genx(unsigned int devid, int *gen)
 {
 	const struct pci_device *p,
 		  *pend = pciids + sizeof(pciids) / sizeof(pciids[0]);
diff --git a/intel/intel_chipset.h b/intel/intel_chipset.h
index 9b1e64f1..5db207cc 100644
--- a/intel/intel_chipset.h
+++ b/intel/intel_chipset.h
@@ -329,9 +329,10 @@
 
 /* New platforms use kernel pci ids */
 #include <stdbool.h>
+#include <libdrm_macros.h>
 
-bool intel_is_genx(unsigned int devid, int gen);
-bool intel_get_genx(unsigned int devid, int *gen);
+drm_private bool intel_is_genx(unsigned int devid, int gen);
+drm_private 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)


--