Skip to contentSkip to conversation

drm/i915: remove an extra level of indirection in PCI ID list

PATCH Superseded Jani Nikula 3 participants 7 messages Oct 28, 2015

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/i915: remove an extra level of indirection in PCI ID list

Add the PCI IDs directly in the pciidlist array instead of defining an extra macro. The minor benefit from this is neater diffs when adding to the end of the list.

---
 drivers/gpu/drm/i915/i915_drv.c | 71 ++++++++++++++++++++---------------------
 1 file changed, 34 insertions(+), 37 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +34 -37
index b1f1dec05274..4af97598c377 100644
@@ -400,44 +400,41 @@ static const struct intel_device_info intel_broxton_info = {
  * and subvendor IDs, we need it to come before the more general IVB
  * PCI ID matches, otherwise we'll use the wrong info struct above.
  */
-#define INTEL_PCI_IDS \
-	INTEL_I830_IDS(&intel_i830_info),	\
-	INTEL_I845G_IDS(&intel_845g_info),	\
-	INTEL_I85X_IDS(&intel_i85x_info),	\
-	INTEL_I865G_IDS(&intel_i865g_info),	\
-	INTEL_I915G_IDS(&intel_i915g_info),	\
-	INTEL_I915GM_IDS(&intel_i915gm_info),	\
-	INTEL_I945G_IDS(&intel_i945g_info),	\
-	INTEL_I945GM_IDS(&intel_i945gm_info),	\
-	INTEL_I965G_IDS(&intel_i965g_info),	\
-	INTEL_G33_IDS(&intel_g33_info),		\
-	INTEL_I965GM_IDS(&intel_i965gm_info),	\
-	INTEL_GM45_IDS(&intel_gm45_info), 	\
-	INTEL_G45_IDS(&intel_g45_info), 	\
-	INTEL_PINEVIEW_IDS(&intel_pineview_info),	\
-	INTEL_IRONLAKE_D_IDS(&intel_ironlake_d_info),	\
-	INTEL_IRONLAKE_M_IDS(&intel_ironlake_m_info),	\
-	INTEL_SNB_D_IDS(&intel_sandybridge_d_info),	\
-	INTEL_SNB_M_IDS(&intel_sandybridge_m_info),	\
-	INTEL_IVB_Q_IDS(&intel_ivybridge_q_info), /* must be first IVB */ \
-	INTEL_IVB_M_IDS(&intel_ivybridge_m_info),	\
-	INTEL_IVB_D_IDS(&intel_ivybridge_d_info),	\
-	INTEL_HSW_D_IDS(&intel_haswell_d_info), \
-	INTEL_HSW_M_IDS(&intel_haswell_m_info), \
-	INTEL_VLV_M_IDS(&intel_valleyview_m_info),	\
-	INTEL_VLV_D_IDS(&intel_valleyview_d_info),	\
-	INTEL_BDW_GT12M_IDS(&intel_broadwell_m_info),	\
-	INTEL_BDW_GT12D_IDS(&intel_broadwell_d_info),	\
-	INTEL_BDW_GT3M_IDS(&intel_broadwell_gt3m_info),	\
-	INTEL_BDW_GT3D_IDS(&intel_broadwell_gt3d_info), \
-	INTEL_CHV_IDS(&intel_cherryview_info),	\
-	INTEL_SKL_GT1_IDS(&intel_skylake_info),	\
-	INTEL_SKL_GT2_IDS(&intel_skylake_info),	\
-	INTEL_SKL_GT3_IDS(&intel_skylake_gt3_info),	\
-	INTEL_BXT_IDS(&intel_broxton_info)
-
 static const struct pci_device_id pciidlist[] = {		/* aka */
-	INTEL_PCI_IDS,
+	INTEL_I830_IDS(&intel_i830_info),
+	INTEL_I845G_IDS(&intel_845g_info),
+	INTEL_I85X_IDS(&intel_i85x_info),
+	INTEL_I865G_IDS(&intel_i865g_info),
+	INTEL_I915G_IDS(&intel_i915g_info),
+	INTEL_I915GM_IDS(&intel_i915gm_info),
+	INTEL_I945G_IDS(&intel_i945g_info),
+	INTEL_I945GM_IDS(&intel_i945gm_info),
+	INTEL_I965G_IDS(&intel_i965g_info),
+	INTEL_G33_IDS(&intel_g33_info),
+	INTEL_I965GM_IDS(&intel_i965gm_info),
+	INTEL_GM45_IDS(&intel_gm45_info),
+	INTEL_G45_IDS(&intel_g45_info),
+	INTEL_PINEVIEW_IDS(&intel_pineview_info),
+	INTEL_IRONLAKE_D_IDS(&intel_ironlake_d_info),
+	INTEL_IRONLAKE_M_IDS(&intel_ironlake_m_info),
+	INTEL_SNB_D_IDS(&intel_sandybridge_d_info),
+	INTEL_SNB_M_IDS(&intel_sandybridge_m_info),
+	INTEL_IVB_Q_IDS(&intel_ivybridge_q_info), /* must be first IVB */
+	INTEL_IVB_M_IDS(&intel_ivybridge_m_info),
+	INTEL_IVB_D_IDS(&intel_ivybridge_d_info),
+	INTEL_HSW_D_IDS(&intel_haswell_d_info),
+	INTEL_HSW_M_IDS(&intel_haswell_m_info),
+	INTEL_VLV_M_IDS(&intel_valleyview_m_info),
+	INTEL_VLV_D_IDS(&intel_valleyview_d_info),
+	INTEL_BDW_GT12M_IDS(&intel_broadwell_m_info),
+	INTEL_BDW_GT12D_IDS(&intel_broadwell_d_info),
+	INTEL_BDW_GT3M_IDS(&intel_broadwell_gt3m_info),
+	INTEL_BDW_GT3D_IDS(&intel_broadwell_gt3d_info),
+	INTEL_CHV_IDS(&intel_cherryview_info),
+	INTEL_SKL_GT1_IDS(&intel_skylake_info),
+	INTEL_SKL_GT2_IDS(&intel_skylake_info),
+	INTEL_SKL_GT3_IDS(&intel_skylake_gt3_info),
+	INTEL_BXT_IDS(&intel_broxton_info),
 	{0, 0, 0}
 };
 
Signature · 6 lines
2.1.4

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Reviewed-by on v1 1/1
#1 lore raw
Quoted 5 lines · Jani Nikula

Add the PCI IDs directly in the pciidlist array instead of defining an extra macro. The minor benefit from this is neater diffs when adding to the end of the list.

I was tempted to do this mysefl a few times, but lazyness always won.

Quoted 39 lines
---
 drivers/gpu/drm/i915/i915_drv.c | 71 ++++++++++++++++++++---------------------
 1 file changed, 34 insertions(+), 37 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +0 -27
index b1f1dec05274..4af97598c377 100644
@@ -400,44 +400,41 @@ static const struct intel_device_info intel_broxton_info = {
  * and subvendor IDs, we need it to come before the more general IVB
  * PCI ID matches, otherwise we'll use the wrong info struct above.
  */
-#define INTEL_PCI_IDS \
-	INTEL_I830_IDS(&intel_i830_info),	\
-	INTEL_I845G_IDS(&intel_845g_info),	\
-	INTEL_I85X_IDS(&intel_i85x_info),	\
-	INTEL_I865G_IDS(&intel_i865g_info),	\
-	INTEL_I915G_IDS(&intel_i915g_info),	\
-	INTEL_I915GM_IDS(&intel_i915gm_info),	\
-	INTEL_I945G_IDS(&intel_i945g_info),	\
-	INTEL_I945GM_IDS(&intel_i945gm_info),	\
-	INTEL_I965G_IDS(&intel_i965g_info),	\
-	INTEL_G33_IDS(&intel_g33_info),		\
-	INTEL_I965GM_IDS(&intel_i965gm_info),	\
-	INTEL_GM45_IDS(&intel_gm45_info), 	\
-	INTEL_G45_IDS(&intel_g45_info), 	\
-	INTEL_PINEVIEW_IDS(&intel_pineview_info),	\
-	INTEL_IRONLAKE_D_IDS(&intel_ironlake_d_info),	\
-	INTEL_IRONLAKE_M_IDS(&intel_ironlake_m_info),	\
-	INTEL_SNB_D_IDS(&intel_sandybridge_d_info),	\
-	INTEL_SNB_M_IDS(&intel_sandybridge_m_info),	\
-	INTEL_IVB_Q_IDS(&intel_ivybridge_q_info), /* must be first IVB */ \
-	INTEL_IVB_M_IDS(&intel_ivybridge_m_info),	\
-	INTEL_IVB_D_IDS(&intel_ivybridge_d_info),	\
-	INTEL_HSW_D_IDS(&intel_haswell_d_info), \
-	INTEL_HSW_M_IDS(&intel_haswell_m_info), \
-	INTEL_VLV_M_IDS(&intel_valleyview_m_info),	\
-	INTEL_VLV_D_IDS(&intel_valleyview_d_info),	\
-	INTEL_BDW_GT12M_IDS(&intel_broadwell_m_info),	\

drivers/gpu/drm/i915/i915_drv.c static const struct intel_device_info intel_broxton_info = { · line 403

Quoted 10 lines
drivers/gpu/drm/i915/i915_drv.c +0 -9
-	INTEL_BDW_GT12D_IDS(&intel_broadwell_d_info),	\
-	INTEL_BDW_GT3M_IDS(&intel_broadwell_gt3m_info),	\
-	INTEL_BDW_GT3D_IDS(&intel_broadwell_gt3d_info), \
-	INTEL_CHV_IDS(&intel_cherryview_info),	\
-	INTEL_SKL_GT1_IDS(&intel_skylake_info),	\
-	INTEL_SKL_GT2_IDS(&intel_skylake_info),	\
-	INTEL_SKL_GT3_IDS(&intel_skylake_gt3_info),	\
-	INTEL_BXT_IDS(&intel_broxton_info)
-
 static const struct pci_device_id pciidlist[] = {		/* aka */

Not sure what that comment is meant to signifiy. Maybe kill it while at it?

Quoted 45 lines
drivers/gpu/drm/i915/i915_drv.c +34 -1
-	INTEL_PCI_IDS,
+	INTEL_I830_IDS(&intel_i830_info),
+	INTEL_I845G_IDS(&intel_845g_info),
+	INTEL_I85X_IDS(&intel_i85x_info),
+	INTEL_I865G_IDS(&intel_i865g_info),
+	INTEL_I915G_IDS(&intel_i915g_info),
+	INTEL_I915GM_IDS(&intel_i915gm_info),
+	INTEL_I945G_IDS(&intel_i945g_info),
+	INTEL_I945GM_IDS(&intel_i945gm_info),
+	INTEL_I965G_IDS(&intel_i965g_info),
+	INTEL_G33_IDS(&intel_g33_info),
+	INTEL_I965GM_IDS(&intel_i965gm_info),
+	INTEL_GM45_IDS(&intel_gm45_info),
+	INTEL_G45_IDS(&intel_g45_info),
+	INTEL_PINEVIEW_IDS(&intel_pineview_info),
+	INTEL_IRONLAKE_D_IDS(&intel_ironlake_d_info),
+	INTEL_IRONLAKE_M_IDS(&intel_ironlake_m_info),
+	INTEL_SNB_D_IDS(&intel_sandybridge_d_info),
+	INTEL_SNB_M_IDS(&intel_sandybridge_m_info),
+	INTEL_IVB_Q_IDS(&intel_ivybridge_q_info), /* must be first IVB */
+	INTEL_IVB_M_IDS(&intel_ivybridge_m_info),
+	INTEL_IVB_D_IDS(&intel_ivybridge_d_info),
+	INTEL_HSW_D_IDS(&intel_haswell_d_info),
+	INTEL_HSW_M_IDS(&intel_haswell_m_info),
+	INTEL_VLV_M_IDS(&intel_valleyview_m_info),
+	INTEL_VLV_D_IDS(&intel_valleyview_d_info),
+	INTEL_BDW_GT12M_IDS(&intel_broadwell_m_info),
+	INTEL_BDW_GT12D_IDS(&intel_broadwell_d_info),
+	INTEL_BDW_GT3M_IDS(&intel_broadwell_gt3m_info),
+	INTEL_BDW_GT3D_IDS(&intel_broadwell_gt3d_info),
+	INTEL_CHV_IDS(&intel_cherryview_info),
+	INTEL_SKL_GT1_IDS(&intel_skylake_info),
+	INTEL_SKL_GT2_IDS(&intel_skylake_info),
+	INTEL_SKL_GT3_IDS(&intel_skylake_gt3_info),
+	INTEL_BXT_IDS(&intel_broxton_info),
 	{0, 0, 0}
 };
 
Signature · 6 lines
2.1.4

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
#2 lore raw

PATCH v2 1/1 drm/i915: remove an extra level of indirection in PCI ID list

Add the PCI IDs directly in the pciidlist array instead of defining an extra macro. The minor benefit from this is neater diffs when adding to the end of the list.

v2: drop the "aka" comment (Ville)

---
 drivers/gpu/drm/i915/i915_drv.c | 73 ++++++++++++++++++++---------------------
 1 file changed, 35 insertions(+), 38 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +35 -38
index b1f1dec05274..121c5394fa51 100644
@@ -400,44 +400,41 @@ static const struct intel_device_info intel_broxton_info = {
  * and subvendor IDs, we need it to come before the more general IVB
  * PCI ID matches, otherwise we'll use the wrong info struct above.
  */
-#define INTEL_PCI_IDS \
-	INTEL_I830_IDS(&intel_i830_info),	\
-	INTEL_I845G_IDS(&intel_845g_info),	\
-	INTEL_I85X_IDS(&intel_i85x_info),	\
-	INTEL_I865G_IDS(&intel_i865g_info),	\
-	INTEL_I915G_IDS(&intel_i915g_info),	\
-	INTEL_I915GM_IDS(&intel_i915gm_info),	\
-	INTEL_I945G_IDS(&intel_i945g_info),	\
-	INTEL_I945GM_IDS(&intel_i945gm_info),	\
-	INTEL_I965G_IDS(&intel_i965g_info),	\
-	INTEL_G33_IDS(&intel_g33_info),		\
-	INTEL_I965GM_IDS(&intel_i965gm_info),	\
-	INTEL_GM45_IDS(&intel_gm45_info), 	\
-	INTEL_G45_IDS(&intel_g45_info), 	\
-	INTEL_PINEVIEW_IDS(&intel_pineview_info),	\
-	INTEL_IRONLAKE_D_IDS(&intel_ironlake_d_info),	\
-	INTEL_IRONLAKE_M_IDS(&intel_ironlake_m_info),	\
-	INTEL_SNB_D_IDS(&intel_sandybridge_d_info),	\
-	INTEL_SNB_M_IDS(&intel_sandybridge_m_info),	\
-	INTEL_IVB_Q_IDS(&intel_ivybridge_q_info), /* must be first IVB */ \
-	INTEL_IVB_M_IDS(&intel_ivybridge_m_info),	\
-	INTEL_IVB_D_IDS(&intel_ivybridge_d_info),	\
-	INTEL_HSW_D_IDS(&intel_haswell_d_info), \
-	INTEL_HSW_M_IDS(&intel_haswell_m_info), \
-	INTEL_VLV_M_IDS(&intel_valleyview_m_info),	\
-	INTEL_VLV_D_IDS(&intel_valleyview_d_info),	\
-	INTEL_BDW_GT12M_IDS(&intel_broadwell_m_info),	\
-	INTEL_BDW_GT12D_IDS(&intel_broadwell_d_info),	\
-	INTEL_BDW_GT3M_IDS(&intel_broadwell_gt3m_info),	\
-	INTEL_BDW_GT3D_IDS(&intel_broadwell_gt3d_info), \
-	INTEL_CHV_IDS(&intel_cherryview_info),	\
-	INTEL_SKL_GT1_IDS(&intel_skylake_info),	\
-	INTEL_SKL_GT2_IDS(&intel_skylake_info),	\
-	INTEL_SKL_GT3_IDS(&intel_skylake_gt3_info),	\
-	INTEL_BXT_IDS(&intel_broxton_info)
-
-static const struct pci_device_id pciidlist[] = {		/* aka */
-	INTEL_PCI_IDS,
+static const struct pci_device_id pciidlist[] = {
+	INTEL_I830_IDS(&intel_i830_info),
+	INTEL_I845G_IDS(&intel_845g_info),
+	INTEL_I85X_IDS(&intel_i85x_info),
+	INTEL_I865G_IDS(&intel_i865g_info),
+	INTEL_I915G_IDS(&intel_i915g_info),
+	INTEL_I915GM_IDS(&intel_i915gm_info),
+	INTEL_I945G_IDS(&intel_i945g_info),
+	INTEL_I945GM_IDS(&intel_i945gm_info),
+	INTEL_I965G_IDS(&intel_i965g_info),
+	INTEL_G33_IDS(&intel_g33_info),
+	INTEL_I965GM_IDS(&intel_i965gm_info),
+	INTEL_GM45_IDS(&intel_gm45_info),
+	INTEL_G45_IDS(&intel_g45_info),
+	INTEL_PINEVIEW_IDS(&intel_pineview_info),
+	INTEL_IRONLAKE_D_IDS(&intel_ironlake_d_info),
+	INTEL_IRONLAKE_M_IDS(&intel_ironlake_m_info),
+	INTEL_SNB_D_IDS(&intel_sandybridge_d_info),
+	INTEL_SNB_M_IDS(&intel_sandybridge_m_info),
+	INTEL_IVB_Q_IDS(&intel_ivybridge_q_info), /* must be first IVB */
+	INTEL_IVB_M_IDS(&intel_ivybridge_m_info),
+	INTEL_IVB_D_IDS(&intel_ivybridge_d_info),
+	INTEL_HSW_D_IDS(&intel_haswell_d_info),
+	INTEL_HSW_M_IDS(&intel_haswell_m_info),
+	INTEL_VLV_M_IDS(&intel_valleyview_m_info),
+	INTEL_VLV_D_IDS(&intel_valleyview_d_info),
+	INTEL_BDW_GT12M_IDS(&intel_broadwell_m_info),
+	INTEL_BDW_GT12D_IDS(&intel_broadwell_d_info),
+	INTEL_BDW_GT3M_IDS(&intel_broadwell_gt3m_info),
+	INTEL_BDW_GT3D_IDS(&intel_broadwell_gt3d_info),
+	INTEL_CHV_IDS(&intel_cherryview_info),
+	INTEL_SKL_GT1_IDS(&intel_skylake_info),
+	INTEL_SKL_GT2_IDS(&intel_skylake_info),
+	INTEL_SKL_GT3_IDS(&intel_skylake_gt3_info),
+	INTEL_BXT_IDS(&intel_broxton_info),
 	{0, 0, 0}
 };
 
Signature · 6 lines
2.1.4

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
#3 lore raw
Quoted 8 lines · Jani Nikula

Add the PCI IDs directly in the pciidlist array instead of defining an extra macro. The minor benefit from this is neater diffs when adding to the end of the list.

v2: drop the "aka" comment (Ville)

and pushed, thanks for the review.

BR,
Jani.

Quoted 91 lines
---
 drivers/gpu/drm/i915/i915_drv.c | 73 ++++++++++++++++++++---------------------
 1 file changed, 35 insertions(+), 38 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +35 -38
index b1f1dec05274..121c5394fa51 100644
@@ -400,44 +400,41 @@ static const struct intel_device_info intel_broxton_info = {
  * and subvendor IDs, we need it to come before the more general IVB
  * PCI ID matches, otherwise we'll use the wrong info struct above.
  */
-#define INTEL_PCI_IDS \
-	INTEL_I830_IDS(&intel_i830_info),	\
-	INTEL_I845G_IDS(&intel_845g_info),	\
-	INTEL_I85X_IDS(&intel_i85x_info),	\
-	INTEL_I865G_IDS(&intel_i865g_info),	\
-	INTEL_I915G_IDS(&intel_i915g_info),	\
-	INTEL_I915GM_IDS(&intel_i915gm_info),	\
-	INTEL_I945G_IDS(&intel_i945g_info),	\
-	INTEL_I945GM_IDS(&intel_i945gm_info),	\
-	INTEL_I965G_IDS(&intel_i965g_info),	\
-	INTEL_G33_IDS(&intel_g33_info),		\
-	INTEL_I965GM_IDS(&intel_i965gm_info),	\
-	INTEL_GM45_IDS(&intel_gm45_info), 	\
-	INTEL_G45_IDS(&intel_g45_info), 	\
-	INTEL_PINEVIEW_IDS(&intel_pineview_info),	\
-	INTEL_IRONLAKE_D_IDS(&intel_ironlake_d_info),	\
-	INTEL_IRONLAKE_M_IDS(&intel_ironlake_m_info),	\
-	INTEL_SNB_D_IDS(&intel_sandybridge_d_info),	\
-	INTEL_SNB_M_IDS(&intel_sandybridge_m_info),	\
-	INTEL_IVB_Q_IDS(&intel_ivybridge_q_info), /* must be first IVB */ \
-	INTEL_IVB_M_IDS(&intel_ivybridge_m_info),	\
-	INTEL_IVB_D_IDS(&intel_ivybridge_d_info),	\
-	INTEL_HSW_D_IDS(&intel_haswell_d_info), \
-	INTEL_HSW_M_IDS(&intel_haswell_m_info), \
-	INTEL_VLV_M_IDS(&intel_valleyview_m_info),	\
-	INTEL_VLV_D_IDS(&intel_valleyview_d_info),	\
-	INTEL_BDW_GT12M_IDS(&intel_broadwell_m_info),	\
-	INTEL_BDW_GT12D_IDS(&intel_broadwell_d_info),	\
-	INTEL_BDW_GT3M_IDS(&intel_broadwell_gt3m_info),	\
-	INTEL_BDW_GT3D_IDS(&intel_broadwell_gt3d_info), \
-	INTEL_CHV_IDS(&intel_cherryview_info),	\
-	INTEL_SKL_GT1_IDS(&intel_skylake_info),	\
-	INTEL_SKL_GT2_IDS(&intel_skylake_info),	\
-	INTEL_SKL_GT3_IDS(&intel_skylake_gt3_info),	\
-	INTEL_BXT_IDS(&intel_broxton_info)
-
-static const struct pci_device_id pciidlist[] = {		/* aka */
-	INTEL_PCI_IDS,
+static const struct pci_device_id pciidlist[] = {
+	INTEL_I830_IDS(&intel_i830_info),
+	INTEL_I845G_IDS(&intel_845g_info),
+	INTEL_I85X_IDS(&intel_i85x_info),
+	INTEL_I865G_IDS(&intel_i865g_info),
+	INTEL_I915G_IDS(&intel_i915g_info),
+	INTEL_I915GM_IDS(&intel_i915gm_info),
+	INTEL_I945G_IDS(&intel_i945g_info),
+	INTEL_I945GM_IDS(&intel_i945gm_info),
+	INTEL_I965G_IDS(&intel_i965g_info),
+	INTEL_G33_IDS(&intel_g33_info),
+	INTEL_I965GM_IDS(&intel_i965gm_info),
+	INTEL_GM45_IDS(&intel_gm45_info),
+	INTEL_G45_IDS(&intel_g45_info),
+	INTEL_PINEVIEW_IDS(&intel_pineview_info),
+	INTEL_IRONLAKE_D_IDS(&intel_ironlake_d_info),
+	INTEL_IRONLAKE_M_IDS(&intel_ironlake_m_info),
+	INTEL_SNB_D_IDS(&intel_sandybridge_d_info),
+	INTEL_SNB_M_IDS(&intel_sandybridge_m_info),
+	INTEL_IVB_Q_IDS(&intel_ivybridge_q_info), /* must be first IVB */
+	INTEL_IVB_M_IDS(&intel_ivybridge_m_info),
+	INTEL_IVB_D_IDS(&intel_ivybridge_d_info),
+	INTEL_HSW_D_IDS(&intel_haswell_d_info),
+	INTEL_HSW_M_IDS(&intel_haswell_m_info),
+	INTEL_VLV_M_IDS(&intel_valleyview_m_info),
+	INTEL_VLV_D_IDS(&intel_valleyview_d_info),
+	INTEL_BDW_GT12M_IDS(&intel_broadwell_m_info),
+	INTEL_BDW_GT12D_IDS(&intel_broadwell_d_info),
+	INTEL_BDW_GT3M_IDS(&intel_broadwell_gt3m_info),
+	INTEL_BDW_GT3D_IDS(&intel_broadwell_gt3d_info),
+	INTEL_CHV_IDS(&intel_cherryview_info),
+	INTEL_SKL_GT1_IDS(&intel_skylake_info),
+	INTEL_SKL_GT2_IDS(&intel_skylake_info),
+	INTEL_SKL_GT3_IDS(&intel_skylake_gt3_info),
+	INTEL_BXT_IDS(&intel_broxton_info),
 	{0, 0, 0}
 };
 
Signature · 1 line
2.1.4
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
#4 lore raw

I like this idea, but a small complain is that we had already 2 reviewed patches at the mailing list waiting to get merged that conflicted with this one.

Please, next time consider merging the already reviewed patches that touches same part before merging so quickly a patch like this.

Quoted 113 lines · Jani Nikula
Quoted 8 lines · Jani Nikula

Add the PCI IDs directly in the pciidlist array instead of defining an extra macro. The minor benefit from this is neater diffs when adding to the end of the list.

v2: drop the "aka" comment (Ville)

and pushed, thanks for the review.

BR,
Jani.

Quoted 89 lines
---
 drivers/gpu/drm/i915/i915_drv.c | 73 ++++++++++++++++++++---------------------
 1 file changed, 35 insertions(+), 38 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +35 -39
index b1f1dec05274..121c5394fa51 100644
@@ -400,44 +400,41 @@ static const struct intel_device_info intel_broxton_info = {
  * and subvendor IDs, we need it to come before the more general IVB
  * PCI ID matches, otherwise we'll use the wrong info struct above.
  */
-#define INTEL_PCI_IDS \
-     INTEL_I830_IDS(&intel_i830_info),       \
-     INTEL_I845G_IDS(&intel_845g_info),      \
-     INTEL_I85X_IDS(&intel_i85x_info),       \
-     INTEL_I865G_IDS(&intel_i865g_info),     \
-     INTEL_I915G_IDS(&intel_i915g_info),     \
-     INTEL_I915GM_IDS(&intel_i915gm_info),   \
-     INTEL_I945G_IDS(&intel_i945g_info),     \
-     INTEL_I945GM_IDS(&intel_i945gm_info),   \
-     INTEL_I965G_IDS(&intel_i965g_info),     \
-     INTEL_G33_IDS(&intel_g33_info),         \
-     INTEL_I965GM_IDS(&intel_i965gm_info),   \
-     INTEL_GM45_IDS(&intel_gm45_info),       \
-     INTEL_G45_IDS(&intel_g45_info),         \
-     INTEL_PINEVIEW_IDS(&intel_pineview_info),       \
-     INTEL_IRONLAKE_D_IDS(&intel_ironlake_d_info),   \
-     INTEL_IRONLAKE_M_IDS(&intel_ironlake_m_info),   \
-     INTEL_SNB_D_IDS(&intel_sandybridge_d_info),     \
-     INTEL_SNB_M_IDS(&intel_sandybridge_m_info),     \
-     INTEL_IVB_Q_IDS(&intel_ivybridge_q_info), /* must be first IVB */ \
-     INTEL_IVB_M_IDS(&intel_ivybridge_m_info),       \
-     INTEL_IVB_D_IDS(&intel_ivybridge_d_info),       \
-     INTEL_HSW_D_IDS(&intel_haswell_d_info), \
-     INTEL_HSW_M_IDS(&intel_haswell_m_info), \
-     INTEL_VLV_M_IDS(&intel_valleyview_m_info),      \
-     INTEL_VLV_D_IDS(&intel_valleyview_d_info),      \
-     INTEL_BDW_GT12M_IDS(&intel_broadwell_m_info),   \
-     INTEL_BDW_GT12D_IDS(&intel_broadwell_d_info),   \
-     INTEL_BDW_GT3M_IDS(&intel_broadwell_gt3m_info), \
-     INTEL_BDW_GT3D_IDS(&intel_broadwell_gt3d_info), \
-     INTEL_CHV_IDS(&intel_cherryview_info),  \
-     INTEL_SKL_GT1_IDS(&intel_skylake_info), \
-     INTEL_SKL_GT2_IDS(&intel_skylake_info), \
-     INTEL_SKL_GT3_IDS(&intel_skylake_gt3_info),     \
-     INTEL_BXT_IDS(&intel_broxton_info)
-
-static const struct pci_device_id pciidlist[] = {            /* aka */
-     INTEL_PCI_IDS,
+static const struct pci_device_id pciidlist[] = {
+     INTEL_I830_IDS(&intel_i830_info),
+     INTEL_I845G_IDS(&intel_845g_info),
+     INTEL_I85X_IDS(&intel_i85x_info),
+     INTEL_I865G_IDS(&intel_i865g_info),
+     INTEL_I915G_IDS(&intel_i915g_info),
+     INTEL_I915GM_IDS(&intel_i915gm_info),
+     INTEL_I945G_IDS(&intel_i945g_info),
+     INTEL_I945GM_IDS(&intel_i945gm_info),
+     INTEL_I965G_IDS(&intel_i965g_info),
+     INTEL_G33_IDS(&intel_g33_info),
+     INTEL_I965GM_IDS(&intel_i965gm_info),
+     INTEL_GM45_IDS(&intel_gm45_info),
+     INTEL_G45_IDS(&intel_g45_info),
+     INTEL_PINEVIEW_IDS(&intel_pineview_info),
+     INTEL_IRONLAKE_D_IDS(&intel_ironlake_d_info),
+     INTEL_IRONLAKE_M_IDS(&intel_ironlake_m_info),
+     INTEL_SNB_D_IDS(&intel_sandybridge_d_info),
+     INTEL_SNB_M_IDS(&intel_sandybridge_m_info),
+     INTEL_IVB_Q_IDS(&intel_ivybridge_q_info), /* must be first IVB */
+     INTEL_IVB_M_IDS(&intel_ivybridge_m_info),
+     INTEL_IVB_D_IDS(&intel_ivybridge_d_info),
+     INTEL_HSW_D_IDS(&intel_haswell_d_info),
+     INTEL_HSW_M_IDS(&intel_haswell_m_info),
+     INTEL_VLV_M_IDS(&intel_valleyview_m_info),
+     INTEL_VLV_D_IDS(&intel_valleyview_d_info),
+     INTEL_BDW_GT12M_IDS(&intel_broadwell_m_info),
+     INTEL_BDW_GT12D_IDS(&intel_broadwell_d_info),
+     INTEL_BDW_GT3M_IDS(&intel_broadwell_gt3m_info),
+     INTEL_BDW_GT3D_IDS(&intel_broadwell_gt3d_info),
+     INTEL_CHV_IDS(&intel_cherryview_info),
+     INTEL_SKL_GT1_IDS(&intel_skylake_info),
+     INTEL_SKL_GT2_IDS(&intel_skylake_info),
+     INTEL_SKL_GT3_IDS(&intel_skylake_gt3_info),
+     INTEL_BXT_IDS(&intel_broxton_info),
      {0, 0, 0}
 };
 
--
Quoted 2 lines

2.1.4

--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Signature · 6 lines
Rodrigo Vivi
Blog: http://blog.vivi.eng.br
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
#5 lore raw
Quoted 3 lines · Rodrigo Vivi

I like this idea, but a small complain is that we had already 2 reviewed patches at the mailing list waiting to get merged that conflicted with this one.

I was aware of the conflict but failed to see they were reviewed already and thought you needed to respin anyway. Sorry for the extra trouble caused.

BR,
Jani.

Quoted 124 lines

Please, next time consider merging the already reviewed patches that touches same part before merging so quickly a patch like this.

Quoted 113 lines · Jani Nikula
Quoted 8 lines · Jani Nikula

Add the PCI IDs directly in the pciidlist array instead of defining an extra macro. The minor benefit from this is neater diffs when adding to the end of the list.

v2: drop the "aka" comment (Ville)

and pushed, thanks for the review.

BR,
Jani.

Quoted 89 lines
---
 drivers/gpu/drm/i915/i915_drv.c | 73 ++++++++++++++++++++---------------------
 1 file changed, 35 insertions(+), 38 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +35 -39
index b1f1dec05274..121c5394fa51 100644
@@ -400,44 +400,41 @@ static const struct intel_device_info intel_broxton_info = {
  * and subvendor IDs, we need it to come before the more general IVB
  * PCI ID matches, otherwise we'll use the wrong info struct above.
  */
-#define INTEL_PCI_IDS \
-     INTEL_I830_IDS(&intel_i830_info),       \
-     INTEL_I845G_IDS(&intel_845g_info),      \
-     INTEL_I85X_IDS(&intel_i85x_info),       \
-     INTEL_I865G_IDS(&intel_i865g_info),     \
-     INTEL_I915G_IDS(&intel_i915g_info),     \
-     INTEL_I915GM_IDS(&intel_i915gm_info),   \
-     INTEL_I945G_IDS(&intel_i945g_info),     \
-     INTEL_I945GM_IDS(&intel_i945gm_info),   \
-     INTEL_I965G_IDS(&intel_i965g_info),     \
-     INTEL_G33_IDS(&intel_g33_info),         \
-     INTEL_I965GM_IDS(&intel_i965gm_info),   \
-     INTEL_GM45_IDS(&intel_gm45_info),       \
-     INTEL_G45_IDS(&intel_g45_info),         \
-     INTEL_PINEVIEW_IDS(&intel_pineview_info),       \
-     INTEL_IRONLAKE_D_IDS(&intel_ironlake_d_info),   \
-     INTEL_IRONLAKE_M_IDS(&intel_ironlake_m_info),   \
-     INTEL_SNB_D_IDS(&intel_sandybridge_d_info),     \
-     INTEL_SNB_M_IDS(&intel_sandybridge_m_info),     \
-     INTEL_IVB_Q_IDS(&intel_ivybridge_q_info), /* must be first IVB */ \
-     INTEL_IVB_M_IDS(&intel_ivybridge_m_info),       \
-     INTEL_IVB_D_IDS(&intel_ivybridge_d_info),       \
-     INTEL_HSW_D_IDS(&intel_haswell_d_info), \
-     INTEL_HSW_M_IDS(&intel_haswell_m_info), \
-     INTEL_VLV_M_IDS(&intel_valleyview_m_info),      \
-     INTEL_VLV_D_IDS(&intel_valleyview_d_info),      \
-     INTEL_BDW_GT12M_IDS(&intel_broadwell_m_info),   \
-     INTEL_BDW_GT12D_IDS(&intel_broadwell_d_info),   \
-     INTEL_BDW_GT3M_IDS(&intel_broadwell_gt3m_info), \
-     INTEL_BDW_GT3D_IDS(&intel_broadwell_gt3d_info), \
-     INTEL_CHV_IDS(&intel_cherryview_info),  \
-     INTEL_SKL_GT1_IDS(&intel_skylake_info), \
-     INTEL_SKL_GT2_IDS(&intel_skylake_info), \
-     INTEL_SKL_GT3_IDS(&intel_skylake_gt3_info),     \
-     INTEL_BXT_IDS(&intel_broxton_info)
-
-static const struct pci_device_id pciidlist[] = {            /* aka */
-     INTEL_PCI_IDS,
+static const struct pci_device_id pciidlist[] = {
+     INTEL_I830_IDS(&intel_i830_info),
+     INTEL_I845G_IDS(&intel_845g_info),
+     INTEL_I85X_IDS(&intel_i85x_info),
+     INTEL_I865G_IDS(&intel_i865g_info),
+     INTEL_I915G_IDS(&intel_i915g_info),
+     INTEL_I915GM_IDS(&intel_i915gm_info),
+     INTEL_I945G_IDS(&intel_i945g_info),
+     INTEL_I945GM_IDS(&intel_i945gm_info),
+     INTEL_I965G_IDS(&intel_i965g_info),
+     INTEL_G33_IDS(&intel_g33_info),
+     INTEL_I965GM_IDS(&intel_i965gm_info),
+     INTEL_GM45_IDS(&intel_gm45_info),
+     INTEL_G45_IDS(&intel_g45_info),
+     INTEL_PINEVIEW_IDS(&intel_pineview_info),
+     INTEL_IRONLAKE_D_IDS(&intel_ironlake_d_info),
+     INTEL_IRONLAKE_M_IDS(&intel_ironlake_m_info),
+     INTEL_SNB_D_IDS(&intel_sandybridge_d_info),
+     INTEL_SNB_M_IDS(&intel_sandybridge_m_info),
+     INTEL_IVB_Q_IDS(&intel_ivybridge_q_info), /* must be first IVB */
+     INTEL_IVB_M_IDS(&intel_ivybridge_m_info),
+     INTEL_IVB_D_IDS(&intel_ivybridge_d_info),
+     INTEL_HSW_D_IDS(&intel_haswell_d_info),
+     INTEL_HSW_M_IDS(&intel_haswell_m_info),
+     INTEL_VLV_M_IDS(&intel_valleyview_m_info),
+     INTEL_VLV_D_IDS(&intel_valleyview_d_info),
+     INTEL_BDW_GT12M_IDS(&intel_broadwell_m_info),
+     INTEL_BDW_GT12D_IDS(&intel_broadwell_d_info),
+     INTEL_BDW_GT3M_IDS(&intel_broadwell_gt3m_info),
+     INTEL_BDW_GT3D_IDS(&intel_broadwell_gt3d_info),
+     INTEL_CHV_IDS(&intel_cherryview_info),
+     INTEL_SKL_GT1_IDS(&intel_skylake_info),
+     INTEL_SKL_GT2_IDS(&intel_skylake_info),
+     INTEL_SKL_GT3_IDS(&intel_skylake_gt3_info),
+     INTEL_BXT_IDS(&intel_broxton_info),
      {0, 0, 0}
 };
 
--
Quoted 2 lines

2.1.4

--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Signature · 2 lines
Rodrigo Vivi
Blog: http://blog.vivi.eng.br
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
#6 lore raw
Quoted 8 lines · Jani Nikula
Quoted 3 lines · Rodrigo Vivi

I like this idea, but a small complain is that we had already 2 reviewed patches at the mailing list waiting to get merged that conflicted with this one.

I was aware of the conflict but failed to see they were reviewed already and thought you needed to respin anyway. Sorry for the extra trouble caused.

oh, nevermind... you were right...

those depends on the first patch with platform definition that is not reviewed yet...

please forgive me and ignore my complain ;)

Quoted 131 lines

BR,
Jani.

Quoted 121 lines

Please, next time consider merging the already reviewed patches that touches same part before merging so quickly a patch like this.

Quoted 103 lines · Jani Nikula
Quoted 8 lines · Jani Nikula

Add the PCI IDs directly in the pciidlist array instead of defining an extra macro. The minor benefit from this is neater diffs when adding to the end of the list.

v2: drop the "aka" comment (Ville)

and pushed, thanks for the review.

BR,
Jani.

Quoted 88 lines
---
 drivers/gpu/drm/i915/i915_drv.c | 73 ++++++++++++++++++++---------------------
 1 file changed, 35 insertions(+), 38 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +35 -38
index b1f1dec05274..121c5394fa51 100644
@@ -400,44 +400,41 @@ static const struct intel_device_info intel_broxton_info = {
  * and subvendor IDs, we need it to come before the more general IVB
  * PCI ID matches, otherwise we'll use the wrong info struct above.
  */
-#define INTEL_PCI_IDS \
-     INTEL_I830_IDS(&intel_i830_info),       \
-     INTEL_I845G_IDS(&intel_845g_info),      \
-     INTEL_I85X_IDS(&intel_i85x_info),       \
-     INTEL_I865G_IDS(&intel_i865g_info),     \
-     INTEL_I915G_IDS(&intel_i915g_info),     \
-     INTEL_I915GM_IDS(&intel_i915gm_info),   \
-     INTEL_I945G_IDS(&intel_i945g_info),     \
-     INTEL_I945GM_IDS(&intel_i945gm_info),   \
-     INTEL_I965G_IDS(&intel_i965g_info),     \
-     INTEL_G33_IDS(&intel_g33_info),         \
-     INTEL_I965GM_IDS(&intel_i965gm_info),   \
-     INTEL_GM45_IDS(&intel_gm45_info),       \
-     INTEL_G45_IDS(&intel_g45_info),         \
-     INTEL_PINEVIEW_IDS(&intel_pineview_info),       \
-     INTEL_IRONLAKE_D_IDS(&intel_ironlake_d_info),   \
-     INTEL_IRONLAKE_M_IDS(&intel_ironlake_m_info),   \
-     INTEL_SNB_D_IDS(&intel_sandybridge_d_info),     \
-     INTEL_SNB_M_IDS(&intel_sandybridge_m_info),     \
-     INTEL_IVB_Q_IDS(&intel_ivybridge_q_info), /* must be first IVB */ \
-     INTEL_IVB_M_IDS(&intel_ivybridge_m_info),       \
-     INTEL_IVB_D_IDS(&intel_ivybridge_d_info),       \
-     INTEL_HSW_D_IDS(&intel_haswell_d_info), \
-     INTEL_HSW_M_IDS(&intel_haswell_m_info), \
-     INTEL_VLV_M_IDS(&intel_valleyview_m_info),      \
-     INTEL_VLV_D_IDS(&intel_valleyview_d_info),      \
-     INTEL_BDW_GT12M_IDS(&intel_broadwell_m_info),   \
-     INTEL_BDW_GT12D_IDS(&intel_broadwell_d_info),   \
-     INTEL_BDW_GT3M_IDS(&intel_broadwell_gt3m_info), \
-     INTEL_BDW_GT3D_IDS(&intel_broadwell_gt3d_info), \
-     INTEL_CHV_IDS(&intel_cherryview_info),  \
-     INTEL_SKL_GT1_IDS(&intel_skylake_info), \
-     INTEL_SKL_GT2_IDS(&intel_skylake_info), \
-     INTEL_SKL_GT3_IDS(&intel_skylake_gt3_info),     \
-     INTEL_BXT_IDS(&intel_broxton_info)
-
-static const struct pci_device_id pciidlist[] = {            /* aka */
-     INTEL_PCI_IDS,
+static const struct pci_device_id pciidlist[] = {
+     INTEL_I830_IDS(&intel_i830_info),
+     INTEL_I845G_IDS(&intel_845g_info),
+     INTEL_I85X_IDS(&intel_i85x_info),
+     INTEL_I865G_IDS(&intel_i865g_info),
+     INTEL_I915G_IDS(&intel_i915g_info),
+     INTEL_I915GM_IDS(&intel_i915gm_info),
+     INTEL_I945G_IDS(&intel_i945g_info),
+     INTEL_I945GM_IDS(&intel_i945gm_info),
+     INTEL_I965G_IDS(&intel_i965g_info),
+     INTEL_G33_IDS(&intel_g33_info),
+     INTEL_I965GM_IDS(&intel_i965gm_info),
+     INTEL_GM45_IDS(&intel_gm45_info),
+     INTEL_G45_IDS(&intel_g45_info),
+     INTEL_PINEVIEW_IDS(&intel_pineview_info),
+     INTEL_IRONLAKE_D_IDS(&intel_ironlake_d_info),
+     INTEL_IRONLAKE_M_IDS(&intel_ironlake_m_info),
+     INTEL_SNB_D_IDS(&intel_sandybridge_d_info),
+     INTEL_SNB_M_IDS(&intel_sandybridge_m_info),
+     INTEL_IVB_Q_IDS(&intel_ivybridge_q_info), /* must be first IVB */
+     INTEL_IVB_M_IDS(&intel_ivybridge_m_info),
+     INTEL_IVB_D_IDS(&intel_ivybridge_d_info),
+     INTEL_HSW_D_IDS(&intel_haswell_d_info),
+     INTEL_HSW_M_IDS(&intel_haswell_m_info),
+     INTEL_VLV_M_IDS(&intel_valleyview_m_info),
+     INTEL_VLV_D_IDS(&intel_valleyview_d_info),
+     INTEL_BDW_GT12M_IDS(&intel_broadwell_m_info),
+     INTEL_BDW_GT12D_IDS(&intel_broadwell_d_info),
+     INTEL_BDW_GT3M_IDS(&intel_broadwell_gt3m_info),
+     INTEL_BDW_GT3D_IDS(&intel_broadwell_gt3d_info),
+     INTEL_CHV_IDS(&intel_cherryview_info),
+     INTEL_SKL_GT1_IDS(&intel_skylake_info),
+     INTEL_SKL_GT2_IDS(&intel_skylake_info),
+     INTEL_SKL_GT3_IDS(&intel_skylake_gt3_info),
+     INTEL_BXT_IDS(&intel_broxton_info),
      {0, 0, 0}
 };
 
Quoted 10 lines
Quoted 3 lines

--
2.1.4

--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Quoted 3 lines

--
Rodrigo Vivi
Blog: http://blog.vivi.eng.br

--
Jani Nikula, Intel Open Source Technology Center

Signature · 6 lines
Rodrigo Vivi
Blog: http://blog.vivi.eng.br
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx