Messages in this thread Patch in this message | | | From | "Garg, Nemesa" <> | Subject | [PATCH dii-client 3/3] REVIEW: Full tree diff against origin/dii-client | Date | Wed, 1 Mar 2023 16:54:45 +0530 |
| |
Auto-generated diff between origin/dii-client..dii-client --- drivers/gpu/drm/i915/i915_drv.h | 2 ++ drivers/gpu/drm/i915/intel_device_info.c | 7 +++++++ drivers/gpu/drm/i915/intel_device_info.h | 1 + drivers/gpu/drm/i915/soc/intel_pch.c | 6 ++++-- include/drm/i915_pciids.h | 11 +++++++++-- 5 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index da3ee9b27747..0490fa282663 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -574,6 +574,8 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915, IS_SUBPLATFORM(dev_priv, INTEL_METEORLAKE, INTEL_SUBPLATFORM_M) #define IS_METEORLAKE_P(dev_priv) \ IS_SUBPLATFORM(dev_priv, INTEL_METEORLAKE, INTEL_SUBPLATFORM_P) +#define IS_ARROWLAKE_P(dev_priv) \ + IS_SUBPLATFORM(dev_priv, INTEL_METEORLAKE, INTEL_SUBPLATFORM_ARL_P) #define IS_DG2_G10(dev_priv) \ IS_SUBPLATFORM(dev_priv, INTEL_DG2, INTEL_SUBPLATFORM_G10) #define IS_DG2_G11(dev_priv) \ diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c index 98769e5f2c3d..bda73201417f 100644 --- a/drivers/gpu/drm/i915/intel_device_info.c +++ b/drivers/gpu/drm/i915/intel_device_info.c @@ -224,6 +224,10 @@ static const u16 subplatform_p_ids[] = { INTEL_MTL_P_IDS(0), }; +static const u16 subplatform_arl_p_ids[] = { + INTEL_ARL_P_IDS(0), +}; + static bool find_devid(u16 id, const u16 *p, unsigned int num) { for (; num; num--, p++) { @@ -284,6 +288,9 @@ static void intel_device_info_subplatform_init(struct drm_i915_private *i915) } else if (find_devid(devid, subplatform_p_ids, ARRAY_SIZE(subplatform_p_ids))) { mask = BIT(INTEL_SUBPLATFORM_P); + } else if (find_devid(devid, subplatform_arl_p_ids, + ARRAY_SIZE(subplatform_arl_p_ids))) { + mask = BIT(INTEL_SUBPLATFORM_ARL_P); } GEM_BUG_ON(mask & ~INTEL_SUBPLATFORM_MASK); diff --git a/drivers/gpu/drm/i915/intel_device_info.h b/drivers/gpu/drm/i915/intel_device_info.h index 80bda653d61b..eba718d98482 100644 --- a/drivers/gpu/drm/i915/intel_device_info.h +++ b/drivers/gpu/drm/i915/intel_device_info.h @@ -131,6 +131,7 @@ enum intel_platform { /* MTL */ #define INTEL_SUBPLATFORM_M 0 #define INTEL_SUBPLATFORM_P 1 +#define INTEL_SUBPLATFORM_ARL_P 2 enum intel_ppgtt_type { INTEL_PPGTT_NONE = I915_GEM_PPGTT_NONE, diff --git a/drivers/gpu/drm/i915/soc/intel_pch.c b/drivers/gpu/drm/i915/soc/intel_pch.c index ba9843cb1b13..82ac8d978eef 100644 --- a/drivers/gpu/drm/i915/soc/intel_pch.c +++ b/drivers/gpu/drm/i915/soc/intel_pch.c @@ -171,7 +171,7 @@ intel_virt_detect_pch(const struct drm_i915_private *dev_priv, * make an educated guess as to which PCH is really there. */ - if (IS_METEORLAKE(dev_priv)) + if (IS_METEORLAKE(dev_priv) || IS_ARROWLAKE_P(dev_priv)) id = INTEL_PCH_MTP_DEVICE_ID_TYPE; else if (IS_ALDERLAKE_S(dev_priv) || IS_ALDERLAKE_P(dev_priv)) id = INTEL_PCH_ADP_DEVICE_ID_TYPE; @@ -223,7 +223,9 @@ void intel_detect_pch(struct drm_i915_private *dev_priv) } else if (IS_DG2(dev_priv)) { dev_priv->pch_type = PCH_DG2; return; - } + } else if (IS_ARROWLAKE_P(dev_priv)) { + dev_priv->pch_type = PCH_MTP; + return; /* * The reason to probe ISA bridge instead of Dev31:Fun0 is to diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h index 92205054e542..cc3f01c7e98b 100644 --- a/include/drm/i915_pciids.h +++ b/include/drm/i915_pciids.h @@ -738,15 +738,22 @@ /* MTL */ #define INTEL_MTL_M_IDS(info) \ INTEL_VGA_DEVICE(0x7D40, info), \ - INTEL_VGA_DEVICE(0x7D60, info) + INTEL_VGA_DEVICE(0x7D41, info), \ + INTEL_VGA_DEVICE(0x7D60, info), \ + INTEL_VGA_DEVICE(0x7D67, info) #define INTEL_MTL_P_IDS(info) \ INTEL_VGA_DEVICE(0x7D45, info), \ INTEL_VGA_DEVICE(0x7D55, info), \ INTEL_VGA_DEVICE(0x7DD5, info) +#define INTEL_ARL_P_IDS(info) \ + INTEL_VGA_DEVICE(0x7D51, info), \ + INTEL_VGA_DEVICE(0x7DD1, info) + #define INTEL_MTL_IDS(info) \ INTEL_MTL_M_IDS(info), \ - INTEL_MTL_P_IDS(info) + INTEL_MTL_P_IDS(info), \ + INTEL_ARL_P_IDS(info) #endif /* _I915_PCIIDS_H */ -- git-pile 1.1
| |