Commit f15856d7 authored by Tomas Winkler's avatar Tomas Winkler Committed by Daniele Ceraolo Spurio

drm/i915/dg2: add gsc with special gsc bar offsets

DG2 uses different GSC offsets on memory bar
and uses PXP head (HECI1).

v2 (Daniele): Rebased to before the ATS patches
Signed-off-by: default avatarAlexander Usyskin <alexander.usyskin@intel.com>
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Reviewed-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> #v1
Signed-off-by: default avatarDaniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Reviewed-by: default avatarJohn Harrison <John.C.Harrison@Intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220419193314.526966-7-daniele.ceraolospurio@intel.com
parent 1bc22fc5
...@@ -54,6 +54,19 @@ static const struct gsc_def gsc_def_dg1[] = { ...@@ -54,6 +54,19 @@ static const struct gsc_def gsc_def_dg1[] = {
} }
}; };
static const struct gsc_def gsc_def_dg2[] = {
{
.name = "mei-gsc",
.bar = DG2_GSC_HECI1_BASE,
.bar_size = GSC_BAR_LENGTH,
},
{
.name = "mei-gscfi",
.bar = DG2_GSC_HECI2_BASE,
.bar_size = GSC_BAR_LENGTH,
}
};
static void gsc_release_dev(struct device *dev) static void gsc_release_dev(struct device *dev)
{ {
struct auxiliary_device *aux_dev = to_auxiliary_dev(dev); struct auxiliary_device *aux_dev = to_auxiliary_dev(dev);
...@@ -90,7 +103,14 @@ static void gsc_init_one(struct drm_i915_private *i915, ...@@ -90,7 +103,14 @@ static void gsc_init_one(struct drm_i915_private *i915,
if (intf_id == 0 && !HAS_HECI_PXP(i915)) if (intf_id == 0 && !HAS_HECI_PXP(i915))
return; return;
if (IS_DG1(i915)) {
def = &gsc_def_dg1[intf_id]; def = &gsc_def_dg1[intf_id];
} else if (IS_DG2(i915)) {
def = &gsc_def_dg2[intf_id];
} else {
drm_warn_once(&i915->drm, "Unknown platform\n");
return;
}
if (!def->name) { if (!def->name) {
drm_warn_once(&i915->drm, "HECI%d is not implemented!\n", intf_id + 1); drm_warn_once(&i915->drm, "HECI%d is not implemented!\n", intf_id + 1);
......
...@@ -1051,6 +1051,7 @@ static const struct intel_device_info xehpsdv_info = { ...@@ -1051,6 +1051,7 @@ static const struct intel_device_info xehpsdv_info = {
.has_4tile = 1, \ .has_4tile = 1, \
.has_64k_pages = 1, \ .has_64k_pages = 1, \
.has_guc_deprivilege = 1, \ .has_guc_deprivilege = 1, \
.has_heci_pxp = 1, \
.needs_compact_pt = 1, \ .needs_compact_pt = 1, \
.platform_engine_mask = \ .platform_engine_mask = \
BIT(RCS0) | BIT(BCS0) | \ BIT(RCS0) | BIT(BCS0) | \
......
...@@ -978,6 +978,8 @@ ...@@ -978,6 +978,8 @@
#define BLT_RING_BASE 0x22000 #define BLT_RING_BASE 0x22000
#define DG1_GSC_HECI1_BASE 0x00258000 #define DG1_GSC_HECI1_BASE 0x00258000
#define DG1_GSC_HECI2_BASE 0x00259000 #define DG1_GSC_HECI2_BASE 0x00259000
#define DG2_GSC_HECI1_BASE 0x00373000
#define DG2_GSC_HECI2_BASE 0x00374000
......
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