merged to dinq, thanks for review On Wed, Aug 2, 2017 at 10:10 AM, Srivatsa, Anusha <anusha.srivatsa@xxxxxxxxx> wrote: > Reviewed-by: Anusha Srivatsa <anusha.srivatsa@xxxxxxxxx> > >>-----Original Message----- >>From: Vivi, Rodrigo >>Sent: Monday, July 31, 2017 12:10 PM >>To: Zanoni, Paulo R <paulo.r.zanoni@xxxxxxxxx> >>Cc: intel-gfx@xxxxxxxxxxxxxxxxxxxxx; Srivatsa, Anusha >><anusha.srivatsa@xxxxxxxxx> >>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@xxxxxxxxx> >>> > Cc: Paulo Zanoni <paulo.r.zanoni@xxxxxxxxx> >>> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx> >>> > --- >>> > 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@xxxxxxxxxxxxxxxxxxxxx > https://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Rodrigo Vivi Blog: http://blog.vivi.eng.br _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx