[PATCH 1/2] drm/intel: Generalize PCI ID macro for subvendor and subid

[Werner Sembach]

Generalize INTEL_QUANTA_VGA_DEVICE macro by introducing a
INTEL_VGA_DEVICE_SUB macro that takes subvendor and subid in addition to
id.

Signed-off-by: Werner Sembach <wse@xxxxxxxxxxxxxxxxxxx>
---
 include/drm/intel/pciids.h | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/include/drm/intel/pciids.h b/include/drm/intel/pciids.h
index dff389b56eb3b..7a4a5658942d2 100644
--- a/include/drm/intel/pciids.h
+++ b/include/drm/intel/pciids.h
@@ -37,9 +37,8 @@
 	.driver_data = (kernel_ulong_t)(_info), \
 }
 
-#define INTEL_QUANTA_VGA_DEVICE(_info) { \
-	.vendor = PCI_VENDOR_ID_INTEL, .device = 0x16a, \
-	.subvendor = 0x152d, .subdevice = 0x8990, \
+#define INTEL_VGA_DEVICE_SUB(_id, _subvend, _subid, _info) { \
+	PCI_DEVICE_SUB(PCI_VENDOR_ID_INTEL, (_id), (_subvend), (_subid)), \
 	.class = PCI_BASE_CLASS_DISPLAY << 16, .class_mask = 0xff << 16, \
 	.driver_data = (kernel_ulong_t)(_info), \
 }
@@ -180,7 +179,7 @@
 	INTEL_IVB_D_IDS(MACRO__, ## __VA_ARGS__)
 
 #define INTEL_IVB_Q_IDS(MACRO__, ...) \
-	INTEL_QUANTA_VGA_DEVICE(__VA_ARGS__) /* Quanta transcode */
+	MACRO__##_SUB(0x016A, 0x152D, 0x8990, ## __VA_ARGS__) /* Quanta transcode */
 
 #define INTEL_HSW_ULT_GT1_IDS(MACRO__, ...) \
 	MACRO__(0x0A02, ## __VA_ARGS__), /* ULT GT1 desktop */ \
-- 
2.43.0