Merge tag 'drm-intel-next-2022-05-20' of git://anongit.freedesktop.org/drm/drm-intel...

[platform/kernel/linux-starfive.git] / drivers / gpu / drm / i915 / i915_pci.c

diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
index 1e5c40f..b9f474d 100644 (file)
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -901,7 +901,8 @@ static const struct intel_device_info rkl_info = {
        .has_llc = 0, \
        .has_pxp = 0, \
        .has_snoop = 1, \
-       .is_dgfx = 1
+       .is_dgfx = 1, \
+       .has_heci_gscfi = 1
 
 static const struct intel_device_info dg1_info = {
        GEN12_FEATURES,
@@ -1037,7 +1038,8 @@ static const struct intel_device_info xehpsdv_info = {
                BIT(RCS0) | BIT(BCS0) |
                BIT(VECS0) | BIT(VECS1) | BIT(VECS2) | BIT(VECS3) |
                BIT(VCS0) | BIT(VCS1) | BIT(VCS2) | BIT(VCS3) |
-               BIT(VCS4) | BIT(VCS5) | BIT(VCS6) | BIT(VCS7),
+               BIT(VCS4) | BIT(VCS5) | BIT(VCS6) | BIT(VCS7) |
+               BIT(CCS0) | BIT(CCS1) | BIT(CCS2) | BIT(CCS3),
        .require_force_probe = 1,
 };
 
@@ -1051,12 +1053,14 @@ 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, \
        .has_media_ratio_mode = 1, \
        .platform_engine_mask = \
                BIT(RCS0) | BIT(BCS0) | \
                BIT(VECS0) | BIT(VECS1) | \
-               BIT(VCS0) | BIT(VCS2)
+               BIT(VCS0) | BIT(VCS2) | \
+               BIT(CCS0) | BIT(CCS1) | BIT(CCS2) | BIT(CCS3)
 
 static const struct intel_device_info dg2_info = {
        DG2_FEATURES,
@@ -1073,6 +1077,28 @@ static const struct intel_device_info ats_m_info = {
        .require_force_probe = 1,
 };
 
+#define XE_HPC_FEATURES \
+       XE_HP_FEATURES, \
+       .dma_mask_size = 52, \
+       .has_l3_ccs_read = 1
+
+__maybe_unused
+static const struct intel_device_info pvc_info = {
+       XE_HPC_FEATURES,
+       XE_HPM_FEATURES,
+       DGFX_FEATURES,
+       .graphics.rel = 60,
+       .media.rel = 60,
+       PLATFORM(INTEL_PONTEVECCHIO),
+       .display = { 0 },
+       .has_flat_ccs = 0,
+       .platform_engine_mask =
+               BIT(BCS0) |
+               BIT(VCS0) |
+               BIT(CCS0) | BIT(CCS1) | BIT(CCS2) | BIT(CCS3),
+       .require_force_probe = 1,
+};
+
 #undef PLATFORM
 
 /*