drm/i915/pch: fix warning for coffeelake on SunrisePoint PCH
authorJiajia Liu <liujiajia@kylinos.cn>
Wed, 23 Apr 2025 07:37:30 +0000 (15:37 +0800)
committerRodrigo Vivi <rodrigo.vivi@intel.com>
Tue, 29 Apr 2025 21:18:50 +0000 (17:18 -0400)
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].

[5.608723] i915 0000:00:02.0: [drm] Found coffeelake (device ID 3e92) integrated display version 9.00 stepping N/A
[5.608969] ------------[ cut here ]------------
[5.608972] i915 0000:00:02.0: [drm] drm_WARN_ON(!display->platform.skylake && !display->platform.kabylake)
[5.608995] WARNING: CPU: 3 PID: 440 at drivers/gpu/drm/i915/display/intel_pch.c:126 intel_pch_type+0x1af/0xae0 [i915]
[5.609317] CPU: 3 UID: 0 PID: 440 Comm: (udev-worker) Not tainted 6.15.0-rc3-drm-tip-2fa6469c618d #3 PREEMPT(voluntary)

Signed-off-by: Jiajia Liu <liujiajia@kylinos.cn>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://lore.kernel.org/r/20250423073730.585181-1-liujiajia@kylinos.cn
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
drivers/gpu/drm/i915/display/intel_pch.c

index 5035b63a48891dd315d771a73b3f6af0d280dff6..469e8a3cfb49fa8267ca65dee5d2b3bfdcce8fef 100644 (file)
@@ -125,7 +125,8 @@ intel_pch_type(const struct intel_display *display, unsigned short id)
                drm_dbg_kms(display->drm, "Found SunrisePoint PCH\n");
                drm_WARN_ON(display->drm,
                            !display->platform.skylake &&
-                           !display->platform.kabylake);
+                           !display->platform.kabylake &&
+                           !display->platform.coffeelake);
                return PCH_SPT;
        case INTEL_PCH_SPT_LP_DEVICE_ID_TYPE:
                drm_dbg_kms(display->drm, "Found SunrisePoint LP PCH\n");