[SRU][PATCH 0/1] UBUNTU: SAUCE: drm/i915: Fix detection for a CMP-V PCH

classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

[SRU][PATCH 0/1] UBUNTU: SAUCE: drm/i915: Fix detection for a CMP-V PCH

You-Sheng Yang
From: You-Sheng Yang <[hidden email]>

BugLink: https://bugs.launchpad.net/bugs/1852386

[Impact]
Bug 1849278 introduced a regression on some Comet Lake platforms that
device may have no video output on HDMI port.

[Fix]
A currently in-review patch
https://patchwork.freedesktop.org/patch/340416 should be applied to
correct PCH's identity and restore HDMI output.

[Test Case]
1. Apply the patches to oem-osp1 kernel >= 1026 or Eoan/Focal generic
kernels.
2. Boot affected platforms with HDMI cable connected to an external
monitor.
3. Check if the monitor lights up when GDM service is started.

This was verified in to victim platforms.

[Regression Risk]
Low. This should affects only systems with matching PCH hw that is
currently affected by the regression to be fixed.

Imre Deak (1):
  UBUNTU: SAUCE: drm/i915: Fix detection for a CMP-V PCH

 drivers/gpu/drm/i915/i915_drv.c | 6 +++++-
 drivers/gpu/drm/i915/i915_drv.h | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

--
2.20.1


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[SRU][PATCH 1/1] UBUNTU: SAUCE: drm/i915: Fix detection for a CMP-V PCH

You-Sheng Yang
From: Imre Deak <[hidden email]>

BugLink: https://bugs.launchpad.net/bugs/1852386

According to internal documents I found for CMP PCHs the PCI ID 0xA3C1
belongs to a CMP-V chipset. Based on the same docs the programming of
the PCH is compatible with that of KBP. Fix up my previous wrong
assumption accordingly using the SPT programming which in turn is the
basis for KBP.

The original bug reporter verified that this is the correct PCH
identification (the only way we'll program valid DDC pin-pair values to
the GMBUS register) and the Windows team uses the same identification
(that is using the KBP programming model for this PCH).

I filed the necessary Bspec update requests (BSpec/33734).

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=112051
Fixes: 37c92dc303dd ("drm/i915: Add new CNL PCH ID seen on a CML platform")
Reported-and-tested-by: Cyrus <[hidden email]>
Cc: Cyrus <[hidden email]>
Cc: Timo Aaltonen <[hidden email]>
Cc: José Roberto de Souza <[hidden email]>
Signed-off-by: Imre Deak <[hidden email]>
Reviewed-by: José Roberto de Souza <[hidden email]>
(backported from https://patchwork.freedesktop.org/patch/340416)
Signed-off-by: You-Sheng Yang <[hidden email]>
---
 drivers/gpu/drm/i915/i915_drv.c | 6 +++++-
 drivers/gpu/drm/i915/i915_drv.h | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index bfa878665a85c..5eded2b7c5a03 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -179,7 +179,6 @@ intel_pch_type(const struct drm_i915_private *dev_priv, unsigned short id)
  !IS_COFFEELAKE(dev_priv));
  return PCH_KBP;
  case INTEL_PCH_CNP_DEVICE_ID_TYPE:
- case INTEL_PCH_CNP2_DEVICE_ID_TYPE:
  DRM_DEBUG_KMS("Found Cannon Lake PCH (CNP)\n");
  WARN_ON(!IS_CANNONLAKE(dev_priv) && !IS_COFFEELAKE(dev_priv));
  return PCH_CNP;
@@ -193,6 +192,11 @@ intel_pch_type(const struct drm_i915_private *dev_priv, unsigned short id)
  WARN_ON(!IS_COFFEELAKE(dev_priv));
  /* CometPoint is CNP Compatible */
  return PCH_CNP;
+ case INTEL_PCH_CMP_V_DEVICE_ID_TYPE:
+ DRM_DEBUG_KMS("Found Comet Lake V PCH (CMP-V)\n");
+ WARN_ON(!IS_COFFEELAKE(dev_priv));
+ /* Comet Lake V PCH is based on KBP, which is SPT compatible */
+ return PCH_SPT;
  case INTEL_PCH_ICP_DEVICE_ID_TYPE:
  DRM_DEBUG_KMS("Found Ice Lake PCH\n");
  WARN_ON(!IS_ICELAKE(dev_priv));
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 111209e186abd..264e542cd09ee 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -2538,10 +2538,10 @@ static inline unsigned int i915_sg_segment_size(void)
 #define INTEL_PCH_SPT_LP_DEVICE_ID_TYPE 0x9D00
 #define INTEL_PCH_KBP_DEVICE_ID_TYPE 0xA280
 #define INTEL_PCH_CNP_DEVICE_ID_TYPE 0xA300
-#define INTEL_PCH_CNP2_DEVICE_ID_TYPE 0xA380
 #define INTEL_PCH_CNP_LP_DEVICE_ID_TYPE 0x9D80
 #define INTEL_PCH_CMP_DEVICE_ID_TYPE 0x0280
 #define INTEL_PCH_CMP2_DEVICE_ID_TYPE 0x0680
+#define INTEL_PCH_CMP_V_DEVICE_ID_TYPE 0xA380
 #define INTEL_PCH_ICP_DEVICE_ID_TYPE 0x3480
 #define INTEL_PCH_P2X_DEVICE_ID_TYPE 0x7100
 #define INTEL_PCH_P3X_DEVICE_ID_TYPE 0x7000
--
2.20.1


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

NAK: [SRU][PATCH 0/1] UBUNTU: SAUCE: drm/i915: Fix detection for a CMP-V PCH

You-Sheng Yang
In reply to this post by You-Sheng Yang
Missing target series.

On 2019-11-13 19:13, You-Sheng Yang wrote:

> From: You-Sheng Yang <[hidden email]>
>
> BugLink: https://bugs.launchpad.net/bugs/1852386
>
> [Impact]
> Bug 1849278 introduced a regression on some Comet Lake platforms that
> device may have no video output on HDMI port.
>
> [Fix]
> A currently in-review patch
> https://patchwork.freedesktop.org/patch/340416 should be applied to
> correct PCH's identity and restore HDMI output.
>
> [Test Case]
> 1. Apply the patches to oem-osp1 kernel >= 1026 or Eoan/Focal generic
> kernels.
> 2. Boot affected platforms with HDMI cable connected to an external
> monitor.
> 3. Check if the monitor lights up when GDM service is started.
>
> This was verified in to victim platforms.
>
> [Regression Risk]
> Low. This should affects only systems with matching PCH hw that is
> currently affected by the regression to be fixed.
>
> Imre Deak (1):
>   UBUNTU: SAUCE: drm/i915: Fix detection for a CMP-V PCH
>
>  drivers/gpu/drm/i915/i915_drv.c | 6 +++++-
>  drivers/gpu/drm/i915/i915_drv.h | 2 +-
>  2 files changed, 6 insertions(+), 2 deletions(-)
>

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team

signature.asc (499 bytes) Download Attachment