[08/14] drm/i915: Sort SKL PCI IDs

Message ID	20200716172106.2656-9-ville.syrjala@linux.intel.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <SRS0=YVpO=A3=lists.freedesktop.org=intel-gfx-bounces@kernel.org> DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A41F22065E IronPort-SDR: hjMBAV0dm0jhHIdod7SpcH+2cfEcQV9rFkQ9Ke/CH3+GtjXc++f2QXYpGIiGRflt0Sf9tBMCDF noGqCX5fWAoA== IronPort-SDR: 513q0u1Ci60MPlo/+zrMsLzGBlRb2sOFs2FoJsWpwXc4jcFQv4vhPmNhcy6ZBDBndHYT+oJeMN XPXNOZ+TF4zw== From: Ville Syrjala <ville.syrjala@linux.intel.com> To: intel-gfx@lists.freedesktop.org Date: Thu, 16 Jul 2020 20:21:00 +0300 Message-Id: <20200716172106.2656-9-ville.syrjala@linux.intel.com> In-Reply-To: <20200716172106.2656-1-ville.syrjala@linux.intel.com> References: <20200716172106.2656-1-ville.syrjala@linux.intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH 08/14] drm/i915: Sort SKL PCI IDs Precedence: list Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
Series	drm/i915: PCI ID cleanup \| expand [00/14] drm/i915: PCI ID cleanup [01/14] drm/i915: Update Haswell PCI IDs [02/14] drm/i915: Reclassify SKL 0x192a as GT3 [03/14] drm/i915: Reclassify SKL 0x1923 and 0x1927 as ULT [04/14] drm/i915: Add SKL GT1.5 PCI IDs [05/14] drm/i915: Try to fix the SKL GT3/4 vs. GT3e/4e comments [06/14] drm/i915: Ocd the HSW PCI ID hex numbers [07/14] drm/i915: Sort HSW PCI IDs [08/14] drm/i915: Sort SKL PCI IDs [09/14] drm/i915: Sort KBL PCI IDs [10/14] drm/i915: Sort CML PCI IDs [11/14] drm/i915: Sort CFL PCI IDs [12/14] drm/i915: Sort CNL PCI IDs [13/14] drm/i915: Sort ICL PCI IDs [14/14] drm/i915: Sort EHL/JSL PCI IDs

Message ID

20200716172106.2656-9-ville.syrjala@linux.intel.com (mailing list archive)

State

New, archived

Headers

DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A41F22065E
IronPort-SDR: 
 hjMBAV0dm0jhHIdod7SpcH+2cfEcQV9rFkQ9Ke/CH3+GtjXc++f2QXYpGIiGRflt0Sf9tBMCDF
 noGqCX5fWAoA==
IronPort-SDR: 
 513q0u1Ci60MPlo/+zrMsLzGBlRb2sOFs2FoJsWpwXc4jcFQv4vhPmNhcy6ZBDBndHYT+oJeMN
 XPXNOZ+TF4zw==
From: Ville Syrjala <ville.syrjala@linux.intel.com>
To: intel-gfx@lists.freedesktop.org
Date: Thu, 16 Jul 2020 20:21:00 +0300
Message-Id: <20200716172106.2656-9-ville.syrjala@linux.intel.com>
In-Reply-To: <20200716172106.2656-1-ville.syrjala@linux.intel.com>
References: <20200716172106.2656-1-ville.syrjala@linux.intel.com>
MIME-Version: 1.0
Subject: [Intel-gfx] [PATCH 08/14] drm/i915: Sort SKL PCI IDs
Precedence: list
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>

Series

drm/i915: PCI ID cleanup | expand

Commit Message

Ville Syrjälä July 16, 2020, 5:21 p.m. UTC

From: Ville Syrjälä <ville.syrjala@linux.intel.com>

Sort the SKL PCI IDs numerically. Some order seems better than
randomness.

Cc: Alexei Podtelezhnikov <apodtele@gmail.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 include/drm/i915_pciids.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Comments

Srivatsa, Anusha Sept. 24, 2020, 12:49 a.m. UTC | #1

> -----Original Message-----
> From: Intel-gfx <intel-gfx-bounces@lists.freedesktop.org> On Behalf Of Ville
> Syrjala
> Sent: Thursday, July 16, 2020 10:21 AM
> To: intel-gfx@lists.freedesktop.org
> Subject: [Intel-gfx] [PATCH 08/14] drm/i915: Sort SKL PCI IDs
> 
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> 
> Sort the SKL PCI IDs numerically. Some order seems better than
> randomness.

There are 2 patches - patch 2 and 3 in the series that are reclassifying some PCI IDs  and there is patch 4 that adds a missing ID. All of those with this patch can be combined to a single patch OR patch 2, 3 and 4 can be squashed as one solitary patch.

Anusha 
> Cc: Alexei Podtelezhnikov <apodtele@gmail.com>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
>  include/drm/i915_pciids.h | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h index
> 4870c3c9f9b2..5185ac789038 100644
> --- a/include/drm/i915_pciids.h
> +++ b/include/drm/i915_pciids.h
> @@ -340,8 +340,8 @@
>  	INTEL_SKL_ULT_GT1_IDS(info), \
>  	INTEL_SKL_ULX_GT1_IDS(info), \
>  	INTEL_VGA_DEVICE(0x1902, info), /* DT  GT1 */ \
> -	INTEL_VGA_DEVICE(0x190B, info), /* Halo GT1 */ \
>  	INTEL_VGA_DEVICE(0x190A, info), /* SRV GT1 */ \
> +	INTEL_VGA_DEVICE(0x190B, info), /* Halo GT1 */ \
>  	INTEL_VGA_DEVICE(0x1917, info)  /* DT  GT1.5 */
> 
>  #define INTEL_SKL_ULT_GT2_IDS(info) \
> @@ -355,8 +355,8 @@
>  	INTEL_SKL_ULT_GT2_IDS(info), \
>  	INTEL_SKL_ULX_GT2_IDS(info), \
>  	INTEL_VGA_DEVICE(0x1912, info), /* DT  GT2 */ \
> -	INTEL_VGA_DEVICE(0x191B, info), /* Halo GT2 */ \
>  	INTEL_VGA_DEVICE(0x191A, info), /* SRV GT2 */ \
> +	INTEL_VGA_DEVICE(0x191B, info), /* Halo GT2 */ \
>  	INTEL_VGA_DEVICE(0x191D, info)  /* WKS GT2 */
> 
>  #define INTEL_SKL_ULT_GT3_IDS(info) \
> @@ -372,9 +372,9 @@
> 
>  #define INTEL_SKL_GT4_IDS(info) \
>  	INTEL_VGA_DEVICE(0x1932, info), /* DT GT4 */ \
> +	INTEL_VGA_DEVICE(0x193A, info), /* SRV GT4e */ \
>  	INTEL_VGA_DEVICE(0x193B, info), /* Halo GT4e */ \
> -	INTEL_VGA_DEVICE(0x193D, info), /* WKS GT4e */ \
> -	INTEL_VGA_DEVICE(0x193A, info)  /* SRV GT4e */
> +	INTEL_VGA_DEVICE(0x193D, info) /* WKS GT4e */
> 
>  #define INTEL_SKL_IDS(info)	 \
>  	INTEL_SKL_GT1_IDS(info), \
> --
> 2.26.2
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Ville Syrjälä Sept. 24, 2020, 10:50 a.m. UTC | #2

On Thu, Sep 24, 2020 at 12:49:13AM +0000, Srivatsa, Anusha wrote:
> 
> 
> > -----Original Message-----
> > From: Intel-gfx <intel-gfx-bounces@lists.freedesktop.org> On Behalf Of Ville
> > Syrjala
> > Sent: Thursday, July 16, 2020 10:21 AM
> > To: intel-gfx@lists.freedesktop.org
> > Subject: [Intel-gfx] [PATCH 08/14] drm/i915: Sort SKL PCI IDs
> > 
> > From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > 
> > Sort the SKL PCI IDs numerically. Some order seems better than
> > randomness.
> 
> There are 2 patches - patch 2 and 3 in the series that are reclassifying some PCI IDs  and there is patch 4 that adds a missing ID. All of those with this patch can be combined to a single patch OR patch 2, 3 and 4 can be squashed as one solitary patch.

The original patch from Alexei was a single patch. I split it up for
a reason; easier to revert things if/when necessary, and it's also
easier to review.

If your commit message is of the form "do A and B" it's generally
a good indication that it should be split into two patches.

> 
> Anusha 
> > Cc: Alexei Podtelezhnikov <apodtele@gmail.com>
> > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > ---
> >  include/drm/i915_pciids.h | 8 ++++----
> >  1 file changed, 4 insertions(+), 4 deletions(-)
> > 
> > diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h index
> > 4870c3c9f9b2..5185ac789038 100644
> > --- a/include/drm/i915_pciids.h
> > +++ b/include/drm/i915_pciids.h
> > @@ -340,8 +340,8 @@
> >  	INTEL_SKL_ULT_GT1_IDS(info), \
> >  	INTEL_SKL_ULX_GT1_IDS(info), \
> >  	INTEL_VGA_DEVICE(0x1902, info), /* DT  GT1 */ \
> > -	INTEL_VGA_DEVICE(0x190B, info), /* Halo GT1 */ \
> >  	INTEL_VGA_DEVICE(0x190A, info), /* SRV GT1 */ \
> > +	INTEL_VGA_DEVICE(0x190B, info), /* Halo GT1 */ \
> >  	INTEL_VGA_DEVICE(0x1917, info)  /* DT  GT1.5 */
> > 
> >  #define INTEL_SKL_ULT_GT2_IDS(info) \
> > @@ -355,8 +355,8 @@
> >  	INTEL_SKL_ULT_GT2_IDS(info), \
> >  	INTEL_SKL_ULX_GT2_IDS(info), \
> >  	INTEL_VGA_DEVICE(0x1912, info), /* DT  GT2 */ \
> > -	INTEL_VGA_DEVICE(0x191B, info), /* Halo GT2 */ \
> >  	INTEL_VGA_DEVICE(0x191A, info), /* SRV GT2 */ \
> > +	INTEL_VGA_DEVICE(0x191B, info), /* Halo GT2 */ \
> >  	INTEL_VGA_DEVICE(0x191D, info)  /* WKS GT2 */
> > 
> >  #define INTEL_SKL_ULT_GT3_IDS(info) \
> > @@ -372,9 +372,9 @@
> > 
> >  #define INTEL_SKL_GT4_IDS(info) \
> >  	INTEL_VGA_DEVICE(0x1932, info), /* DT GT4 */ \
> > +	INTEL_VGA_DEVICE(0x193A, info), /* SRV GT4e */ \
> >  	INTEL_VGA_DEVICE(0x193B, info), /* Halo GT4e */ \
> > -	INTEL_VGA_DEVICE(0x193D, info), /* WKS GT4e */ \
> > -	INTEL_VGA_DEVICE(0x193A, info)  /* SRV GT4e */
> > +	INTEL_VGA_DEVICE(0x193D, info) /* WKS GT4e */
> > 
> >  #define INTEL_SKL_IDS(info)	 \
> >  	INTEL_SKL_GT1_IDS(info), \
> > --
> > 2.26.2
> > 
> > _______________________________________________
> > Intel-gfx mailing list
> > Intel-gfx@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/intel-gfx

diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
index 4870c3c9f9b2..5185ac789038 100644
--- a/include/drm/i915_pciids.h
+++ b/include/drm/i915_pciids.h
@@ -340,8 +340,8 @@ 
 	INTEL_SKL_ULT_GT1_IDS(info), \
 	INTEL_SKL_ULX_GT1_IDS(info), \
 	INTEL_VGA_DEVICE(0x1902, info), /* DT  GT1 */ \
-	INTEL_VGA_DEVICE(0x190B, info), /* Halo GT1 */ \
 	INTEL_VGA_DEVICE(0x190A, info), /* SRV GT1 */ \
+	INTEL_VGA_DEVICE(0x190B, info), /* Halo GT1 */ \
 	INTEL_VGA_DEVICE(0x1917, info)  /* DT  GT1.5 */
 
 #define INTEL_SKL_ULT_GT2_IDS(info) \
@@ -355,8 +355,8 @@ 
 	INTEL_SKL_ULT_GT2_IDS(info), \
 	INTEL_SKL_ULX_GT2_IDS(info), \
 	INTEL_VGA_DEVICE(0x1912, info), /* DT  GT2 */ \
-	INTEL_VGA_DEVICE(0x191B, info), /* Halo GT2 */ \
 	INTEL_VGA_DEVICE(0x191A, info), /* SRV GT2 */ \
+	INTEL_VGA_DEVICE(0x191B, info), /* Halo GT2 */ \
 	INTEL_VGA_DEVICE(0x191D, info)  /* WKS GT2 */
 
 #define INTEL_SKL_ULT_GT3_IDS(info) \
@@ -372,9 +372,9 @@ 
 
 #define INTEL_SKL_GT4_IDS(info) \
 	INTEL_VGA_DEVICE(0x1932, info), /* DT GT4 */ \
+	INTEL_VGA_DEVICE(0x193A, info), /* SRV GT4e */ \
 	INTEL_VGA_DEVICE(0x193B, info), /* Halo GT4e */ \
-	INTEL_VGA_DEVICE(0x193D, info), /* WKS GT4e */ \
-	INTEL_VGA_DEVICE(0x193A, info)  /* SRV GT4e */
+	INTEL_VGA_DEVICE(0x193D, info) /* WKS GT4e */
 
 #define INTEL_SKL_IDS(info)	 \
 	INTEL_SKL_GT1_IDS(info), \

[08/14] drm/i915: Sort SKL PCI IDs

Commit Message

Comments

Patch