[Mesa-dev] [PATCH 3/5] i915: Remove (mostly) unused IS_PNV, IS_PNVG, and IS_PNVGM macros

Ian Romanick idr at freedesktop.org
Thu Mar 5 11:49:56 PST 2015


From: Ian Romanick <ian.d.romanick at intel.com>

Inspired by Damien's recent libdrm changes.

Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Cc: Damien Lespiau <damien.lespiau at intel.com>
---
 src/mesa/drivers/dri/i915/intel_chipset.h | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/mesa/drivers/dri/i915/intel_chipset.h b/src/mesa/drivers/dri/i915/intel_chipset.h
index f7c8b5d..cbcdb14 100644
--- a/src/mesa/drivers/dri/i915/intel_chipset.h
+++ b/src/mesa/drivers/dri/i915/intel_chipset.h
@@ -49,10 +49,6 @@
 #define PCI_CHIP_PNV_GM			0xA011
 #define PCI_CHIP_PNV_G			0xA001
 
-#define IS_PNVGM(devid)	(devid == PCI_CHIP_PNV_GM)
-#define IS_PNVG(devid)	(devid == PCI_CHIP_PNV_G)
-#define IS_PNV(devid) (IS_PNVG(devid) || IS_PNVGM(devid))
-
 #define IS_915(devid)		(devid == PCI_CHIP_I915_G || \
 				 devid == PCI_CHIP_E7221_G || \
 				 devid == PCI_CHIP_I915_GM)
@@ -62,7 +58,9 @@
 				 devid == PCI_CHIP_I945_GME || \
 				 devid == PCI_CHIP_G33_G || \
 				 devid == PCI_CHIP_Q33_G || \
-				 devid == PCI_CHIP_Q35_G || IS_PNV(devid))
+				 devid == PCI_CHIP_Q35_G || \
+				 devid == PCI_CHIP_PNV_G || \
+				 devid == PCI_CHIP_PNV_GM)
 
 #define IS_GEN3(devid)		(IS_915(devid) ||	\
 				 IS_945(devid))
-- 
2.1.0



More information about the mesa-dev mailing list