From: Thomas Hellström Date: Thu, 2 May 2024 07:46:12 +0000 (+0200) Subject: Merge drm/drm-next into drm-xe-next X-Git-Url: https://repo.jachan.dev/J-linux.git/commitdiff_plain/ae22b2f1c8ccd9a3e5f19e3ebb4ef6ec1e8655e0 Merge drm/drm-next into drm-xe-next Avoid falling too far behind drm-next. Signed-off-by: Thomas Hellström --- ae22b2f1c8ccd9a3e5f19e3ebb4ef6ec1e8655e0 diff --cc drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h index 9ee694bf331f,ffaa4d2f1eed..cd4632276141 --- a/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h +++ b/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h @@@ -84,11 -78,8 +78,9 @@@ static inline struct drm_i915_private * #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_XEHPSDV(dev_priv) (dev_priv && 0) #define IS_DG2(dev_priv) IS_PLATFORM(dev_priv, XE_DG2) - #define IS_PONTEVECCHIO(dev_priv) IS_PLATFORM(dev_priv, XE_PVC) #define IS_METEORLAKE(dev_priv) IS_PLATFORM(dev_priv, XE_METEORLAKE) #define IS_LUNARLAKE(dev_priv) IS_PLATFORM(dev_priv, XE_LUNARLAKE) #define IS_BATTLEMAGE(dev_priv) IS_PLATFORM(dev_priv, XE_BATTLEMAGE)