[PATCH] drm/i915/pch: fix warning for coffeelake on SunrisePoint PCH

[PATCH] drm/i915/pch: fix warning for coffeelake on SunrisePoint PCH

[Jiajia Liu]

i915/pch reports a warning on a mini PC which has a CoffeeLake-S GT2
[UHD Graphics 630] [8086:3e92] and an ISA bridge - H110 LPC Controller
[8086:a143].

[3.490423] i915 0000:00:02.0: [drm] Found coffeelake (device ID 3e92) integrated display version 9.00 stepping N/A
[3.507160] ------------[ cut here ]------------
[3.523341] i915 0000:00:02.0: [drm] drm_WARN_ON(!IS_PLATFORM(dev_priv, INTEL_SKYLAKE) && !IS_PLATFORM(dev_priv, INTEL_KABYLAKE))
[3.523356] WARNING: CPU: 5 PID: 199 at drivers/gpu/drm/i915/soc/intel_pch.c:92 intel_pch_type+0x1c3/0xe10 [i915]
[3.709685] CPU: 5 UID: 0 PID: 199 Comm: systemd-udevd Not tainted 6.15.0-rc2-up-fc96b232f8e7 #1 PREEMPT(voluntary)

Signed-off-by: Jiajia Liu <liujiajia@kylinos.cn>
---
 drivers/gpu/drm/i915/soc/intel_pch.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/soc/intel_pch.c b/drivers/gpu/drm/i915/soc/intel_pch.c
index 82dc7fbd1a3e..011bc9757e9b 100644
--- a/drivers/gpu/drm/i915/soc/intel_pch.c
+++ b/drivers/gpu/drm/i915/soc/intel_pch.c
@@ -90,7 +90,8 @@ intel_pch_type(const struct drm_i915_private *dev_priv, unsigned short id)
 	case INTEL_PCH_SPT_DEVICE_ID_TYPE:
 		drm_dbg_kms(&dev_priv->drm, "Found SunrisePoint PCH\n");
 		drm_WARN_ON(&dev_priv->drm,
-			    !IS_SKYLAKE(dev_priv) && !IS_KABYLAKE(dev_priv));
+			    !IS_SKYLAKE(dev_priv) && !IS_KABYLAKE(dev_priv) &&
+			    !IS_COFFEELAKE(dev_priv));
 		return PCH_SPT;
 	case INTEL_PCH_SPT_LP_DEVICE_ID_TYPE:
 		drm_dbg_kms(&dev_priv->drm, "Found SunrisePoint LP PCH\n");
-- 
2.25.1

✗ Fi.CI.BUILD: failure for drm/i915/pch: fix warning for coffeelake on SunrisePoint PCH

[Patchwork]

== Series Details ==

Series: drm/i915/pch: fix warning for coffeelake on SunrisePoint PCH
URL   : https://patchwork.freedesktop.org/series/148028/
State : failure

== Summary ==

Error: patch https://patchwork.freedesktop.org/api/1.0/series/148028/revisions/1/mbox/ not applied
Applying: drm/i915/pch: fix warning for coffeelake on SunrisePoint PCH
Using index info to reconstruct a base tree...
A	drivers/gpu/drm/i915/soc/intel_pch.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/display/intel_pch.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_pch.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 drm/i915/pch: fix warning for coffeelake on SunrisePoint PCH
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Build failed, no error log produced

Re: [PATCH] drm/i915/pch: fix warning for coffeelake on SunrisePoint PCH

[Rodrigo Vivi]

On Fri, Apr 18, 2025 at 02:00:06PM +0800, Jiajia Liu wrote:
> i915/pch reports a warning on a mini PC which has a CoffeeLake-S GT2
> [UHD Graphics 630] [8086:3e92] and an ISA bridge - H110 LPC Controller
> [8086:a143].
> 
> [3.490423] i915 0000:00:02.0: [drm] Found coffeelake (device ID 3e92) integrated display version 9.00 stepping N/A
> [3.507160] ------------[ cut here ]------------
> [3.523341] i915 0000:00:02.0: [drm] drm_WARN_ON(!IS_PLATFORM(dev_priv, INTEL_SKYLAKE) && !IS_PLATFORM(dev_priv, INTEL_KABYLAKE))
> [3.523356] WARNING: CPU: 5 PID: 199 at drivers/gpu/drm/i915/soc/intel_pch.c:92 intel_pch_type+0x1c3/0xe10 [i915]
> [3.709685] CPU: 5 UID: 0 PID: 199 Comm: systemd-udevd Not tainted 6.15.0-rc2-up-fc96b232f8e7 #1 PREEMPT(voluntary)

Interesting finding! o.O

Well, please rebase your patch against drm-tip branch and resend it.
https://gitlab.freedesktop.org/drm/tip/ 

Feel free to resend with:

Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

> 
> Signed-off-by: Jiajia Liu <liujiajia@kylinos.cn>
> ---
>  drivers/gpu/drm/i915/soc/intel_pch.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/soc/intel_pch.c b/drivers/gpu/drm/i915/soc/intel_pch.c
> index 82dc7fbd1a3e..011bc9757e9b 100644
> --- a/drivers/gpu/drm/i915/soc/intel_pch.c
> +++ b/drivers/gpu/drm/i915/soc/intel_pch.c
> @@ -90,7 +90,8 @@ intel_pch_type(const struct drm_i915_private *dev_priv, unsigned short id)
>  	case INTEL_PCH_SPT_DEVICE_ID_TYPE:
>  		drm_dbg_kms(&dev_priv->drm, "Found SunrisePoint PCH\n");
>  		drm_WARN_ON(&dev_priv->drm,
> -			    !IS_SKYLAKE(dev_priv) && !IS_KABYLAKE(dev_priv));
> +			    !IS_SKYLAKE(dev_priv) && !IS_KABYLAKE(dev_priv) &&
> +			    !IS_COFFEELAKE(dev_priv));
>  		return PCH_SPT;
>  	case INTEL_PCH_SPT_LP_DEVICE_ID_TYPE:
>  		drm_dbg_kms(&dev_priv->drm, "Found SunrisePoint LP PCH\n");
> -- 
> 2.25.1
>