]> git.dujemihanovic.xyz Git - linux.git/commit
drm/xe/display: Fix ADL-N detection
authorLucas De Marchi <lucas.demarchi@intel.com>
Thu, 25 Apr 2024 18:16:09 +0000 (11:16 -0700)
committerLucas De Marchi <lucas.demarchi@intel.com>
Fri, 26 Apr 2024 15:00:29 +0000 (08:00 -0700)
commit6a2a90cba12b42eb96c2af3426b77ceb4be31df2
treeaabb93362eec03b49a696694d8dec8b87c3d131b
parent445237d67a818c18a748602f8eaa4b52f8c6b39c
drm/xe/display: Fix ADL-N detection

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.

Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Acked-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240425181610.2704633-1-lucas.demarchi@intel.com
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h