[PATCH i-g-t 01/10] lib: sync i915_pciids.h with kernel commit 432ed92bfb55

[Jani Nikula]

Synchronize i915_pciids.h with kernel commit:

432ed92bfb55 ("drm/i915/pciids: add INTEL_PNV_IDS(), use acronym")

and update the references in intel_device_info.c.

Signed-off-by: Jani Nikula <jani.nikula at intel.com>
---
 lib/i915_pciids.h       | 8 ++++++--
 lib/intel_device_info.c | 4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib/i915_pciids.h b/lib/i915_pciids.h
index 85ce33ad6e26..21942a3c823b 100644
--- a/lib/i915_pciids.h
+++ b/lib/i915_pciids.h
@@ -108,12 +108,16 @@
 	INTEL_VGA_DEVICE(0x2e42, info), /* B43_G */ \
 	INTEL_VGA_DEVICE(0x2e92, info)	/* B43_G.1 */
 
-#define INTEL_PINEVIEW_G_IDS(info) \
+#define INTEL_PNV_G_IDS(info) \
 	INTEL_VGA_DEVICE(0xa001, info)
 
-#define INTEL_PINEVIEW_M_IDS(info) \
+#define INTEL_PNV_M_IDS(info) \
 	INTEL_VGA_DEVICE(0xa011, info)
 
+#define INTEL_PNV_IDS(info) \
+	INTEL_PNV_G_IDS(info), \
+	INTEL_PNV_M_IDS(info)
+
 #define INTEL_IRONLAKE_D_IDS(info) \
 	INTEL_VGA_DEVICE(0x0042, info)
 
diff --git a/lib/intel_device_info.c b/lib/intel_device_info.c
index 64b5246b7783..88b160ae2d69 100644
--- a/lib/intel_device_info.c
+++ b/lib/intel_device_info.c
@@ -530,8 +530,8 @@ static const struct pci_id_match intel_device_match[] = {
 	INTEL_I945GM_IDS(&intel_i945m_info),
 
 	INTEL_G33_IDS(&intel_g33_info),
-	INTEL_PINEVIEW_G_IDS(&intel_pineview_g_info),
-	INTEL_PINEVIEW_M_IDS(&intel_pineview_m_info),
+	INTEL_PNV_G_IDS(&intel_pineview_g_info),
+	INTEL_PNV_M_IDS(&intel_pineview_m_info),
 
 	INTEL_I965G_IDS(&intel_i965_info),
 	INTEL_I965GM_IDS(&intel_i965m_info),
-- 
2.39.2