From: Lucas De Marchi <lucas.demarchi@intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [Intel-gfx] [CI 06/22] drm/i915/xe2lpd: Add fake PCH
Date: Tue, 19 Sep 2023 12:21:12 -0700 [thread overview]
Message-ID: <20230919192128.2045154-6-lucas.demarchi@intel.com> (raw)
In-Reply-To: <20230919192128.2045154-1-lucas.demarchi@intel.com>
From: Gustavo Sousa <gustavo.sousa@intel.com>
Xe2_LPD doesn't have south display engine on a PCH, it's actually
on the SoC die (while north display engine is on compute die). As
such it makes no sense to go through the PCI devices looking for
an ISA bridge. The approach used by BXT/GLK can't be used here since
leaving it with PCH_NONE would mean taking the wrong code paths.
For the places we currently use a PCH check, it's enough for now to just
check the north display version. Use that to define a fake PCH to be
used across the driver. Eventually these PCH checks may need to be
re-designed as this is already the third platform using/needing a
fake PCH.
v2: Match on display IP version rather than on platform (Matt Roper)
v3: Extend and clarify commit message (Matt Roper / Ville)
Signed-off-by: Gustavo Sousa <gustavo.sousa@intel.com>
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
---
drivers/gpu/drm/i915/soc/intel_pch.c | 5 ++++-
drivers/gpu/drm/i915/soc/intel_pch.h | 2 ++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/soc/intel_pch.c b/drivers/gpu/drm/i915/soc/intel_pch.c
index dfffdfa50b97..240beafb38ed 100644
--- a/drivers/gpu/drm/i915/soc/intel_pch.c
+++ b/drivers/gpu/drm/i915/soc/intel_pch.c
@@ -222,7 +222,10 @@ void intel_detect_pch(struct drm_i915_private *dev_priv)
* South display engine on the same PCI device: just assign the fake
* PCH.
*/
- if (IS_DG2(dev_priv)) {
+ if (DISPLAY_VER(dev_priv) >= 20) {
+ dev_priv->pch_type = PCH_LNL;
+ return;
+ } else if (IS_DG2(dev_priv)) {
dev_priv->pch_type = PCH_DG2;
return;
} else if (IS_DG1(dev_priv)) {
diff --git a/drivers/gpu/drm/i915/soc/intel_pch.h b/drivers/gpu/drm/i915/soc/intel_pch.h
index 32aff5a70d04..1b03ea60a7a8 100644
--- a/drivers/gpu/drm/i915/soc/intel_pch.h
+++ b/drivers/gpu/drm/i915/soc/intel_pch.h
@@ -30,6 +30,7 @@ enum intel_pch {
/* Fake PCHs, functionality handled on the same PCI dev */
PCH_DG1 = 1024,
PCH_DG2,
+ PCH_LNL,
};
#define INTEL_PCH_DEVICE_ID_MASK 0xff80
@@ -66,6 +67,7 @@ enum intel_pch {
#define INTEL_PCH_TYPE(dev_priv) ((dev_priv)->pch_type)
#define INTEL_PCH_ID(dev_priv) ((dev_priv)->pch_id)
+#define HAS_PCH_LNL(dev_priv) (INTEL_PCH_TYPE(dev_priv) == PCH_LNL)
#define HAS_PCH_MTP(dev_priv) (INTEL_PCH_TYPE(dev_priv) == PCH_MTP)
#define HAS_PCH_DG2(dev_priv) (INTEL_PCH_TYPE(dev_priv) == PCH_DG2)
#define HAS_PCH_ADP(dev_priv) (INTEL_PCH_TYPE(dev_priv) == PCH_ADP)
--
2.40.1
next prev parent reply other threads:[~2023-09-19 19:21 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-19 19:21 [Intel-gfx] [CI 01/22] drm/i915/xelpdp: Add XE_LPDP_FEATURES Lucas De Marchi
2023-09-19 19:21 ` [Intel-gfx] [CI 02/22] drm/i915/lnl: Add display definitions Lucas De Marchi
2023-09-19 19:21 ` [Intel-gfx] [CI 03/22] drm/i915/xe2lpd: FBC is now supported on all pipes Lucas De Marchi
2023-09-19 19:21 ` [Intel-gfx] [CI 04/22] drm/i915/display: Remove FBC capability from fused off pipes Lucas De Marchi
2023-09-19 19:21 ` [Intel-gfx] [CI 05/22] drm/i915: Re-order if/else ladder in intel_detect_pch() Lucas De Marchi
2023-09-19 19:21 ` Lucas De Marchi [this message]
2023-09-19 19:21 ` [Intel-gfx] [CI 07/22] drm/i915/xe2lpd: Treat cursor plane as regular plane for DDB allocation Lucas De Marchi
2023-09-19 19:21 ` [Intel-gfx] [CI 08/22] drm/i915/xe2lpd: Don't try to program PLANE_AUX_DIST Lucas De Marchi
2023-09-19 19:21 ` [Intel-gfx] [CI 09/22] drm/i915/xe2lpd: Register DE_RRMR has been removed Lucas De Marchi
2023-09-19 19:21 ` [Intel-gfx] [CI 10/22] drm/i915/display: Fix style and conventions for DP AUX regs Lucas De Marchi
2023-09-19 19:21 ` [Intel-gfx] [CI 11/22] drm/i915/display: Use _PICK_EVEN_2RANGES() in " Lucas De Marchi
2023-09-19 19:21 ` [Intel-gfx] [CI 12/22] drm/i915/xe2lpd: Re-order " Lucas De Marchi
2023-09-19 19:21 ` [Intel-gfx] [CI 13/22] drm/i915/xe2lpd: Handle port AUX interrupts Lucas De Marchi
2023-09-19 19:21 ` [Intel-gfx] [CI 14/22] drm/i915/xe2lpd: Read pin assignment from IOM Lucas De Marchi
2023-09-19 19:21 ` [Intel-gfx] [CI 15/22] drm/i915/xe2lpd: Enable odd size and panning for planar yuv Lucas De Marchi
2023-09-19 19:21 ` [Intel-gfx] [CI 16/22] drm/i915/xe2lpd: Add support for HPD Lucas De Marchi
2023-09-19 19:21 ` [Intel-gfx] [CI 17/22] drm/i915/xe2lpd: Extend Wa_15010685871 Lucas De Marchi
2023-09-19 19:21 ` [Intel-gfx] [CI 18/22] drm/i915/lnl: Add gmbus/ddc support Lucas De Marchi
2023-09-19 19:21 ` [Intel-gfx] [CI 19/22] drm/i915/lnl: Add CDCLK table Lucas De Marchi
2023-09-19 19:21 ` [Intel-gfx] [CI 20/22] drm/i915/xe2lpd: Add display power well Lucas De Marchi
2023-09-19 19:21 ` [Intel-gfx] [CI 21/22] drm/i915/xe2lpd: Add DC state support Lucas De Marchi
2023-09-19 19:21 ` [Intel-gfx] [CI 22/22] drm/i915/lnl: Start using CDCLK through PLL Lucas De Marchi
2023-09-19 22:37 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for series starting with [CI,01/22] drm/i915/xelpdp: Add XE_LPDP_FEATURES Patchwork
2023-09-19 22:37 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2023-09-19 22:55 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2023-09-20 10:11 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
2023-09-21 15:24 ` Lucas De Marchi
2023-09-20 16:03 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for series starting with [CI,01/22] drm/i915/xelpdp: Add XE_LPDP_FEATURES (rev2) Patchwork
2023-09-20 16:03 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2023-09-20 16:19 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230919192128.2045154-6-lucas.demarchi@intel.com \
--to=lucas.demarchi@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).