intel-xe.lists.freedesktop.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] drm/xe/display: Fix ADL-N detection
@ 2024-04-25 18:16 Lucas De Marchi
  2024-04-25 18:21 ` ✓ CI.Patch_applied: success for " Patchwork
                   ` (15 more replies)
  0 siblings, 16 replies; 18+ messages in thread
From: Lucas De Marchi @ 2024-04-25 18:16 UTC (permalink / raw)
  To: intel-gfx, intel-xe; +Cc: Jani Nikula, Matt Roper, Lucas De Marchi

Contrary to i915, in xe ADL-N is kept as a different platform, not a
subplatform of ADL-P. Since the display side doesn't need to
differentiate between P and N, i.e. IS_ALDERLAKE_P_N() is never called,
just fixup the compat header to check for both P and N.

Moving ADL-N to be a subplatform would be more complex as the firmware
loading in xe only handles platforms, not subplatforms, as going forward
the direction is to check on IP version rather than
platforms/subplatforms.

Fix warning when initializing display:

	xe 0000:00:02.0: [drm:intel_pch_type [xe]] Found Alder Lake PCH
	------------[ cut here ]------------
	xe 0000:00:02.0: drm_WARN_ON(!((dev_priv)->info.platform == XE_ALDERLAKE_S) && !((dev_priv)->info.platform == XE_ALDERLAKE_P))

And wrong paths being taken on the display side.

Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
---
 drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h b/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h
index ffaa4d2f1eed..cd4632276141 100644
--- a/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h
+++ b/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h
@@ -78,7 +78,8 @@ static inline struct drm_i915_private *kdev_to_i915(struct device *kdev)
 #define IS_ROCKETLAKE(dev_priv)	IS_PLATFORM(dev_priv, XE_ROCKETLAKE)
 #define IS_DG1(dev_priv)        IS_PLATFORM(dev_priv, XE_DG1)
 #define IS_ALDERLAKE_S(dev_priv) IS_PLATFORM(dev_priv, XE_ALDERLAKE_S)
-#define IS_ALDERLAKE_P(dev_priv) IS_PLATFORM(dev_priv, XE_ALDERLAKE_P)
+#define IS_ALDERLAKE_P(dev_priv) (IS_PLATFORM(dev_priv, XE_ALDERLAKE_P) || \
+				  IS_PLATFORM(dev_priv, XE_ALDERLAKE_N))
 #define IS_DG2(dev_priv)	IS_PLATFORM(dev_priv, XE_DG2)
 #define IS_METEORLAKE(dev_priv) IS_PLATFORM(dev_priv, XE_METEORLAKE)
 #define IS_LUNARLAKE(dev_priv) IS_PLATFORM(dev_priv, XE_LUNARLAKE)
-- 
2.43.0


^ permalink raw reply related	[flat|nested] 18+ messages in thread

end of thread, other threads:[~2024-04-26 21:54 UTC | newest]

Thread overview: 18+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-04-25 18:16 [PATCH] drm/xe/display: Fix ADL-N detection Lucas De Marchi
2024-04-25 18:21 ` ✓ CI.Patch_applied: success for " Patchwork
2024-04-25 18:21 ` ✗ CI.checkpatch: warning " Patchwork
2024-04-25 18:22 ` ✓ CI.KUnit: success " Patchwork
2024-04-25 18:22 ` [PATCH] " Matt Roper
2024-04-26 21:54   ` Lucas De Marchi
2024-04-25 18:35 ` ✓ CI.Build: success for " Patchwork
2024-04-25 18:43 ` ✗ CI.Hooks: failure " Patchwork
2024-04-25 18:44 ` ✗ CI.checksparse: warning " Patchwork
2024-04-25 19:11 ` ✓ CI.BAT: success " Patchwork
2024-04-26 13:45 ` ✓ CI.Patch_applied: success for drm/xe/display: Fix ADL-N detection (rev2) Patchwork
2024-04-26 13:46 ` ✗ CI.checkpatch: warning " Patchwork
2024-04-26 13:47 ` ✓ CI.KUnit: success " Patchwork
2024-04-26 13:59 ` ✓ CI.Build: " Patchwork
2024-04-26 14:01 ` ✓ CI.Hooks: " Patchwork
2024-04-26 14:03 ` ✓ CI.checksparse: " Patchwork
2024-04-26 14:34 ` ✓ CI.BAT: " Patchwork
2024-04-26 17:54 ` ✗ CI.FULL: failure " Patchwork

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).