i915: Introduce Meteorlake
Subsystems (2)
cover i915: Introduce Meteorlake
Meteorlake is a new client platform following RPL S. Meteorlake introduces version 14 for Display, version 13 Media and version 12.70 for Graphics.
This is the basic platform definition series to introduce Meteorlake.
Radhakrishna Sripada (2):
drm/i915/mtl: Add MeteorLake platform info
drm/i915/mtl: Add MeteorLake PCI IDs
drivers/gpu/drm/i915/i915_drv.h | 5 +++++ drivers/gpu/drm/i915/i915_pci.c | 26 ++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_device_info.c | 15 ++++++++++++++ drivers/gpu/drm/i915/intel_device_info.h | 5 +++++ include/drm/i915_pciids.h | 19 +++++++++++++++++ 5 files changed, 70 insertions(+)
Signature · 1 line
2.25.1
PATCH 1/2 drm/i915/mtl: Add MeteorLake platform info
MTL has Xe_LPD+ display IP (version = 14), MTL graphics IP (version = 12.70), and Xe_LPM+ media IP (version = 13).
Bspec: 55413
Bspec: 55416
Bspec: 55417
Bspec: 55418
Bspec: 55726
Bspec: 45544
Bspec: 65380
--- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/i915_pci.c | 25 ++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_device_info.c | 1 + drivers/gpu/drm/i915/intel_device_info.h | 1 + 4 files changed, 28 insertions(+)
drivers/gpu/drm/i915/i915_drv.h +1 -0
@@ -999,6 +999,7 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915, IS_SUBPLATFORM(dev_priv, INTEL_ALDERLAKE_P, INTEL_SUBPLATFORM_N)#define IS_ADLP_RPLP (dev_priv) \ IS_SUBPLATFORM(dev_priv, INTEL_ALDERLAKE_P, INTEL_SUBPLATFORM_RPL) +#define IS_METEORLAKE (dev_priv) IS_PLATFORM(dev_priv, INTEL_METEORLAKE)#define IS_HSW_EARLY_SDV (dev_priv) (IS_HASWELL(dev_priv) && \ (INTEL_DEVID(dev_priv) & 0xFF00) == 0x0C00)#define IS_BDW_ULT (dev_priv) \
drivers/gpu/drm/i915/i915_pci.c +25 -0
@@ -1069,6 +1069,31 @@ static const struct intel_device_info ats_m_info = { .require_force_probe = 1, }; +#define XE_LPDP_FEATURES \ + XE_LPD_FEATURES, \ + .display.ver = 14, \ + .display.has_cdclk_crawl = 1 + +__maybe_unused +static const struct intel_device_info mtl_info = { +XE_HP_FEATURES , +XE_LPDP_FEATURES , +/* +* Real graphics IP version will be obtained from hardware GMD_ID +* register. Value provided here is just for sanity checking. +*/ + .graphics.ver =12 , + .graphics.rel =70 , + .media.ver =13 , + .memory_regions =REGION_SMEM |REGION_STOLEN_LMEM , +PLATFORM (INTEL_METEORLAKE ), + .platform_engine_mask =BIT (RCS0 ) |BIT (BCS0 ) |BIT (CCS0 ), + .require_force_probe =1 , + .has_flat_ccs =0 , + .has_snoop =1 , + .display.has_modular_fia =1 , +}; +#undef PLATFORM/*
drivers/gpu/drm/i915/intel_device_info.c +1 -0
@@ -72,6 +72,7 @@ static const char * const platform_names[] = {PLATFORM_NAME (ALDERLAKE_P ),PLATFORM_NAME (XEHPSDV ),PLATFORM_NAME (DG2 ), + PLATFORM_NAME(METEORLAKE), };#undef PLATFORM_NAME
drivers/gpu/drm/i915/intel_device_info.h +1 -0
@@ -88,6 +88,7 @@ enum intel_platform {INTEL_ALDERLAKE_P ,INTEL_XEHPSDV ,INTEL_DG2 , +INTEL_METEORLAKE , INTEL_MAX_PLATFORMS };
Signature · 1 line
2.25.1
Re: [Intel-gfx] [PATCH 1/2] drm/i915/mtl: Add MeteorLake platform info
Quoted 22 lines
-----Original Message-----
From: Intel-gfx <[email protected]> On Behalf Of Radhakrishna Sripada
Sent: Thursday, July 7, 2022 6:01 AM
To: [email protected]
Cc: Nikula, Jani <[email protected]>; De Marchi, Lucas <[email protected]>; Vivi, Rodrigo <[email protected]>
Subject: [Intel-gfx] [PATCH 1/2] drm/i915/mtl: Add MeteorLake platform infoMTL has Xe_LPD+ display IP (version = 14), MTL graphics IP (version = 12.70), and Xe_LPM+ media IP (version = 13).
Bspec: 55413
Bspec: 55416
Bspec: 55417
Bspec: 55418
Bspec: 55726
Bspec: 45544
Bspec: 65380
Quoted 3 lines
Cc Matt Roper <[email protected]>Signed-off-by Radhakrishna Sripada <[email protected]>---
Thanks and Regards,
Arun R Murthy
-------------------
PATCH 2/2 drm/i915/mtl: Add MeteorLake PCI IDs
In reply to Radhakrishna SripadaAdd Meteorlake PCI IDs. Split into M, and P subplatforms.
Bspec: 55420
--- drivers/gpu/drm/i915/i915_drv.h | 4 ++++ drivers/gpu/drm/i915/i915_pci.c | 1 + drivers/gpu/drm/i915/intel_device_info.c | 14 ++++++++++++++ drivers/gpu/drm/i915/intel_device_info.h | 4 ++++ include/drm/i915_pciids.h | 19 +++++++++++++++++++ 5 files changed, 42 insertions(+)
drivers/gpu/drm/i915/i915_drv.h +4 -0
@@ -1000,6 +1000,10 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,#define IS_ADLP_RPLP (dev_priv) \ IS_SUBPLATFORM(dev_priv, INTEL_ALDERLAKE_P, INTEL_SUBPLATFORM_RPL)#define IS_METEORLAKE (dev_priv) IS_PLATFORM(dev_priv, INTEL_METEORLAKE) +#define IS_METEORLAKE_M (dev_priv) \ + 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_HSW_EARLY_SDV (dev_priv) (IS_HASWELL(dev_priv) && \ (INTEL_DEVID(dev_priv) & 0xFF00) == 0x0C00)#define IS_BDW_ULT (dev_priv) \
drivers/gpu/drm/i915/i915_pci.c +1 -0
@@ -1175,6 +1175,7 @@ static const struct pci_device_id pciidlist[] = {INTEL_RPLS_IDS (&adl_s_info),INTEL_RPLP_IDS (&adl_p_info),INTEL_DG2_IDS (&dg2_info), +INTEL_MTL_IDS (&mtl_info), {0, 0, 0} };MODULE_DEVICE_TABLE (pci, pciidlist);
drivers/gpu/drm/i915/intel_device_info.c +14 -0
@@ -199,6 +199,14 @@ static const u16 subplatform_g12_ids[] = { INTEL_DG2_G12_IDS(0), }; +static const u16 subplatform_m_ids[] = { +INTEL_MTL_M_IDS (0 ), +}; + +static const u16 subplatform_p_ids[] = { +INTEL_MTL_P_IDS (0 ), +}; +static bool find_devid (u16 id,const u16 *p,unsigned int num) {for (; num; num--, p++) {
@@ -253,6 +261,12 @@ void intel_device_info_subplatform_init(struct drm_i915_private *i915) }else if (find_devid (devid, subplatform_g12_ids,ARRAY_SIZE (subplatform_g12_ids))) { mask =BIT (INTEL_SUBPLATFORM_G12 ); + }else if (find_devid (devid, subplatform_m_ids, +ARRAY_SIZE (subplatform_m_ids))) { + mask =BIT (INTEL_SUBPLATFORM_M ); + }else if (find_devid (devid, subplatform_p_ids, +ARRAY_SIZE (subplatform_p_ids))) { + mask =BIT (INTEL_SUBPLATFORM_P ); }GEM_BUG_ON (mask & ~INTEL_SUBPLATFORM_MASK );
drivers/gpu/drm/i915/intel_device_info.h +4 -0
@@ -126,6 +126,10 @@ enum intel_platform {*/ #define INTEL_SUBPLATFORM_N 1 +/* MTL */ +#define INTEL_SUBPLATFORM_M 0 +#define INTEL_SUBPLATFORM_P 1 +enum intel_ppgtt_type {INTEL_PPGTT_NONE =I915_GEM_PPGTT_NONE ,INTEL_PPGTT_ALIASING =I915_GEM_PPGTT_ALIASING ,
include/drm/i915_pciids.h +19 -0
@@ -714,4 +714,23 @@INTEL_DG2_G11_IDS (info), \INTEL_DG2_G12_IDS (info) +/* MTL */ +#define INTEL_MTL_M_IDS (info) \ + INTEL_VGA_DEVICE(0x7D40, info), \ + INTEL_VGA_DEVICE(0x7D43, info), \ + INTEL_VGA_DEVICE(0x7DC0, info) + +#define INTEL_MTL_P_IDS (info) \ + INTEL_VGA_DEVICE(0x7D45, info), \ + INTEL_VGA_DEVICE(0x7D47, info), \ + INTEL_VGA_DEVICE(0x7D55, info), \ + INTEL_VGA_DEVICE(0x7D60, info), \ + INTEL_VGA_DEVICE(0x7DC5, info), \ + INTEL_VGA_DEVICE(0x7DD5, info), \ + INTEL_VGA_DEVICE(0x7DE0, info) + +#define INTEL_MTL_IDS (info) \ + INTEL_MTL_M_IDS(info), \ + INTEL_MTL_P_IDS(info) +#endif /* _I915_PCIIDS_H */
Signature · 1 line
2.25.1
Re: [Intel-gfx] [PATCH 2/2] drm/i915/mtl: Add MeteorLake PCI IDs
Quoted 11 lines
-----Original Message-----
From: Intel-gfx <[email protected]> On Behalf Of Radhakrishna Sripada
Sent: Thursday, July 7, 2022 6:01 AM
To: [email protected]
Cc: Nikula, Jani <[email protected]>; De Marchi, Lucas <[email protected]>; Vivi, Rodrigo <[email protected]>
Subject: [Intel-gfx] [PATCH 2/2] drm/i915/mtl: Add MeteorLake PCI IDs
Quoted 7 lines
Add Meteorlake PCI IDs. Split into M, and P subplatforms.
Bspec: 55420
Signed-off-by Radhakrishna Sripada <[email protected]>Signed-off-by Matt Roper <[email protected]>---
Thanks and Regards,
Arun R Murthy
--------------------
Patchwork
CI[Intel-gfx] ✗ Fi.CI.BUILD: failure for i915: Introduce Meteorlake
In reply to Radhakrishna Sripada== Series Details ==
== Series Details ==
Series: i915: Introduce Meteorlake
URL : https://patchwork.freedesktop.org/series/106000/
State : failure
== Summary ==
Error: patch https://patchwork.freedesktop.org/api/1.0/series/106000/revisions/1/mbox/ not applied
Applying: drm/i915/mtl: Add MeteorLake platform info
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/i915_drv.h
M drivers/gpu/drm/i915/i915_pci.c
M drivers/gpu/drm/i915/intel_device_info.c
M drivers/gpu/drm/i915/intel_device_info.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/intel_device_info.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_device_info.h Auto-merging drivers/gpu/drm/i915/intel_device_info.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_device_info.c Auto-merging drivers/gpu/drm/i915/i915_pci.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_pci.c
Auto-merging drivers/gpu/drm/i915/i915_drv.h
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 drm/i915/mtl: Add MeteorLake platform info
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Patchwork
CI[Intel-gfx] ✗ Fi.CI.BUILD: failure for i915: Introduce Meteorlake (rev2)
In reply to Radhakrishna Sripada== Series Details ==
== Series Details ==
Series: i915: Introduce Meteorlake (rev2)
URL : https://patchwork.freedesktop.org/series/106000/
State : failure
== Summary ==
Error: patch https://patchwork.freedesktop.org/api/1.0/series/106000/revisions/2/mbox/ not applied
Applying: drm/i915/mtl: Add MeteorLake platform info
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/i915_drv.h
M drivers/gpu/drm/i915/i915_pci.c
M drivers/gpu/drm/i915/intel_device_info.c
M drivers/gpu/drm/i915/intel_device_info.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/intel_device_info.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_device_info.h Auto-merging drivers/gpu/drm/i915/intel_device_info.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_device_info.c Auto-merging drivers/gpu/drm/i915/i915_pci.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_pci.c
Auto-merging drivers/gpu/drm/i915/i915_drv.h
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 drm/i915/mtl: Add MeteorLake platform info
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
cover i915: Introduce Meteorlake
In reply to Radhakrishna SripadaMeteorlake is a new client platform following RPL S. Meteorlake introduces version 14 for Display, version 13 Media and version 12.70 for Graphics.
This is the basic platform definition series to introduce Meteorlake.
Radhakrishna Sripada (2):
drm/i915/mtl: Add MeteorLake platform info
drm/i915/mtl: Add MeteorLake PCI IDs
drivers/gpu/drm/i915/i915_drv.h | 5 +++++ drivers/gpu/drm/i915/i915_pci.c | 26 ++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_device_info.c | 15 ++++++++++++++ drivers/gpu/drm/i915/intel_device_info.h | 5 +++++ include/drm/i915_pciids.h | 19 +++++++++++++++++ 5 files changed, 70 insertions(+)
Signature · 1 line
2.25.1
PATCH 1/2 drm/i915/mtl: Add MeteorLake platform info
MTL has Xe_LPD+ display IP (version = 14), MTL graphics IP (version = 12.70), and Xe_LPM+ media IP (version = 13).
Bspec: 55413
Bspec: 55416
Bspec: 55417
Bspec: 55418
Bspec: 55726
Bspec: 45544
Bspec: 65380
--- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/i915_pci.c | 25 ++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_device_info.c | 1 + drivers/gpu/drm/i915/intel_device_info.h | 1 + 4 files changed, 28 insertions(+)
drivers/gpu/drm/i915/i915_drv.h +1 -0
@@ -999,6 +999,7 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915, IS_SUBPLATFORM(dev_priv, INTEL_ALDERLAKE_P, INTEL_SUBPLATFORM_N)#define IS_ADLP_RPLP (dev_priv) \ IS_SUBPLATFORM(dev_priv, INTEL_ALDERLAKE_P, INTEL_SUBPLATFORM_RPL) +#define IS_METEORLAKE (dev_priv) IS_PLATFORM(dev_priv, INTEL_METEORLAKE)#define IS_HSW_EARLY_SDV (dev_priv) (IS_HASWELL(dev_priv) && \ (INTEL_DEVID(dev_priv) & 0xFF00) == 0x0C00)#define IS_BDW_ULT (dev_priv) \
drivers/gpu/drm/i915/i915_pci.c +25 -0
@@ -1069,6 +1069,31 @@ static const struct intel_device_info ats_m_info = { .require_force_probe = 1, }; +#define XE_LPDP_FEATURES \ + XE_LPD_FEATURES, \ + .display.ver = 14, \ + .display.has_cdclk_crawl = 1 + +__maybe_unused +static const struct intel_device_info mtl_info = { +XE_HP_FEATURES , +XE_LPDP_FEATURES , +/* +* Real graphics IP version will be obtained from hardware GMD_ID +* register. Value provided here is just for sanity checking. +*/ + .graphics.ver =12 , + .graphics.rel =70 , + .media.ver =13 , + .memory_regions =REGION_SMEM |REGION_STOLEN_LMEM , +PLATFORM (INTEL_METEORLAKE ), + .platform_engine_mask =BIT (RCS0 ) |BIT (BCS0 ) |BIT (CCS0 ), + .require_force_probe =1 , + .has_flat_ccs =0 , + .has_snoop =1 , + .display.has_modular_fia =1 , +}; +#undef PLATFORM/*
drivers/gpu/drm/i915/intel_device_info.c +1 -0
@@ -72,6 +72,7 @@ static const char * const platform_names[] = {PLATFORM_NAME (ALDERLAKE_P ),PLATFORM_NAME (XEHPSDV ),PLATFORM_NAME (DG2 ), + PLATFORM_NAME(METEORLAKE), };#undef PLATFORM_NAME
drivers/gpu/drm/i915/intel_device_info.h +1 -0
@@ -88,6 +88,7 @@ enum intel_platform {INTEL_ALDERLAKE_P ,INTEL_XEHPSDV ,INTEL_DG2 , +INTEL_METEORLAKE , INTEL_MAX_PLATFORMS };
Signature · 1 line
2.25.1
PATCH 2/2 drm/i915/mtl: Add MeteorLake PCI IDs
In reply to Radhakrishna SripadaAdd Meteorlake PCI IDs. Split into M, and P subplatforms.
Bspec: 55420
--- drivers/gpu/drm/i915/i915_drv.h | 4 ++++ drivers/gpu/drm/i915/i915_pci.c | 1 + drivers/gpu/drm/i915/intel_device_info.c | 14 ++++++++++++++ drivers/gpu/drm/i915/intel_device_info.h | 4 ++++ include/drm/i915_pciids.h | 19 +++++++++++++++++++ 5 files changed, 42 insertions(+)
drivers/gpu/drm/i915/i915_drv.h +4 -0
@@ -1000,6 +1000,10 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,#define IS_ADLP_RPLP (dev_priv) \ IS_SUBPLATFORM(dev_priv, INTEL_ALDERLAKE_P, INTEL_SUBPLATFORM_RPL)#define IS_METEORLAKE (dev_priv) IS_PLATFORM(dev_priv, INTEL_METEORLAKE) +#define IS_METEORLAKE_M (dev_priv) \ + 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_HSW_EARLY_SDV (dev_priv) (IS_HASWELL(dev_priv) && \ (INTEL_DEVID(dev_priv) & 0xFF00) == 0x0C00)#define IS_BDW_ULT (dev_priv) \
drivers/gpu/drm/i915/i915_pci.c +1 -0
@@ -1175,6 +1175,7 @@ static const struct pci_device_id pciidlist[] = {INTEL_RPLS_IDS (&adl_s_info),INTEL_RPLP_IDS (&adl_p_info),INTEL_DG2_IDS (&dg2_info), +INTEL_MTL_IDS (&mtl_info), {0, 0, 0} };MODULE_DEVICE_TABLE (pci, pciidlist);
drivers/gpu/drm/i915/intel_device_info.c +14 -0
@@ -199,6 +199,14 @@ static const u16 subplatform_g12_ids[] = { INTEL_DG2_G12_IDS(0), }; +static const u16 subplatform_m_ids[] = { +INTEL_MTL_M_IDS (0 ), +}; + +static const u16 subplatform_p_ids[] = { +INTEL_MTL_P_IDS (0 ), +}; +static bool find_devid (u16 id,const u16 *p,unsigned int num) {for (; num; num--, p++) {
@@ -253,6 +261,12 @@ void intel_device_info_subplatform_init(struct drm_i915_private *i915) }else if (find_devid (devid, subplatform_g12_ids,ARRAY_SIZE (subplatform_g12_ids))) { mask =BIT (INTEL_SUBPLATFORM_G12 ); + }else if (find_devid (devid, subplatform_m_ids, +ARRAY_SIZE (subplatform_m_ids))) { + mask =BIT (INTEL_SUBPLATFORM_M ); + }else if (find_devid (devid, subplatform_p_ids, +ARRAY_SIZE (subplatform_p_ids))) { + mask =BIT (INTEL_SUBPLATFORM_P ); }GEM_BUG_ON (mask & ~INTEL_SUBPLATFORM_MASK );
drivers/gpu/drm/i915/intel_device_info.h +4 -0
@@ -126,6 +126,10 @@ enum intel_platform {*/ #define INTEL_SUBPLATFORM_N 1 +/* MTL */ +#define INTEL_SUBPLATFORM_M 0 +#define INTEL_SUBPLATFORM_P 1 +enum intel_ppgtt_type {INTEL_PPGTT_NONE =I915_GEM_PPGTT_NONE ,INTEL_PPGTT_ALIASING =I915_GEM_PPGTT_ALIASING ,
include/drm/i915_pciids.h +19 -0
@@ -714,4 +714,23 @@INTEL_DG2_G11_IDS (info), \INTEL_DG2_G12_IDS (info) +/* MTL */ +#define INTEL_MTL_M_IDS (info) \ + INTEL_VGA_DEVICE(0x7D40, info), \ + INTEL_VGA_DEVICE(0x7D43, info), \ + INTEL_VGA_DEVICE(0x7DC0, info) + +#define INTEL_MTL_P_IDS (info) \ + INTEL_VGA_DEVICE(0x7D45, info), \ + INTEL_VGA_DEVICE(0x7D47, info), \ + INTEL_VGA_DEVICE(0x7D55, info), \ + INTEL_VGA_DEVICE(0x7D60, info), \ + INTEL_VGA_DEVICE(0x7DC5, info), \ + INTEL_VGA_DEVICE(0x7DD5, info), \ + INTEL_VGA_DEVICE(0x7DE0, info) + +#define INTEL_MTL_IDS (info) \ + INTEL_MTL_M_IDS(info), \ + INTEL_MTL_P_IDS(info) +#endif /* _I915_PCIIDS_H */
Signature · 1 line
2.25.1
v2 cover i915: Introduce Meteorlake
In reply to Radhakrishna SripadaMeteorlake is a new client platform following RPL S. Meteorlake introduces version 14 for Display, version 13 Media and version 12.70 for Graphics.
This is the basic platform definition series to introduce Meteorlake.
v2: Remove unused PCI'ids and rebase on drm-tip
Radhakrishna Sripada (2):
drm/i915/mtl: Add MeteorLake platform info
drm/i915/mtl: Add MeteorLake PCI IDs
drivers/gpu/drm/i915/i915_drv.h | 5 +++++ drivers/gpu/drm/i915/i915_pci.c | 26 ++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_device_info.c | 15 ++++++++++++++ drivers/gpu/drm/i915/intel_device_info.h | 5 +++++ include/drm/i915_pciids.h | 13 ++++++++++++ 5 files changed, 64 insertions(+)
Signature · 1 line
2.25.1
PATCH v2 1/2 drm/i915/mtl: Add MeteorLake platform info
MTL has Xe_LPD+ display IP (version = 14), MTL graphics IP (version = 12.70), and Xe_LPM+ media IP (version = 13).
Bspec: 55413
Bspec: 55416
Bspec: 55417
Bspec: 55418
Bspec: 55726
Bspec: 45544
Bspec: 65380
--- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/i915_pci.c | 25 ++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_device_info.c | 1 + drivers/gpu/drm/i915/intel_device_info.h | 1 + 4 files changed, 28 insertions(+)
drivers/gpu/drm/i915/i915_drv.h +1 -0
@@ -1018,6 +1018,7 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915, IS_SUBPLATFORM(dev_priv, INTEL_ALDERLAKE_P, INTEL_SUBPLATFORM_N)#define IS_ADLP_RPLP (dev_priv) \ IS_SUBPLATFORM(dev_priv, INTEL_ALDERLAKE_P, INTEL_SUBPLATFORM_RPL) +#define IS_METEORLAKE (dev_priv) IS_PLATFORM(dev_priv, INTEL_METEORLAKE)#define IS_HSW_EARLY_SDV (dev_priv) (IS_HASWELL(dev_priv) && \ (INTEL_DEVID(dev_priv) & 0xFF00) == 0x0C00)#define IS_BDW_ULT (dev_priv) \
drivers/gpu/drm/i915/i915_pci.c +25 -0
@@ -1107,6 +1107,31 @@ static const struct intel_device_info pvc_info = { .require_force_probe = 1, }; +#define XE_LPDP_FEATURES \ + XE_LPD_FEATURES, \ + .display.ver = 14, \ + .display.has_cdclk_crawl = 1 + +__maybe_unused +static const struct intel_device_info mtl_info = { +XE_HP_FEATURES , +XE_LPDP_FEATURES , +/* +* Real graphics IP version will be obtained from hardware GMD_ID +* register. Value provided here is just for sanity checking. +*/ + .graphics.ver =12 , + .graphics.rel =70 , + .media.ver =13 , + .memory_regions =REGION_SMEM |REGION_STOLEN_LMEM , +PLATFORM (INTEL_METEORLAKE ), + .platform_engine_mask =BIT (RCS0 ) |BIT (BCS0 ) |BIT (CCS0 ), + .require_force_probe =1 , + .has_flat_ccs =0 , + .has_snoop =1 , + .display.has_modular_fia =1 , +}; +#undef PLATFORM/*
drivers/gpu/drm/i915/intel_device_info.c +1 -0
@@ -73,6 +73,7 @@ static const char * const platform_names[] = {PLATFORM_NAME (XEHPSDV ),PLATFORM_NAME (DG2 ),PLATFORM_NAME (PONTEVECCHIO ), + PLATFORM_NAME(METEORLAKE), };#undef PLATFORM_NAME
drivers/gpu/drm/i915/intel_device_info.h +1 -0
@@ -89,6 +89,7 @@ enum intel_platform {INTEL_XEHPSDV ,INTEL_DG2 ,INTEL_PONTEVECCHIO , +INTEL_METEORLAKE , INTEL_MAX_PLATFORMS };
Signature · 1 line
2.25.1
Re: [Intel-gfx] [PATCH v2 1/2] drm/i915/mtl: Add MeteorLake platform info
Quoted 53 lines · Radhakrishna Sripada
MTL has Xe_LPD+ display IP (version = 14), MTL graphics IP (version = 12.70), and Xe_LPM+ media IP (version = 13).
Bspec: 55413
Bspec: 55416
Bspec: 55417
Bspec: 55418
Bspec: 55726
Bspec: 45544
Bspec: 65380Cc Matt Roper <[email protected]>Signed-off-by Radhakrishna Sripada <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/i915_pci.c | 25 ++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_device_info.c | 1 + drivers/gpu/drm/i915/intel_device_info.h | 1 + 4 files changed, 28 insertions(+)drivers/gpu/drm/i915/i915_drv.h +1
-0@@ -1018,6 +1018,7 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915, IS_SUBPLATFORM(dev_priv, INTEL_ALDERLAKE_P, INTEL_SUBPLATFORM_N)#define IS_ADLP_RPLP (dev_priv) \ IS_SUBPLATFORM(dev_priv, INTEL_ALDERLAKE_P, INTEL_SUBPLATFORM_RPL) +#define IS_METEORLAKE (dev_priv) IS_PLATFORM(dev_priv, INTEL_METEORLAKE)#define IS_HSW_EARLY_SDV (dev_priv) (IS_HASWELL(dev_priv) && \ (INTEL_DEVID(dev_priv) & 0xFF00) == 0x0C00)#define IS_BDW_ULT (dev_priv) \drivers/gpu/drm/i915/i915_pci.c +13
-0@@ -1107,6 +1107,31 @@ static const struct intel_device_info pvc_info = { .require_force_probe = 1, }; +#define XE_LPDP_FEATURES \ + XE_LPD_FEATURES, \ + .display.ver = 14, \ + .display.has_cdclk_crawl = 1 + +__maybe_unused +static const struct intel_device_info mtl_info = { +XE_HP_FEATURES , +XE_LPDP_FEATURES , +/* +* Real graphics IP version will be obtained from hardware GMD_ID +* register. Value provided here is just for sanity checking. +*/
drivers/gpu/drm/i915/i915_pci.c static const struct intel_device_info pvc_info = { · line 1132
Quoted 10 lines
drivers/gpu/drm/i915/i915_pci.c +10
-0+ .graphics.ver = 12, + .graphics.rel = 70, + .media.ver = 13, + .memory_regions =REGION_SMEM |REGION_STOLEN_LMEM , +PLATFORM (INTEL_METEORLAKE ), + .platform_engine_mask = BIT(RCS0) | BIT(BCS0) | BIT(CCS0), + .require_force_probe = 1, + .has_flat_ccs = 0, + .has_snoop = 1, + .display.has_modular_fia = 1,
Not a huge deal, but the ordering here is a bit non-standard. On other platforms we tend to order things as:
*_FEATURES
IP version values
PLATFORM(FOO)
everything else, sorted alphabetically
Matt
Quoted 32 lines
drivers/gpu/drm/i915/i915_pci.c +2
-0+}; +#undef PLATFORM/* drivers/gpu/drm/i915/intel_device_info.c +1
-0@@ -73,6 +73,7 @@ static const char * const platform_names[] = {PLATFORM_NAME (XEHPSDV ),PLATFORM_NAME (DG2 ),PLATFORM_NAME (PONTEVECCHIO ), + PLATFORM_NAME(METEORLAKE), };#undef PLATFORM_NAMEdrivers/gpu/drm/i915/intel_device_info.h +1
-0@@ -89,6 +89,7 @@ enum intel_platform {INTEL_XEHPSDV ,INTEL_DG2 ,INTEL_PONTEVECCHIO , +INTEL_METEORLAKE , INTEL_MAX_PLATFORMS };Signature · 1 line
2.25.1
Signature · 4 lines
Matt Roper Graphics Software Engineer VTT-OSGC Platform Enablement Intel Corporation
PATCH v2 2/2 drm/i915/mtl: Add MeteorLake PCI IDs
In reply to Radhakrishna SripadaAdd Meteorlake PCI IDs. Split into M, and P subplatforms.
v2: Update PCI id's
Bspec: 55420
--- drivers/gpu/drm/i915/i915_drv.h | 4 ++++ drivers/gpu/drm/i915/i915_pci.c | 1 + drivers/gpu/drm/i915/intel_device_info.c | 14 ++++++++++++++ drivers/gpu/drm/i915/intel_device_info.h | 4 ++++ include/drm/i915_pciids.h | 13 +++++++++++++ 5 files changed, 36 insertions(+)
drivers/gpu/drm/i915/i915_drv.h +4 -0
@@ -1019,6 +1019,10 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,#define IS_ADLP_RPLP (dev_priv) \ IS_SUBPLATFORM(dev_priv, INTEL_ALDERLAKE_P, INTEL_SUBPLATFORM_RPL)#define IS_METEORLAKE (dev_priv) IS_PLATFORM(dev_priv, INTEL_METEORLAKE) +#define IS_METEORLAKE_M (dev_priv) \ + 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_HSW_EARLY_SDV (dev_priv) (IS_HASWELL(dev_priv) && \ (INTEL_DEVID(dev_priv) & 0xFF00) == 0x0C00)#define IS_BDW_ULT (dev_priv) \
drivers/gpu/drm/i915/i915_pci.c +1 -0
@@ -1214,6 +1214,7 @@ static const struct pci_device_id pciidlist[] = {INTEL_RPLP_IDS (&adl_p_info),INTEL_DG2_IDS (&dg2_info),INTEL_ATS_M_IDS (&ats_m_info), +INTEL_MTL_IDS (&mtl_info), {0, 0, 0} };MODULE_DEVICE_TABLE (pci, pciidlist);
drivers/gpu/drm/i915/intel_device_info.c +14 -0
@@ -202,6 +202,14 @@ static const u16 subplatform_g12_ids[] = { INTEL_DG2_G12_IDS(0), }; +static const u16 subplatform_m_ids[] = { +INTEL_MTL_M_IDS (0 ), +}; + +static const u16 subplatform_p_ids[] = { +INTEL_MTL_P_IDS (0 ), +}; +static bool find_devid (u16 id,const u16 *p,unsigned int num) {for (; num; num--, p++) {
@@ -256,6 +264,12 @@ void intel_device_info_subplatform_init(struct drm_i915_private *i915) }else if (find_devid (devid, subplatform_g12_ids,ARRAY_SIZE (subplatform_g12_ids))) { mask =BIT (INTEL_SUBPLATFORM_G12 ); + }else if (find_devid (devid, subplatform_m_ids, +ARRAY_SIZE (subplatform_m_ids))) { + mask =BIT (INTEL_SUBPLATFORM_M ); + }else if (find_devid (devid, subplatform_p_ids, +ARRAY_SIZE (subplatform_p_ids))) { + mask =BIT (INTEL_SUBPLATFORM_P ); }GEM_BUG_ON (mask & ~INTEL_SUBPLATFORM_MASK );
drivers/gpu/drm/i915/intel_device_info.h +4 -0
@@ -127,6 +127,10 @@ enum intel_platform {*/ #define INTEL_SUBPLATFORM_N 1 +/* MTL */ +#define INTEL_SUBPLATFORM_M 0 +#define INTEL_SUBPLATFORM_P 1 +enum intel_ppgtt_type {INTEL_PPGTT_NONE =I915_GEM_PPGTT_NONE ,INTEL_PPGTT_ALIASING =I915_GEM_PPGTT_ALIASING ,
include/drm/i915_pciids.h +13 -0
@@ -733,5 +733,18 @@#define INTEL_ATS_M_IDS (info) \ INTEL_ATS_M150_IDS(info), \ INTEL_ATS_M75_IDS(info) +/* MTL */ +#define INTEL_MTL_M_IDS (info) \ + INTEL_VGA_DEVICE(0x7D40, info) + +#define INTEL_MTL_P_IDS (info) \ + INTEL_VGA_DEVICE(0x7D45, info), \ + INTEL_VGA_DEVICE(0x7D55, info), \ + INTEL_VGA_DEVICE(0x7D60, info), \ + INTEL_VGA_DEVICE(0x7DD5, info) + +#define INTEL_MTL_IDS (info) \ + INTEL_MTL_M_IDS(info), \ + INTEL_MTL_P_IDS(info)#endif /* _I915_PCIIDS_H */
Signature · 1 line
2.25.1
Re: [Intel-gfx] [PATCH v2 2/2] drm/i915/mtl: Add MeteorLake PCI IDs
Quoted 96 lines · Radhakrishna Sripada
Add Meteorlake PCI IDs. Split into M, and P subplatforms.
v2: Update PCI id's
Bspec: 55420
Signed-off-by Radhakrishna Sripada <[email protected]>Signed-off-by Matt Roper <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 4 ++++ drivers/gpu/drm/i915/i915_pci.c | 1 + drivers/gpu/drm/i915/intel_device_info.c | 14 ++++++++++++++ drivers/gpu/drm/i915/intel_device_info.h | 4 ++++ include/drm/i915_pciids.h | 13 +++++++++++++ 5 files changed, 36 insertions(+)drivers/gpu/drm/i915/i915_drv.h +4
-0@@ -1019,6 +1019,10 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,#define IS_ADLP_RPLP (dev_priv) \ IS_SUBPLATFORM(dev_priv, INTEL_ALDERLAKE_P, INTEL_SUBPLATFORM_RPL)#define IS_METEORLAKE (dev_priv) IS_PLATFORM(dev_priv, INTEL_METEORLAKE) +#define IS_METEORLAKE_M (dev_priv) \ + 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_HSW_EARLY_SDV (dev_priv) (IS_HASWELL(dev_priv) && \ (INTEL_DEVID(dev_priv) & 0xFF00) == 0x0C00)#define IS_BDW_ULT (dev_priv) \drivers/gpu/drm/i915/i915_pci.c +1
-0@@ -1214,6 +1214,7 @@ static const struct pci_device_id pciidlist[] = {INTEL_RPLP_IDS (&adl_p_info),INTEL_DG2_IDS (&dg2_info),INTEL_ATS_M_IDS (&ats_m_info), +INTEL_MTL_IDS (&mtl_info), {0, 0, 0} };MODULE_DEVICE_TABLE (pci, pciidlist);drivers/gpu/drm/i915/intel_device_info.c +14
-0@@ -202,6 +202,14 @@ static const u16 subplatform_g12_ids[] = { INTEL_DG2_G12_IDS(0), }; +static const u16 subplatform_m_ids[] = { +INTEL_MTL_M_IDS (0 ), +}; + +static const u16 subplatform_p_ids[] = { +INTEL_MTL_P_IDS (0 ), +}; +static bool find_devid (u16 id,const u16 *p,unsigned int num) {for (; num; num--, p++) {@@ -256,6 +264,12 @@ void intel_device_info_subplatform_init(struct drm_i915_private *i915) }else if (find_devid (devid, subplatform_g12_ids,ARRAY_SIZE (subplatform_g12_ids))) { mask =BIT (INTEL_SUBPLATFORM_G12 ); + }else if (find_devid (devid, subplatform_m_ids, +ARRAY_SIZE (subplatform_m_ids))) { + mask =BIT (INTEL_SUBPLATFORM_M ); + }else if (find_devid (devid, subplatform_p_ids, +ARRAY_SIZE (subplatform_p_ids))) { + mask =BIT (INTEL_SUBPLATFORM_P ); }GEM_BUG_ON (mask & ~INTEL_SUBPLATFORM_MASK );drivers/gpu/drm/i915/intel_device_info.h +4
-0@@ -127,6 +127,10 @@ enum intel_platform {*/ #define INTEL_SUBPLATFORM_N 1 +/* MTL */ +#define INTEL_SUBPLATFORM_M 0 +#define INTEL_SUBPLATFORM_P 1 +enum intel_ppgtt_type {INTEL_PPGTT_NONE =I915_GEM_PPGTT_NONE ,INTEL_PPGTT_ALIASING =I915_GEM_PPGTT_ALIASING ,include/drm/i915_pciids.h +0
-0@@ -733,5 +733,18 @@#define INTEL_ATS_M_IDS (info) \
include/drm/i915_pciids.h line 743
Quoted 10 lines
include/drm/i915_pciids.h +8
-0INTEL_ATS_M150_IDS (info), \INTEL_ATS_M75_IDS (info) +/* MTL */ +#define INTEL_MTL_M_IDS (info) \ + INTEL_VGA_DEVICE(0x7D40, info) + +#define INTEL_MTL_P_IDS (info) \ + INTEL_VGA_DEVICE(0x7D45, info), \ + INTEL_VGA_DEVICE(0x7D55, info), \ + INTEL_VGA_DEVICE(0x7D60, info), \
It looks like this one is supposed to be in the MTL_M list rather than the MTL_P list.
Matt
Quoted 10 lines
include/drm/i915_pciids.h +5
-0+ INTEL_VGA_DEVICE(0x7DD5, info) + +#define INTEL_MTL_IDS (info) \ + INTEL_MTL_M_IDS(info), \ + INTEL_MTL_P_IDS(info)#endif /* _I915_PCIIDS_H */ Signature · 1 line
2.25.1
Signature · 4 lines
Matt Roper Graphics Software Engineer VTT-OSGC Platform Enablement Intel Corporation