Commit 437d7a84 authored by Vitaly Lubart's avatar Vitaly Lubart Committed by Rodrigo Vivi

drm/xe/gsc: add has_heci_gscfi indication to device

Mark support of MEI-GSC interaction per device.
Add has_heci_gscfi indication to xe_device and xe_pci structures.
Mark DG1 and DG2 devices as supported.
Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: default avatarVitaly Lubart <vitaly.lubart@intel.com>
Signed-off-by: default avatarAlexander Usyskin <alexander.usyskin@intel.com>
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent 5120243b
...@@ -29,6 +29,7 @@ struct xe_pat_ops; ...@@ -29,6 +29,7 @@ struct xe_pat_ops;
#define GRAPHICS_VERx100(xe) ((xe)->info.graphics_verx100) #define GRAPHICS_VERx100(xe) ((xe)->info.graphics_verx100)
#define MEDIA_VERx100(xe) ((xe)->info.media_verx100) #define MEDIA_VERx100(xe) ((xe)->info.media_verx100)
#define IS_DGFX(xe) ((xe)->info.is_dgfx) #define IS_DGFX(xe) ((xe)->info.is_dgfx)
#define HAS_HECI_GSCFI(xe) ((xe)->info.has_heci_gscfi)
#define XE_VRAM_FLAGS_NEED64K BIT(0) #define XE_VRAM_FLAGS_NEED64K BIT(0)
...@@ -249,6 +250,8 @@ struct xe_device { ...@@ -249,6 +250,8 @@ struct xe_device {
u8 bypass_mtcfg:1; u8 bypass_mtcfg:1;
/** @supports_mmio_ext: supports MMIO extension/s */ /** @supports_mmio_ext: supports MMIO extension/s */
u8 supports_mmio_ext:1; u8 supports_mmio_ext:1;
/** @has_heci_gscfi: device has heci gscfi */
u8 has_heci_gscfi:1;
} info; } info;
/** @irq: device interrupt state */ /** @irq: device interrupt state */
......
...@@ -55,6 +55,8 @@ struct xe_device_desc { ...@@ -55,6 +55,8 @@ struct xe_device_desc {
u8 require_force_probe:1; u8 require_force_probe:1;
u8 is_dgfx:1; u8 is_dgfx:1;
u8 has_heci_gscfi:1;
u8 has_llc:1; u8 has_llc:1;
u8 bypass_mtcfg:1; u8 bypass_mtcfg:1;
u8 supports_mmio_ext:1; u8 supports_mmio_ext:1;
...@@ -260,6 +262,7 @@ static const struct xe_device_desc dg1_desc = { ...@@ -260,6 +262,7 @@ static const struct xe_device_desc dg1_desc = {
DGFX_FEATURES, DGFX_FEATURES,
PLATFORM(XE_DG1), PLATFORM(XE_DG1),
.require_force_probe = true, .require_force_probe = true,
.has_heci_gscfi = 1,
}; };
static const u16 dg2_g10_ids[] = { XE_DG2_G10_IDS(NOP), XE_ATS_M150_IDS(NOP), 0 }; static const u16 dg2_g10_ids[] = { XE_DG2_G10_IDS(NOP), XE_ATS_M150_IDS(NOP), 0 };
...@@ -269,6 +272,7 @@ static const u16 dg2_g12_ids[] = { XE_DG2_G12_IDS(NOP), 0 }; ...@@ -269,6 +272,7 @@ static const u16 dg2_g12_ids[] = { XE_DG2_G12_IDS(NOP), 0 };
#define DG2_FEATURES \ #define DG2_FEATURES \
DGFX_FEATURES, \ DGFX_FEATURES, \
PLATFORM(XE_DG2), \ PLATFORM(XE_DG2), \
.has_heci_gscfi = 1, \
.subplatforms = (const struct xe_subplatform_desc[]) { \ .subplatforms = (const struct xe_subplatform_desc[]) { \
{ XE_SUBPLATFORM_DG2_G10, "G10", dg2_g10_ids }, \ { XE_SUBPLATFORM_DG2_G10, "G10", dg2_g10_ids }, \
{ XE_SUBPLATFORM_DG2_G11, "G11", dg2_g11_ids }, \ { XE_SUBPLATFORM_DG2_G11, "G11", dg2_g11_ids }, \
...@@ -552,6 +556,7 @@ static int xe_info_init(struct xe_device *xe, ...@@ -552,6 +556,7 @@ static int xe_info_init(struct xe_device *xe,
return -ENODEV; return -ENODEV;
xe->info.is_dgfx = desc->is_dgfx; xe->info.is_dgfx = desc->is_dgfx;
xe->info.has_heci_gscfi = desc->has_heci_gscfi;
xe->info.graphics_name = graphics_desc->name; xe->info.graphics_name = graphics_desc->name;
xe->info.media_name = media_desc ? media_desc->name : "none"; xe->info.media_name = media_desc ? media_desc->name : "none";
xe->info.has_llc = desc->has_llc; xe->info.has_llc = desc->has_llc;
...@@ -684,7 +689,7 @@ static int xe_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -684,7 +689,7 @@ static int xe_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
if (err) if (err)
goto err_pci_disable; goto err_pci_disable;
drm_dbg(&xe->drm, "%s %s %04x:%04x dgfx:%d gfx:%s (%d.%02d) media:%s (%d.%02d) dma_m_s:%d tc:%d", drm_dbg(&xe->drm, "%s %s %04x:%04x dgfx:%d gfx:%s (%d.%02d) media:%s (%d.%02d) dma_m_s:%d tc:%d gscfi:%d",
desc->platform_name, desc->platform_name,
subplatform_desc ? subplatform_desc->name : "", subplatform_desc ? subplatform_desc->name : "",
xe->info.devid, xe->info.revid, xe->info.devid, xe->info.revid,
...@@ -695,7 +700,8 @@ static int xe_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -695,7 +700,8 @@ static int xe_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
xe->info.media_name, xe->info.media_name,
xe->info.media_verx100 / 100, xe->info.media_verx100 / 100,
xe->info.media_verx100 % 100, xe->info.media_verx100 % 100,
xe->info.dma_mask_size, xe->info.tile_count); xe->info.dma_mask_size, xe->info.tile_count,
xe->info.has_heci_gscfi);
drm_dbg(&xe->drm, "Stepping = (G:%s, M:%s, D:%s, B:%s)\n", drm_dbg(&xe->drm, "Stepping = (G:%s, M:%s, D:%s, B:%s)\n",
xe_step_name(xe->info.step.graphics), xe_step_name(xe->info.step.graphics),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment