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: Alexander Usyskin <alexander.usyskin@intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Reviewed-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> #v1
Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Reviewed-by: John Harrison <John.C.Harrison@Intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220419193314.526966-7-daniele.ceraolospurio@intel.com

diff --git a/drivers/gpu/drm/i915/gt/intel_gsc.c b/drivers/gpu/drm/i915/gt/intel_gsc.c
index 21e860861f0b5c9a4984c7fe73c23d4cbda9e1b9..0e494028b81d07e007ab46e15740c74048a095f1 100644 (file)
--- a/drivers/gpu/drm/i915/gt/intel_gsc.c
+++ b/drivers/gpu/drm/i915/gt/intel_gsc.c
@@ -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)
 {
        struct auxiliary_device *aux_dev = to_auxiliary_dev(dev);
@@ -90,7 +103,14 @@ static void gsc_init_one(struct drm_i915_private *i915,
        if (intf_id == 0 && !HAS_HECI_PXP(i915))
                return;
 
-       def = &gsc_def_dg1[intf_id];
+       if (IS_DG1(i915)) {
+               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) {
                drm_warn_once(&i915->drm, "HECI%d is not implemented!\n", intf_id + 1);

diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
index 37cc8d180f6094581086b0d9315c722307bfb634..38f7de7789144c8119f66c4451429a3f448cf42d 100644 (file)
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -1051,6 +1051,7 @@ static const struct intel_device_info xehpsdv_info = {
        .has_4tile = 1, \
        .has_64k_pages = 1, \
        .has_guc_deprivilege = 1, \
+       .has_heci_pxp = 1, \
        .needs_compact_pt = 1, \
        .platform_engine_mask = \
                BIT(RCS0) | BIT(BCS0) | \

diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 1dd7b7de60029fdd163f2c05f4902991d0e9b2de..efcfe32cd8eba7d36553924e8515cfee2bfff47a 100644 (file)
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -978,6 +978,8 @@
 #define BLT_RING_BASE          0x22000
 #define DG1_GSC_HECI1_BASE     0x00258000
 #define DG1_GSC_HECI2_BASE     0x00259000
+#define DG2_GSC_HECI1_BASE     0x00373000
+#define DG2_GSC_HECI2_BASE     0x00374000