drm: Branch 'master'

 intel/intel_chipset.h |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 68da7812fc8f859afa7f202f832c72a35c8d4a1d
Author: Rodrigo Vivi <[email protected]>
Date:   Fri Jun 30 14:24:55 2017 -0700

    intel/intel_chipset: Move IS_9XX below IS_GEN10.
    
    No functional change. Just organizing the code
    so it gets clear for future platforms.
    
    Paulo deserves credits becuase he was the one
    that just noticed this IS_9XX was in the wrong position
    after CNL patches got introduced.
    
    Cc: Paulo Zanoni <[email protected]>
    Signed-off-by: Rodrigo Vivi <[email protected]>

diff --git a/intel/intel_chipset.h b/intel/intel_chipset.h
index 770d21f0..3ff59ada 100644
--- a/intel/intel_chipset.h
+++ b/intel/intel_chipset.h
@@ -499,15 +499,6 @@
 				 IS_GEMINILAKE(devid) || \
 				 IS_COFFEELAKE(devid))
 
-#define IS_9XX(dev)		(IS_GEN3(dev) || \
-				 IS_GEN4(dev) || \
-				 IS_GEN5(dev) || \
-				 IS_GEN6(dev) || \
-				 IS_GEN7(dev) || \
-				 IS_GEN8(dev) || \
-				 IS_GEN9(dev) || \
-				 IS_GEN10(dev))
-
 #define IS_CNL_Y(devid)		((devid) == PCI_CHIP_CANNONLAKE_Y_GT2_0 || \
 				 (devid) == PCI_CHIP_CANNONLAKE_Y_GT2_1 || \
 				 (devid) == PCI_CHIP_CANNONLAKE_Y_GT2_2 || \
@@ -525,4 +516,13 @@
 
 #define IS_GEN10(devid)		(IS_CANNONLAKE(devid))
 
+#define IS_9XX(dev)		(IS_GEN3(dev) || \
+				 IS_GEN4(dev) || \
+				 IS_GEN5(dev) || \
+				 IS_GEN6(dev) || \
+				 IS_GEN7(dev) || \
+				 IS_GEN8(dev) || \
+				 IS_GEN9(dev) || \
+				 IS_GEN10(dev))
+
 #endif /* _INTEL_CHIPSET_H */

------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
--