All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] drm/i915: Fix PCH names for KBP and CNP.
@ 2017-07-31 18:52 Rodrigo Vivi
  2017-07-31 19:05 ` Paulo Zanoni
  2017-07-31 19:09 ` ✓ Fi.CI.BAT: success for " Patchwork
  0 siblings, 2 replies; 6+ messages in thread
From: Rodrigo Vivi @ 2017-07-31 18:52 UTC (permalink / raw)
  To: intel-gfx; +Cc: Paulo Zanoni, Rodrigo Vivi

No functional change.

KBP was based on SPT and spec wasn't clear about the full name.
There was the initial point of the "Point" confusion.

Later the split with Coffee Lake and Cannon Lake both using CNP
and also some uncertainty from the specs we had at that time
made us to propagated the mistake along.

So, let's fix this now and avoid propagating these wrong
"points".

Cc: Anusha Srivatsa <anusha.srivatsa@intel.com>
Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
 drivers/gpu/drm/i915/i915_drv.c | 6 +++---
 drivers/gpu/drm/i915/i915_drv.h | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 214555e813f1..9561c2a19fc1 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -237,17 +237,17 @@ static void intel_detect_pch(struct drm_i915_private *dev_priv)
 					!IS_KABYLAKE(dev_priv));
 			} else if (id == INTEL_PCH_KBP_DEVICE_ID_TYPE) {
 				dev_priv->pch_type = PCH_KBP;
-				DRM_DEBUG_KMS("Found KabyPoint PCH\n");
+				DRM_DEBUG_KMS("Found Kaby Lake PCH (KBP)\n");
 				WARN_ON(!IS_SKYLAKE(dev_priv) &&
 					!IS_KABYLAKE(dev_priv));
 			} else if (id == INTEL_PCH_CNP_DEVICE_ID_TYPE) {
 				dev_priv->pch_type = PCH_CNP;
-				DRM_DEBUG_KMS("Found CannonPoint PCH\n");
+				DRM_DEBUG_KMS("Found Cannon Lake PCH (CNP)\n");
 				WARN_ON(!IS_CANNONLAKE(dev_priv) &&
 					!IS_COFFEELAKE(dev_priv));
 			} else if (id == INTEL_PCH_CNP_LP_DEVICE_ID_TYPE) {
 				dev_priv->pch_type = PCH_CNP;
-				DRM_DEBUG_KMS("Found CannonPoint LP PCH\n");
+				DRM_DEBUG_KMS("Found Cannon Lake LP PCH (CNP-LP)\n");
 				WARN_ON(!IS_CANNONLAKE(dev_priv) &&
 					!IS_COFFEELAKE(dev_priv));
 			} else if (id == INTEL_PCH_P2X_DEVICE_ID_TYPE ||
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index d63645a521c4..bc1755657189 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1166,8 +1166,8 @@ enum intel_pch {
 	PCH_CPT,	/* Cougarpoint/Pantherpoint PCH */
 	PCH_LPT,	/* Lynxpoint/Wildcatpoint PCH */
 	PCH_SPT,        /* Sunrisepoint PCH */
-	PCH_KBP,        /* Kabypoint PCH */
-	PCH_CNP,        /* Cannonpoint PCH */
+	PCH_KBP,        /* Kaby Lake PCH */
+	PCH_CNP,        /* Cannon Lake PCH */
 	PCH_NOP,
 };
 
-- 
2.13.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* Re: [PATCH] drm/i915: Fix PCH names for KBP and CNP.
  2017-07-31 18:52 [PATCH] drm/i915: Fix PCH names for KBP and CNP Rodrigo Vivi
@ 2017-07-31 19:05 ` Paulo Zanoni
  2017-07-31 19:09   ` Vivi, Rodrigo
  2017-07-31 19:09 ` ✓ Fi.CI.BAT: success for " Patchwork
  1 sibling, 1 reply; 6+ messages in thread
From: Paulo Zanoni @ 2017-07-31 19:05 UTC (permalink / raw)
  To: Rodrigo Vivi, intel-gfx

Em Seg, 2017-07-31 às 11:52 -0700, Rodrigo Vivi escreveu:
> No functional change.
> 
> KBP was based on SPT and spec wasn't clear about the full name.
> There was the initial point of the "Point" confusion.
> 
> Later the split with Coffee Lake and Cannon Lake both using CNP
> and also some uncertainty from the specs we had at that time
> made us to propagated the mistake along.
> 
> So, let's fix this now and avoid propagating these wrong
> "points".

Can't we go further and try to hardcode the used PCH based on the
graphics PCI ID? I mean, skip detection entirely.

> 
> Cc: Anusha Srivatsa <anusha.srivatsa@intel.com>
> Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> ---
>  drivers/gpu/drm/i915/i915_drv.c | 6 +++---
>  drivers/gpu/drm/i915/i915_drv.h | 4 ++--
>  2 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_drv.c
> b/drivers/gpu/drm/i915/i915_drv.c
> index 214555e813f1..9561c2a19fc1 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -237,17 +237,17 @@ static void intel_detect_pch(struct
> drm_i915_private *dev_priv)
>  					!IS_KABYLAKE(dev_priv));
>  			} else if (id ==
> INTEL_PCH_KBP_DEVICE_ID_TYPE) {
>  				dev_priv->pch_type = PCH_KBP;
> -				DRM_DEBUG_KMS("Found KabyPoint
> PCH\n");
> +				DRM_DEBUG_KMS("Found Kaby Lake PCH
> (KBP)\n");
>  				WARN_ON(!IS_SKYLAKE(dev_priv) &&
>  					!IS_KABYLAKE(dev_priv));
>  			} else if (id ==
> INTEL_PCH_CNP_DEVICE_ID_TYPE) {
>  				dev_priv->pch_type = PCH_CNP;
> -				DRM_DEBUG_KMS("Found CannonPoint
> PCH\n");
> +				DRM_DEBUG_KMS("Found Cannon Lake PCH
> (CNP)\n");
>  				WARN_ON(!IS_CANNONLAKE(dev_priv) &&
>  					!IS_COFFEELAKE(dev_priv));
>  			} else if (id ==
> INTEL_PCH_CNP_LP_DEVICE_ID_TYPE) {
>  				dev_priv->pch_type = PCH_CNP;
> -				DRM_DEBUG_KMS("Found CannonPoint LP
> PCH\n");
> +				DRM_DEBUG_KMS("Found Cannon Lake LP
> PCH (CNP-LP)\n");
>  				WARN_ON(!IS_CANNONLAKE(dev_priv) &&
>  					!IS_COFFEELAKE(dev_priv));
>  			} else if (id ==
> INTEL_PCH_P2X_DEVICE_ID_TYPE ||
> diff --git a/drivers/gpu/drm/i915/i915_drv.h
> b/drivers/gpu/drm/i915/i915_drv.h
> index d63645a521c4..bc1755657189 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -1166,8 +1166,8 @@ enum intel_pch {
>  	PCH_CPT,	/* Cougarpoint/Pantherpoint PCH */
>  	PCH_LPT,	/* Lynxpoint/Wildcatpoint PCH */
>  	PCH_SPT,        /* Sunrisepoint PCH */
> -	PCH_KBP,        /* Kabypoint PCH */
> -	PCH_CNP,        /* Cannonpoint PCH */
> +	PCH_KBP,        /* Kaby Lake PCH */
> +	PCH_CNP,        /* Cannon Lake PCH */
>  	PCH_NOP,
>  };
>  
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 6+ messages in thread
* ✓ Fi.CI.BAT: success for drm/i915: Fix PCH names for KBP and CNP.
  2017-07-31 18:52 [PATCH] drm/i915: Fix PCH names for KBP and CNP Rodrigo Vivi
  2017-07-31 19:05 ` Paulo Zanoni
@ 2017-07-31 19:09 ` Patchwork
  1 sibling, 0 replies; 6+ messages in thread
From: Patchwork @ 2017-07-31 19:09 UTC (permalink / raw)
  To: Rodrigo Vivi; +Cc: intel-gfx

== Series Details ==

Series: drm/i915: Fix PCH names for KBP and CNP.
URL   : https://patchwork.freedesktop.org/series/28150/
State : success

== Summary ==

Series 28150v1 drm/i915: Fix PCH names for KBP and CNP.
https://patchwork.freedesktop.org/api/1.0/series/28150/revisions/1/mbox/

Test kms_pipe_crc_basic:
        Subgroup hang-read-crc-pipe-a:
                dmesg-warn -> PASS       (fi-pnv-d510) fdo#101597 +1
        Subgroup suspend-read-crc-pipe-b:
                dmesg-warn -> PASS       (fi-byt-j1900) fdo#101705

fdo#101597 https://bugs.freedesktop.org/show_bug.cgi?id=101597
fdo#101705 https://bugs.freedesktop.org/show_bug.cgi?id=101705

fi-bdw-5557u     total:280  pass:269  dwarn:0   dfail:0   fail:0   skip:11  time:441s
fi-bdw-gvtdvm    total:280  pass:266  dwarn:0   dfail:0   fail:0   skip:14  time:433s
fi-blb-e6850     total:280  pass:225  dwarn:1   dfail:0   fail:0   skip:54  time:360s
fi-bsw-n3050     total:280  pass:244  dwarn:0   dfail:0   fail:0   skip:36  time:538s
fi-bxt-j4205     total:280  pass:261  dwarn:0   dfail:0   fail:0   skip:19  time:511s
fi-byt-j1900     total:280  pass:256  dwarn:0   dfail:0   fail:0   skip:24  time:489s
fi-byt-n2820     total:280  pass:251  dwarn:1   dfail:0   fail:0   skip:28  time:492s
fi-glk-2a        total:280  pass:261  dwarn:0   dfail:0   fail:0   skip:19  time:603s
fi-hsw-4770      total:280  pass:264  dwarn:0   dfail:0   fail:0   skip:16  time:438s
fi-hsw-4770r     total:280  pass:264  dwarn:0   dfail:0   fail:0   skip:16  time:413s
fi-ilk-650       total:280  pass:230  dwarn:0   dfail:0   fail:0   skip:50  time:417s
fi-ivb-3520m     total:280  pass:262  dwarn:0   dfail:0   fail:0   skip:18  time:499s
fi-ivb-3770      total:280  pass:262  dwarn:0   dfail:0   fail:0   skip:18  time:470s
fi-kbl-7500u     total:280  pass:262  dwarn:0   dfail:0   fail:0   skip:18  time:467s
fi-kbl-7560u     total:280  pass:270  dwarn:0   dfail:0   fail:0   skip:10  time:573s
fi-kbl-r         total:280  pass:262  dwarn:0   dfail:0   fail:0   skip:18  time:587s
fi-pnv-d510      total:280  pass:223  dwarn:2   dfail:0   fail:0   skip:55  time:565s
fi-skl-6260u     total:280  pass:270  dwarn:0   dfail:0   fail:0   skip:10  time:468s
fi-skl-6700hq    total:280  pass:263  dwarn:0   dfail:0   fail:0   skip:17  time:590s
fi-skl-6700k     total:280  pass:262  dwarn:0   dfail:0   fail:0   skip:18  time:472s
fi-skl-6770hq    total:280  pass:270  dwarn:0   dfail:0   fail:0   skip:10  time:484s
fi-skl-gvtdvm    total:280  pass:267  dwarn:0   dfail:0   fail:0   skip:13  time:436s
fi-skl-x1585l    total:280  pass:269  dwarn:0   dfail:0   fail:0   skip:11  time:473s
fi-snb-2520m     total:280  pass:252  dwarn:0   dfail:0   fail:0   skip:28  time:545s
fi-snb-2600      total:280  pass:251  dwarn:0   dfail:0   fail:0   skip:29  time:407s

87ad0636c140691e13d4485542e5d466c9e42fcd drm-tip: 2017y-07m-31d-15h-32m-42s UTC integration manifest
c69181e1a95c drm/i915: Fix PCH names for KBP and CNP.

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_5300/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH] drm/i915: Fix PCH names for KBP and CNP.
  2017-07-31 19:05 ` Paulo Zanoni
@ 2017-07-31 19:09   ` Vivi, Rodrigo
  2017-08-02 17:10     ` Srivatsa, Anusha
  0 siblings, 1 reply; 6+ messages in thread
From: Vivi, Rodrigo @ 2017-07-31 19:09 UTC (permalink / raw)
  To: Zanoni, Paulo R; +Cc: intel-gfx

On Mon, 2017-07-31 at 16:05 -0300, Paulo Zanoni wrote:
> Em Seg, 2017-07-31 às 11:52 -0700, Rodrigo Vivi escreveu:
> > No functional change.
> > 
> > KBP was based on SPT and spec wasn't clear about the full name.
> > There was the initial point of the "Point" confusion.
> > 
> > Later the split with Coffee Lake and Cannon Lake both using CNP
> > and also some uncertainty from the specs we had at that time
> > made us to propagated the mistake along.
> > 
> > So, let's fix this now and avoid propagating these wrong
> > "points".
> 
> Can't we go further and try to hardcode the used PCH based on the
> graphics PCI ID? I mean, skip detection entirely.

I don't think so... one case I can remember is that we can have KBL
(5916) on SPT and on KBP.

> 
> > 
> > Cc: Anusha Srivatsa <anusha.srivatsa@intel.com>
> > Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> > ---
> >  drivers/gpu/drm/i915/i915_drv.c | 6 +++---
> >  drivers/gpu/drm/i915/i915_drv.h | 4 ++--
> >  2 files changed, 5 insertions(+), 5 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/i915/i915_drv.c
> > b/drivers/gpu/drm/i915/i915_drv.c
> > index 214555e813f1..9561c2a19fc1 100644
> > --- a/drivers/gpu/drm/i915/i915_drv.c
> > +++ b/drivers/gpu/drm/i915/i915_drv.c
> > @@ -237,17 +237,17 @@ static void intel_detect_pch(struct
> > drm_i915_private *dev_priv)
> >  					!IS_KABYLAKE(dev_priv));
> >  			} else if (id ==
> > INTEL_PCH_KBP_DEVICE_ID_TYPE) {
> >  				dev_priv->pch_type = PCH_KBP;
> > -				DRM_DEBUG_KMS("Found KabyPoint
> > PCH\n");
> > +				DRM_DEBUG_KMS("Found Kaby Lake PCH
> > (KBP)\n");
> >  				WARN_ON(!IS_SKYLAKE(dev_priv) &&
> >  					!IS_KABYLAKE(dev_priv));
> >  			} else if (id ==
> > INTEL_PCH_CNP_DEVICE_ID_TYPE) {
> >  				dev_priv->pch_type = PCH_CNP;
> > -				DRM_DEBUG_KMS("Found CannonPoint
> > PCH\n");
> > +				DRM_DEBUG_KMS("Found Cannon Lake PCH
> > (CNP)\n");
> >  				WARN_ON(!IS_CANNONLAKE(dev_priv) &&
> >  					!IS_COFFEELAKE(dev_priv));
> >  			} else if (id ==
> > INTEL_PCH_CNP_LP_DEVICE_ID_TYPE) {
> >  				dev_priv->pch_type = PCH_CNP;
> > -				DRM_DEBUG_KMS("Found CannonPoint LP
> > PCH\n");
> > +				DRM_DEBUG_KMS("Found Cannon Lake LP
> > PCH (CNP-LP)\n");
> >  				WARN_ON(!IS_CANNONLAKE(dev_priv) &&
> >  					!IS_COFFEELAKE(dev_priv));
> >  			} else if (id ==
> > INTEL_PCH_P2X_DEVICE_ID_TYPE ||
> > diff --git a/drivers/gpu/drm/i915/i915_drv.h
> > b/drivers/gpu/drm/i915/i915_drv.h
> > index d63645a521c4..bc1755657189 100644
> > --- a/drivers/gpu/drm/i915/i915_drv.h
> > +++ b/drivers/gpu/drm/i915/i915_drv.h
> > @@ -1166,8 +1166,8 @@ enum intel_pch {
> >  	PCH_CPT,	/* Cougarpoint/Pantherpoint PCH */
> >  	PCH_LPT,	/* Lynxpoint/Wildcatpoint PCH */
> >  	PCH_SPT,        /* Sunrisepoint PCH */
> > -	PCH_KBP,        /* Kabypoint PCH */
> > -	PCH_CNP,        /* Cannonpoint PCH */
> > +	PCH_KBP,        /* Kaby Lake PCH */
> > +	PCH_CNP,        /* Cannon Lake PCH */
> >  	PCH_NOP,
> >  };
> >  

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH] drm/i915: Fix PCH names for KBP and CNP.
  2017-07-31 19:09   ` Vivi, Rodrigo
@ 2017-08-02 17:10     ` Srivatsa, Anusha
  2017-08-03 19:32       ` Rodrigo Vivi
  0 siblings, 1 reply; 6+ messages in thread
From: Srivatsa, Anusha @ 2017-08-02 17:10 UTC (permalink / raw)
  To: Vivi, Rodrigo, Zanoni, Paulo R; +Cc: intel-gfx

Reviewed-by: Anusha Srivatsa <anusha.srivatsa@intel.com>

>-----Original Message-----
>From: Vivi, Rodrigo
>Sent: Monday, July 31, 2017 12:10 PM
>To: Zanoni, Paulo R <paulo.r.zanoni@intel.com>
>Cc: intel-gfx@lists.freedesktop.org; Srivatsa, Anusha
><anusha.srivatsa@intel.com>
>Subject: Re: [PATCH] drm/i915: Fix PCH names for KBP and CNP.
>
>On Mon, 2017-07-31 at 16:05 -0300, Paulo Zanoni wrote:
>> Em Seg, 2017-07-31 às 11:52 -0700, Rodrigo Vivi escreveu:
>> > No functional change.
>> >
>> > KBP was based on SPT and spec wasn't clear about the full name.
>> > There was the initial point of the "Point" confusion.
>> >
>> > Later the split with Coffee Lake and Cannon Lake both using CNP and
>> > also some uncertainty from the specs we had at that time made us to
>> > propagated the mistake along.
>> >
>> > So, let's fix this now and avoid propagating these wrong "points".
>>
>> Can't we go further and try to hardcode the used PCH based on the
>> graphics PCI ID? I mean, skip detection entirely.
>
>I don't think so... one case I can remember is that we can have KBL
>(5916) on SPT and on KBP.

>>
>> >
>> > Cc: Anusha Srivatsa <anusha.srivatsa@intel.com>
>> > Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
>> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
>> > ---
>> >  drivers/gpu/drm/i915/i915_drv.c | 6 +++---
>> > drivers/gpu/drm/i915/i915_drv.h | 4 ++--
>> >  2 files changed, 5 insertions(+), 5 deletions(-)
>> >
>> > diff --git a/drivers/gpu/drm/i915/i915_drv.c
>> > b/drivers/gpu/drm/i915/i915_drv.c index 214555e813f1..9561c2a19fc1
>> > 100644
>> > --- a/drivers/gpu/drm/i915/i915_drv.c
>> > +++ b/drivers/gpu/drm/i915/i915_drv.c
>> > @@ -237,17 +237,17 @@ static void intel_detect_pch(struct
>> > drm_i915_private *dev_priv)
>> >  					!IS_KABYLAKE(dev_priv));
>> >  			} else if (id ==
>> > INTEL_PCH_KBP_DEVICE_ID_TYPE) {
>> >  				dev_priv->pch_type = PCH_KBP;
>> > -				DRM_DEBUG_KMS("Found KabyPoint
>> > PCH\n");
>> > +				DRM_DEBUG_KMS("Found Kaby Lake PCH
>> > (KBP)\n");
>> >  				WARN_ON(!IS_SKYLAKE(dev_priv) &&
>> >  					!IS_KABYLAKE(dev_priv));
>> >  			} else if (id ==
>> > INTEL_PCH_CNP_DEVICE_ID_TYPE) {
>> >  				dev_priv->pch_type = PCH_CNP;
>> > -				DRM_DEBUG_KMS("Found CannonPoint
>> > PCH\n");
>> > +				DRM_DEBUG_KMS("Found Cannon Lake PCH
>> > (CNP)\n");
>> >  				WARN_ON(!IS_CANNONLAKE(dev_priv) &&
>> >  					!IS_COFFEELAKE(dev_priv));
>> >  			} else if (id ==
>> > INTEL_PCH_CNP_LP_DEVICE_ID_TYPE) {
>> >  				dev_priv->pch_type = PCH_CNP;
>> > -				DRM_DEBUG_KMS("Found CannonPoint LP
>> > PCH\n");
>> > +				DRM_DEBUG_KMS("Found Cannon Lake LP
>> > PCH (CNP-LP)\n");
>> >  				WARN_ON(!IS_CANNONLAKE(dev_priv) &&
>> >  					!IS_COFFEELAKE(dev_priv));
>> >  			} else if (id ==
>> > INTEL_PCH_P2X_DEVICE_ID_TYPE ||
>> > diff --git a/drivers/gpu/drm/i915/i915_drv.h
>> > b/drivers/gpu/drm/i915/i915_drv.h index d63645a521c4..bc1755657189
>> > 100644
>> > --- a/drivers/gpu/drm/i915/i915_drv.h
>> > +++ b/drivers/gpu/drm/i915/i915_drv.h
>> > @@ -1166,8 +1166,8 @@ enum intel_pch {
>> >  	PCH_CPT,	/* Cougarpoint/Pantherpoint PCH */
>> >  	PCH_LPT,	/* Lynxpoint/Wildcatpoint PCH */
>> >  	PCH_SPT,        /* Sunrisepoint PCH */
>> > -	PCH_KBP,        /* Kabypoint PCH */
>> > -	PCH_CNP,        /* Cannonpoint PCH */
>> > +	PCH_KBP,        /* Kaby Lake PCH */
>> > +	PCH_CNP,        /* Cannon Lake PCH */
>> >  	PCH_NOP,
>> >  };
>> >

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH] drm/i915: Fix PCH names for KBP and CNP.
  2017-08-02 17:10     ` Srivatsa, Anusha
@ 2017-08-03 19:32       ` Rodrigo Vivi
  0 siblings, 0 replies; 6+ messages in thread
From: Rodrigo Vivi @ 2017-08-03 19:32 UTC (permalink / raw)
  To: Srivatsa, Anusha; +Cc: intel-gfx, Zanoni, Paulo R, Vivi, Rodrigo

merged to dinq, thanks for review

On Wed, Aug 2, 2017 at 10:10 AM, Srivatsa, Anusha
<anusha.srivatsa@intel.com> wrote:
> Reviewed-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
>
>>-----Original Message-----
>>From: Vivi, Rodrigo
>>Sent: Monday, July 31, 2017 12:10 PM
>>To: Zanoni, Paulo R <paulo.r.zanoni@intel.com>
>>Cc: intel-gfx@lists.freedesktop.org; Srivatsa, Anusha
>><anusha.srivatsa@intel.com>
>>Subject: Re: [PATCH] drm/i915: Fix PCH names for KBP and CNP.
>>
>>On Mon, 2017-07-31 at 16:05 -0300, Paulo Zanoni wrote:
>>> Em Seg, 2017-07-31 às 11:52 -0700, Rodrigo Vivi escreveu:
>>> > No functional change.
>>> >
>>> > KBP was based on SPT and spec wasn't clear about the full name.
>>> > There was the initial point of the "Point" confusion.
>>> >
>>> > Later the split with Coffee Lake and Cannon Lake both using CNP and
>>> > also some uncertainty from the specs we had at that time made us to
>>> > propagated the mistake along.
>>> >
>>> > So, let's fix this now and avoid propagating these wrong "points".
>>>
>>> Can't we go further and try to hardcode the used PCH based on the
>>> graphics PCI ID? I mean, skip detection entirely.
>>
>>I don't think so... one case I can remember is that we can have KBL
>>(5916) on SPT and on KBP.
>
>>>
>>> >
>>> > Cc: Anusha Srivatsa <anusha.srivatsa@intel.com>
>>> > Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
>>> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
>>> > ---
>>> >  drivers/gpu/drm/i915/i915_drv.c | 6 +++---
>>> > drivers/gpu/drm/i915/i915_drv.h | 4 ++--
>>> >  2 files changed, 5 insertions(+), 5 deletions(-)
>>> >
>>> > diff --git a/drivers/gpu/drm/i915/i915_drv.c
>>> > b/drivers/gpu/drm/i915/i915_drv.c index 214555e813f1..9561c2a19fc1
>>> > 100644
>>> > --- a/drivers/gpu/drm/i915/i915_drv.c
>>> > +++ b/drivers/gpu/drm/i915/i915_drv.c
>>> > @@ -237,17 +237,17 @@ static void intel_detect_pch(struct
>>> > drm_i915_private *dev_priv)
>>> >                                    !IS_KABYLAKE(dev_priv));
>>> >                    } else if (id ==
>>> > INTEL_PCH_KBP_DEVICE_ID_TYPE) {
>>> >                            dev_priv->pch_type = PCH_KBP;
>>> > -                          DRM_DEBUG_KMS("Found KabyPoint
>>> > PCH\n");
>>> > +                          DRM_DEBUG_KMS("Found Kaby Lake PCH
>>> > (KBP)\n");
>>> >                            WARN_ON(!IS_SKYLAKE(dev_priv) &&
>>> >                                    !IS_KABYLAKE(dev_priv));
>>> >                    } else if (id ==
>>> > INTEL_PCH_CNP_DEVICE_ID_TYPE) {
>>> >                            dev_priv->pch_type = PCH_CNP;
>>> > -                          DRM_DEBUG_KMS("Found CannonPoint
>>> > PCH\n");
>>> > +                          DRM_DEBUG_KMS("Found Cannon Lake PCH
>>> > (CNP)\n");
>>> >                            WARN_ON(!IS_CANNONLAKE(dev_priv) &&
>>> >                                    !IS_COFFEELAKE(dev_priv));
>>> >                    } else if (id ==
>>> > INTEL_PCH_CNP_LP_DEVICE_ID_TYPE) {
>>> >                            dev_priv->pch_type = PCH_CNP;
>>> > -                          DRM_DEBUG_KMS("Found CannonPoint LP
>>> > PCH\n");
>>> > +                          DRM_DEBUG_KMS("Found Cannon Lake LP
>>> > PCH (CNP-LP)\n");
>>> >                            WARN_ON(!IS_CANNONLAKE(dev_priv) &&
>>> >                                    !IS_COFFEELAKE(dev_priv));
>>> >                    } else if (id ==
>>> > INTEL_PCH_P2X_DEVICE_ID_TYPE ||
>>> > diff --git a/drivers/gpu/drm/i915/i915_drv.h
>>> > b/drivers/gpu/drm/i915/i915_drv.h index d63645a521c4..bc1755657189
>>> > 100644
>>> > --- a/drivers/gpu/drm/i915/i915_drv.h
>>> > +++ b/drivers/gpu/drm/i915/i915_drv.h
>>> > @@ -1166,8 +1166,8 @@ enum intel_pch {
>>> >    PCH_CPT,        /* Cougarpoint/Pantherpoint PCH */
>>> >    PCH_LPT,        /* Lynxpoint/Wildcatpoint PCH */
>>> >    PCH_SPT,        /* Sunrisepoint PCH */
>>> > -  PCH_KBP,        /* Kabypoint PCH */
>>> > -  PCH_CNP,        /* Cannonpoint PCH */
>>> > +  PCH_KBP,        /* Kaby Lake PCH */
>>> > +  PCH_CNP,        /* Cannon Lake PCH */
>>> >    PCH_NOP,
>>> >  };
>>> >
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx



-- 
Rodrigo Vivi
Blog: http://blog.vivi.eng.br
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-08-03 19:32 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-07-31 18:52 [PATCH] drm/i915: Fix PCH names for KBP and CNP Rodrigo Vivi
2017-07-31 19:05 ` Paulo Zanoni
2017-07-31 19:09   ` Vivi, Rodrigo
2017-08-02 17:10     ` Srivatsa, Anusha
2017-08-03 19:32       ` Rodrigo Vivi
2017-07-31 19:09 ` ✓ Fi.CI.BAT: success for " Patchwork

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.