drm/i915/mtl: Define MOCS and PAT tables for MTL
cover drm/i915/mtl: Define MOCS and PAT tables for MTL
From: Fei Yang <[email protected]>
The series includes patches needed to enable MTL.
Also add new extension for GEM_CREATE uAPI to let
user space set cache policy for buffer objects.
Fei Yang (7):
drm/i915/mtl: Set has_llc=0
drm/i915/mtl: Add PTE encode function drm/i915/mtl: workaround coherency issue for Media drm/i915/mtl: end support for set caching ioctl drm/i915: preparation for using PAT index drm/i915: use pat_index instead of cache_level drm/i915: Allow user to set cache at BO creation
Madhumitha Tolakanahalli Pradeep (1):
drm/i915/mtl: Define MOCS and PAT tables for MTL
drivers/gpu/drm/i915/display/intel_dpt.c | 14 ++-- drivers/gpu/drm/i915/gem/i915_gem_create.c | 36 ++++++++ drivers/gpu/drm/i915/gem/i915_gem_domain.c | 30 +++---- .../gpu/drm/i915/gem/i915_gem_execbuffer.c | 10 ++- drivers/gpu/drm/i915/gem/i915_gem_mman.c | 3 +- drivers/gpu/drm/i915/gem/i915_gem_object.c | 67 ++++++++++++++- drivers/gpu/drm/i915/gem/i915_gem_object.h | 8 ++ .../gpu/drm/i915/gem/i915_gem_object_types.h | 26 +++++- drivers/gpu/drm/i915/gem/i915_gem_pages.c | 5 +- drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 9 +- drivers/gpu/drm/i915/gem/i915_gem_shrinker.c | 2 - drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 4 +- drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c | 16 ++-- .../gpu/drm/i915/gem/selftests/huge_pages.c | 2 +- .../drm/i915/gem/selftests/i915_gem_migrate.c | 2 +- .../drm/i915/gem/selftests/i915_gem_mman.c | 2 +- drivers/gpu/drm/i915/gt/gen6_ppgtt.c | 10 ++- drivers/gpu/drm/i915/gt/gen8_ppgtt.c | 76 ++++++++++++----- drivers/gpu/drm/i915/gt/gen8_ppgtt.h | 6 +- drivers/gpu/drm/i915/gt/intel_ggtt.c | 84 +++++++++++++------ drivers/gpu/drm/i915/gt/intel_gt_regs.h | 6 +- drivers/gpu/drm/i915/gt/intel_gtt.c | 62 +++++++++++--- drivers/gpu/drm/i915/gt/intel_gtt.h | 38 ++++++--- drivers/gpu/drm/i915/gt/intel_migrate.c | 47 ++++++----- drivers/gpu/drm/i915/gt/intel_migrate.h | 13 ++- drivers/gpu/drm/i915/gt/intel_mocs.c | 76 ++++++++++++++++- drivers/gpu/drm/i915/gt/intel_ppgtt.c | 6 +- drivers/gpu/drm/i915/gt/selftest_migrate.c | 47 ++++++----- drivers/gpu/drm/i915/gt/selftest_mocs.c | 2 +- drivers/gpu/drm/i915/gt/selftest_reset.c | 8 +- drivers/gpu/drm/i915/gt/selftest_timeline.c | 2 +- drivers/gpu/drm/i915/gt/selftest_tlb.c | 4 +- drivers/gpu/drm/i915/gt/uc/intel_gsc_fw.c | 13 +++ drivers/gpu/drm/i915/gt/uc/intel_guc.c | 7 ++ drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c | 18 ++-- drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 10 ++- drivers/gpu/drm/i915/i915_debugfs.c | 55 +++++++++--- drivers/gpu/drm/i915/i915_gem.c | 16 +++- drivers/gpu/drm/i915/i915_gpu_error.c | 8 +- drivers/gpu/drm/i915/i915_pci.c | 76 +++++++++++++++-- drivers/gpu/drm/i915/i915_vma.c | 16 ++-- drivers/gpu/drm/i915/i915_vma.h | 2 +- drivers/gpu/drm/i915/i915_vma_types.h | 2 - drivers/gpu/drm/i915/intel_device_info.h | 5 ++ drivers/gpu/drm/i915/selftests/i915_gem.c | 5 +- .../gpu/drm/i915/selftests/i915_gem_evict.c | 4 +- drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 15 ++-- .../drm/i915/selftests/intel_memory_region.c | 4 +- .../gpu/drm/i915/selftests/mock_gem_device.c | 10 +++ drivers/gpu/drm/i915/selftests/mock_gtt.c | 8 +- include/uapi/drm/i915_drm.h | 36 ++++++++ tools/include/uapi/drm/i915_drm.h | 36 ++++++++ 52 files changed, 828 insertions(+), 241 deletions(-)
Signature · 1 line
2.25.1
PATCH 1/8 drm/i915/mtl: Set has_llc=0
From: Fei Yang <[email protected]>
On MTL, GT is no longer allocated on LLC, set has_llc=0.
--- drivers/gpu/drm/i915/i915_pci.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/i915/i915_pci.c +1 -0
@@ -1146,6 +1146,7 @@ static const struct intel_device_info mtl_info = { .has_flat_ccs = 0, .has_gmd_id = 1, .has_guc_deprivilege = 1, + .has_llc = 0, .has_mslice_steering = 0, .has_snoop = 1, .__runtime.memory_regions = REGION_SMEM | REGION_STOLEN_LMEM,
Signature · 1 line
2.25.1
Re: [Intel-gfx] [PATCH 1/8] drm/i915/mtl: Set has_llc=0
Hi Fei,
Quoted 5 lines · On Sun, Apr 16, 2023 at 11:24:56PM -0700, [email protected] wrote:
From: Fei Yang <[email protected]>
On MTL, GT is no longer allocated on LLC, set has_llc=0.
Signed-off-by Fei Yang <[email protected]>
Andi
Re: [Intel-gfx] [PATCH 1/8] drm/i915/mtl: Set has_llc=0
In reply to [email protected]Quoted 5 lines · On 17.04.2023 08:24, [email protected] wrote:
From: Fei Yang <[email protected]>
On MTL, GT is no longer allocated on LLC, set has_llc=0.
Signed-off-by Fei Yang <[email protected]>
Regards
Andrzej
Quoted 16 lines
--- drivers/gpu/drm/i915/i915_pci.c | 1 + 1 file changed, 1 insertion(+)drivers/gpu/drm/i915/i915_pci.c +1
-0@@ -1146,6 +1146,7 @@ static const struct intel_device_info mtl_info = { .has_flat_ccs = 0, .has_gmd_id = 1, .has_guc_deprivilege = 1, + .has_llc = 0, .has_mslice_steering = 0, .has_snoop = 1, .__runtime.memory_regions = REGION_SMEM | REGION_STOLEN_LMEM,
Re: [Intel-gfx] [PATCH 1/8] drm/i915/mtl: Set has_llc=0
In reply to [email protected]Quoted 3 lines · On 4/17/2023 8:24 AM, [email protected] wrote:
From: Fei Yang <[email protected]>
On MTL, GT is no longer allocated on LLC, set has_llc=0.
This statement is bit unclear to me. I would say "On MTL, LLC is not shared between GT and CPU"
Otherwise
Quoted 18 lines
Signed-off-by Fei Yang <[email protected]>--- drivers/gpu/drm/i915/i915_pci.c | 1 + 1 file changed, 1 insertion(+)drivers/gpu/drm/i915/i915_pci.c +1
-0@@ -1146,6 +1146,7 @@ static const struct intel_device_info mtl_info = { .has_flat_ccs = 0, .has_gmd_id = 1, .has_guc_deprivilege = 1, + .has_llc = 0, .has_mslice_steering = 0, .has_snoop = 1, .__runtime.memory_regions = REGION_SMEM | REGION_STOLEN_LMEM,
PATCH 2/8 drm/i915/mtl: Define MOCS and PAT tables for MTL
In reply to [email protected]From: Madhumitha Tolakanahalli Pradeep <[email protected]>
On MTL, GT can no longer allocate on LLC - only the CPU can. This, along with addition of support for L4 cache calls a MOCS/PAT table update.
Alos the PAT index registers are multicasted for primary GT, and there is an address jump from index 7 to 8. This patch makes sure these registers are programmed in the proper way.
BSpec: 44509, 45101, 44235
--- drivers/gpu/drm/i915/gt/intel_gt_regs.h | 6 +- drivers/gpu/drm/i915/gt/intel_gtt.c | 62 ++++++++++++++++---- drivers/gpu/drm/i915/gt/intel_gtt.h | 20 ++++++- drivers/gpu/drm/i915/gt/intel_mocs.c | 76 +++++++++++++++++++++++-- drivers/gpu/drm/i915/gt/selftest_mocs.c | 2 +- 5 files changed, 149 insertions(+), 17 deletions(-)
drivers/gpu/drm/i915/gt/intel_gt_regs.h +5 -1
@@ -356,7 +356,11 @@#define GEN7_TLB_RD_ADDR _MMIO(0x4700)#define GEN12_PAT_INDEX (index) _MMIO(0x4800 + (index) * 4) -#define XEHP_PAT_INDEX (index) MCR_REG(0x4800 + (index) * 4) +#define _PAT_INDEX (index) _PICK_EVEN_2RANGES(index, 8, \ + 0x4800, 0x4804, \ + 0x4848, 0x484c) +#define XEHP_PAT_INDEX (index) MCR_REG(_PAT_INDEX(index)) +#define XELPMP_PAT_INDEX (index) _MMIO(_PAT_INDEX(index))#define XEHP_TILE0_ADDR_RANGE MCR_REG(0x4900)#define XEHP_TILE_LMEM_RANGE_SHIFT 8
drivers/gpu/drm/i915/gt/intel_gtt.c +52 -10
74 lines not on this page · raw message
drivers/gpu/drm/i915/gt/intel_gtt.h +19 -1
@@ -88,9 +88,18 @@ typedef u64 gen8_pte_t;#define BYT_PTE_SNOOPED_BY_CPU_CACHES REG_BIT(2)#define BYT_PTE_WRITEABLE REG_BIT(1) +#define MTL_PPGTT_PTE_PAT3 BIT_ULL(62)#define GEN12_PPGTT_PTE_LM BIT_ULL(11) +#define GEN12_PPGTT_PTE_PAT2 BIT_ULL(7) +#define GEN12_PPGTT_PTE_NC BIT_ULL(5) +#define GEN12_PPGTT_PTE_PAT1 BIT_ULL(4) +#define GEN12_PPGTT_PTE_PAT0 BIT_ULL(3) -#define GEN12_GGTT_PTE_LM BIT_ULL(1) +#define GEN12_GGTT_PTE_LM BIT_ULL(1) +#define MTL_GGTT_PTE_PAT0 BIT_ULL(52) +#define MTL_GGTT_PTE_PAT1 BIT_ULL(53) +#define GEN12_GGTT_PTE_ADDR_MASK GENMASK_ULL(45, 12) +#define MTL_GGTT_PTE_PAT_MASK GENMASK_ULL(53, 52)#define GEN12_PDE_64K BIT(6)#define GEN12_PTE_PS64 BIT(8)
@@ -147,6 +156,15 @@ typedef u64 gen8_pte_t;#define GEN8_PDE_IPS_64K BIT(11)#define GEN8_PDE_PS_2M BIT(7) +#define MTL_PPAT_L4_CACHE_POLICY_MASK REG_GENMASK(3, 2) +#define MTL_PAT_INDEX_COH_MODE_MASK REG_GENMASK(1, 0) +#define MTL_PPAT_L4_3_UC REG_FIELD_PREP(MTL_PPAT_L4_CACHE_POLICY_MASK, 3) +#define MTL_PPAT_L4_1_WT REG_FIELD_PREP(MTL_PPAT_L4_CACHE_POLICY_MASK, 1) +#define MTL_PPAT_L4_0_WB REG_FIELD_PREP(MTL_PPAT_L4_CACHE_POLICY_MASK, 0) +#define MTL_3_COH_2W REG_FIELD_PREP(MTL_PAT_INDEX_COH_MODE_MASK, 3) +#define MTL_2_COH_1W REG_FIELD_PREP(MTL_PAT_INDEX_COH_MODE_MASK, 2) +#define MTL_0_COH_NON REG_FIELD_PREP(MTL_PAT_INDEX_COH_MODE_MASK, 0) +enum i915_cache_level ;struct drm_i915_gem_object ;
drivers/gpu/drm/i915/gt/intel_mocs.c +72 -4
119 lines not on this page · raw message
drivers/gpu/drm/i915/gt/selftest_mocs.c +1 -1
@@ -137,7 +137,7 @@ static int read_mocs_table(struct i915_request *rq,return 0 ;if (HAS_GLOBAL_MOCS_REGISTERS (rq->engine->i915)) - addr =global_mocs_offset (); + addr =global_mocs_offset (rq->engine->gt);else addr =mocs_offset (rq->engine);
Signature · 1 line
2.25.1
Hi Fei,
Quoted 6 lines · On Sun, Apr 16, 2023 at 11:24:57PM -0700, [email protected] wrote:
From: Madhumitha Tolakanahalli Pradeep <[email protected]>
On MTL, GT can no longer allocate on LLC - only the CPU can. This, along with addition of support for L4 cache calls a MOCS/PAT table update.
Alos the PAT index registers are multicasted for primary GT,
/Alos/Also/
[...]
drivers/gpu/drm/i915/gt/intel_gtt.c void gtt_write_workarounds(struct intel_gt *gt) · line 479
Quoted 9 lines
drivers/gpu/drm/i915/gt/intel_gtt.c +9
-0+static void xelpmp_setup_private_ppat (struct intel_uncore *uncore) +{ +intel_uncore_write (uncore,XELPMP_PAT_INDEX (0 ),MTL_PPAT_L4_0_WB ); +intel_uncore_write (uncore,XELPMP_PAT_INDEX (1 ),MTL_PPAT_L4_1_WT ); +intel_uncore_write (uncore,XELPMP_PAT_INDEX (2 ),MTL_PPAT_L4_3_UC ); +intel_uncore_write (uncore,XELPMP_PAT_INDEX (3 ), +MTL_PPAT_L4_0_WB |MTL_2_COH_1W ); +intel_uncore_write (uncore,XELPMP_PAT_INDEX (4 ), +MTL_PPAT_L4_0_WB |MTL_3_COH_2W );
nit: I think it's more readable if we either keep everything in one line or we break the line for everyone. Even if we break the 80 characters rule.
[...]
Quoted 6 lines
drivers/gpu/drm/i915/gt/intel_gtt.c +0
-2@@ -603,16 +639,22 @@ void setup_private_pat(struct intel_gt *gt)GEM_BUG_ON (GRAPHICS_VER (i915) <8 ); -if (GRAPHICS_VER_FULL (i915) >=IP_VER (12 ,50 )) -xehp_setup_private_ppat (gt);
drivers/gpu/drm/i915/gt/intel_gtt.c void setup_private_pat(struct intel_gt *gt) · line 643
Quoted 10 lines
drivers/gpu/drm/i915/gt/intel_gtt.c +2
-8-else if (GRAPHICS_VER (i915) >=12 ) -tgl_setup_private_ppat (uncore); -else if (GRAPHICS_VER (i915) >=11 ) -icl_setup_private_ppat (uncore); -else if (IS_CHERRYVIEW (i915) ||IS_GEN9_LP (i915)) -chv_setup_private_ppat (uncore); -else -bdw_setup_private_ppat (uncore); +if (gt->type ==GT_MEDIA ) { +xelpmp_setup_private_ppat (gt->uncore);
nit: if you add a return here you save the else.
Quoted 14 lines
drivers/gpu/drm/i915/gt/intel_gtt.c +14
-0+ }else { +if (GRAPHICS_VER_FULL (i915) >=IP_VER (12 ,70 )) +xelpg_setup_private_ppat (gt); +else if (GRAPHICS_VER_FULL (i915) >=IP_VER (12 ,50 )) +xehp_setup_private_ppat (gt); +else if (GRAPHICS_VER (i915) >=12 ) +tgl_setup_private_ppat (uncore); +else if (GRAPHICS_VER (i915) >=11 ) +icl_setup_private_ppat (uncore); +else if (IS_CHERRYVIEW (i915) ||IS_GEN9_LP (i915)) +chv_setup_private_ppat (uncore); +else +bdw_setup_private_ppat (uncore); + }
[...]
drivers/gpu/drm/i915/gt/intel_mocs.c void intel_mocs_init_engine(struct intel_engine_cs *engine) · line 719
Quoted 5 lines
drivers/gpu/drm/i915/gt/intel_mocs.c +2
-2-static u32 global_mocs_offset (void ) +static u32 global_mocs_offset (struct intel_gt *gt) { -return i915_mmio_reg_offset (GEN12_GLOBAL_MOCS (0 )); +return i915_mmio_reg_offset (GEN12_GLOBAL_MOCS (0 )) + gt->uncore->gsi_offset;
There is one open question here coming from one of previous Matt's reviews. Would it make sense to have this in a different patch?
Andi
Quoted 6 lines
Hi Fei,
Quoted 3 lines · On Sun, Apr 16, 2023 at 11:24:57PM -0700, [email protected] wrote:
From: Madhumitha Tolakanahalli Pradeep
<[email protected]>
Quoted 6 lines
Quoted 4 lines
On MTL, GT can no longer allocate on LLC - only the CPU can. This, along with addition of support for L4 cache calls a MOCS/PAT table update.
Alos the PAT index registers are multicasted for primary GT,/Alos/Also/
Will update
Quoted 11 lines
[...]
drivers/gpu/drm/i915/gt/intel_gtt.c void gtt_write_workarounds(struct intel_gt *gt) · line 479
Quoted 8 lines
drivers/gpu/drm/i915/gt/intel_gtt.c +8
-0+static void xelpmp_setup_private_ppat (struct intel_uncore *uncore) { +intel_uncore_write (uncore,XELPMP_PAT_INDEX (0 ),MTL_PPAT_L4_0_WB ); +intel_uncore_write (uncore,XELPMP_PAT_INDEX (1 ),MTL_PPAT_L4_1_WT ); +intel_uncore_write (uncore,XELPMP_PAT_INDEX (2 ),MTL_PPAT_L4_3_UC ); +intel_uncore_write (uncore,XELPMP_PAT_INDEX (3 ), +MTL_PPAT_L4_0_WB |MTL_2_COH_1W ); +intel_uncore_write (uncore,XELPMP_PAT_INDEX (4 ), +MTL_PPAT_L4_0_WB |MTL_3_COH_2W );
Quoted 3 lines
nit: I think it's more readable if we either keep everything in one line or we break the line for everyone. Even if we break the 80 characters rule.
Will update
Quoted 6 lines
[...]
Quoted 4 lines
drivers/gpu/drm/i915/gt/intel_gtt.c +0
-0@@ -603,16 +639,22 @@ void setup_private_pat(struct intel_gt *gt)GEM_BUG_ON (GRAPHICS_VER (i915) <8 );
Quoted 14 lines
drivers/gpu/drm/i915/gt/intel_gtt.c void setup_private_pat(struct intel_gt *gt) · line 643
Quoted 12 lines
drivers/gpu/drm/i915/gt/intel_gtt.c +2
-10-if (GRAPHICS_VER_FULL (i915) >=IP_VER (12 ,50 )) -xehp_setup_private_ppat (gt); -else if (GRAPHICS_VER (i915) >=12 ) -tgl_setup_private_ppat (uncore); -else if (GRAPHICS_VER (i915) >=11 ) -icl_setup_private_ppat (uncore); -else if (IS_CHERRYVIEW (i915) ||IS_GEN9_LP (i915)) -chv_setup_private_ppat (uncore); -else -bdw_setup_private_ppat (uncore); +if (gt->type ==GT_MEDIA ) { +xelpmp_setup_private_ppat (gt->uncore);nit: if you add a return here you save the else.
Will update.
Quoted 17 lines
Quoted 14 lines
drivers/gpu/drm/i915/gt/intel_gtt.c +14
-0+ }else { +if (GRAPHICS_VER_FULL (i915) >=IP_VER (12 ,70 )) +xelpg_setup_private_ppat (gt); +else if (GRAPHICS_VER_FULL (i915) >=IP_VER (12 ,50 )) +xehp_setup_private_ppat (gt); +else if (GRAPHICS_VER (i915) >=12 ) +tgl_setup_private_ppat (uncore); +else if (GRAPHICS_VER (i915) >=11 ) +icl_setup_private_ppat (uncore); +else if (IS_CHERRYVIEW (i915) ||IS_GEN9_LP (i915)) +chv_setup_private_ppat (uncore); +else +bdw_setup_private_ppat (uncore); + }[...]
Quoted 9 lines
drivers/gpu/drm/i915/gt/intel_mocs.c void intel_mocs_init_engine(struct intel_engine_cs *engine)
Quoted 6 lines
drivers/gpu/drm/i915/gt/intel_mocs.c +3
-2-static u32 global_mocs_offset (void ) +static u32 global_mocs_offset (struct intel_gt *gt) { -return i915_mmio_reg_offset (GEN12_GLOBAL_MOCS (0 )); +return i915_mmio_reg_offset (GEN12_GLOBAL_MOCS (0 )) + +gt->uncore->gsi_offset;There is one open question here coming from one of previous Matt's reviews. Would it make sense to have this in a different patch?
I would prefer keeping it in this patch because the function is called by intel_mocs_init(). Without it the MOCS initialization would be broken for media GT.
Quoted 1 line
Andi
Quoted 97 lines · On 17.04.2023 08:24, [email protected] wrote:
From: Madhumitha Tolakanahalli Pradeep <[email protected]>
On MTL, GT can no longer allocate on LLC - only the CPU can. This, along with addition of support for L4 cache calls a MOCS/PAT table update.
Alos the PAT index registers are multicasted for primary GT, and there is an address jump from index 7 to 8. This patch makes sure these registers are programmed in the proper way.BSpec: 44509, 45101, 44235
Cc Matt Roper <[email protected]>Cc Lucas De Marchi <[email protected]>Signed-off-by Madhumitha Tolakanahalli Pradeep <[email protected]>Signed-off-by Aravind Iddamsetty <[email protected]>Signed-off-by Nirmoy Das <[email protected]>Signed-off-by Fei Yang <[email protected]>--- drivers/gpu/drm/i915/gt/intel_gt_regs.h | 6 +- drivers/gpu/drm/i915/gt/intel_gtt.c | 62 ++++++++++++++++---- drivers/gpu/drm/i915/gt/intel_gtt.h | 20 ++++++- drivers/gpu/drm/i915/gt/intel_mocs.c | 76 +++++++++++++++++++++++-- drivers/gpu/drm/i915/gt/selftest_mocs.c | 2 +- 5 files changed, 149 insertions(+), 17 deletions(-)drivers/gpu/drm/i915/gt/intel_gt_regs.h +5
-1@@ -356,7 +356,11 @@#define GEN7_TLB_RD_ADDR _MMIO(0x4700)#define GEN12_PAT_INDEX (index) _MMIO(0x4800 + (index) * 4) -#define XEHP_PAT_INDEX (index) MCR_REG(0x4800 + (index) * 4) +#define _PAT_INDEX (index) _PICK_EVEN_2RANGES(index, 8, \ + 0x4800, 0x4804, \ + 0x4848, 0x484c) +#define XEHP_PAT_INDEX (index) MCR_REG(_PAT_INDEX(index)) +#define XELPMP_PAT_INDEX (index) _MMIO(_PAT_INDEX(index))#define XEHP_TILE0_ADDR_RANGE MCR_REG(0x4900)#define XEHP_TILE_LMEM_RANGE_SHIFT 8drivers/gpu/drm/i915/gt/intel_gtt.c +36
-4@@ -468,6 +468,42 @@ void gtt_write_workarounds(struct intel_gt *gt) } } +static void xelpmp_setup_private_ppat (struct intel_uncore *uncore) +{ +intel_uncore_write (uncore,XELPMP_PAT_INDEX (0 ),MTL_PPAT_L4_0_WB ); +intel_uncore_write (uncore,XELPMP_PAT_INDEX (1 ),MTL_PPAT_L4_1_WT ); +intel_uncore_write (uncore,XELPMP_PAT_INDEX (2 ),MTL_PPAT_L4_3_UC ); +intel_uncore_write (uncore,XELPMP_PAT_INDEX (3 ), +MTL_PPAT_L4_0_WB |MTL_2_COH_1W ); +intel_uncore_write (uncore,XELPMP_PAT_INDEX (4 ), +MTL_PPAT_L4_0_WB |MTL_3_COH_2W ); + +/* +* Remaining PAT entries are left at the hardware-default +* fully-cached setting +*/ + +} + +static void xelpg_setup_private_ppat (struct intel_gt *gt) +{ +intel_gt_mcr_multicast_write (gt,XEHP_PAT_INDEX (0 ), +MTL_PPAT_L4_0_WB ); +intel_gt_mcr_multicast_write (gt,XEHP_PAT_INDEX (1 ), +MTL_PPAT_L4_1_WT ); +intel_gt_mcr_multicast_write (gt,XEHP_PAT_INDEX (2 ), +MTL_PPAT_L4_3_UC ); +intel_gt_mcr_multicast_write (gt,XEHP_PAT_INDEX (3 ), +MTL_PPAT_L4_0_WB |MTL_2_COH_1W ); +intel_gt_mcr_multicast_write (gt,XEHP_PAT_INDEX (4 ), +MTL_PPAT_L4_0_WB |MTL_3_COH_2W ); + +/* +* Remaining PAT entries are left at the hardware-default +* fully-cached setting +*/ +} +static void tgl_setup_private_ppat (struct intel_uncore *uncore) {/* TGL doesn't support LLC or AGE settings */ @@ -603,16 +639,22 @@ void setup_private_pat(struct intel_gt *gt)GEM_BUG_ON (GRAPHICS_VER (i915) <8 ); -if (GRAPHICS_VER_FULL (i915) >=IP_VER (12 ,50 )) -xehp_setup_private_ppat (gt); -else if (GRAPHICS_VER (i915) >=12 ) -tgl_setup_private_ppat (uncore);
drivers/gpu/drm/i915/gt/intel_gtt.c void setup_private_pat(struct intel_gt *gt) · line 645
Quoted 10 lines
drivers/gpu/drm/i915/gt/intel_gtt.c +4
-6-else if (GRAPHICS_VER (i915) >=11 ) -icl_setup_private_ppat (uncore); -else if (IS_CHERRYVIEW (i915) ||IS_GEN9_LP (i915)) -chv_setup_private_ppat (uncore); -else -bdw_setup_private_ppat (uncore); +if (gt->type ==GT_MEDIA ) { +xelpmp_setup_private_ppat (gt->uncore); + }else { +if (GRAPHICS_VER_FULL (i915) >=IP_VER (12 ,70 ))
You could just use "else if" here to avoid indendation, for now it would work, up to you.
Quoted 190 lines
drivers/gpu/drm/i915/gt/intel_gtt.c +12
-0+xelpg_setup_private_ppat (gt); + else if (GRAPHICS_VER_FULL(i915) >= IP_VER(12, 50)) + xehp_setup_private_ppat(gt); + else if (GRAPHICS_VER(i915) >= 12) + tgl_setup_private_ppat(uncore); + else if (GRAPHICS_VER(i915) >= 11) + icl_setup_private_ppat(uncore); + else if (IS_CHERRYVIEW(i915) || IS_GEN9_LP(i915)) + chv_setup_private_ppat(uncore); + else +bdw_setup_private_ppat (uncore ); + } } struct i915_vma *drivers/gpu/drm/i915/gt/intel_gtt.h +19
-1@@ -88,9 +88,18 @@ typedef u64 gen8_pte_t;#define BYT_PTE_SNOOPED_BY_CPU_CACHES REG_BIT(2)#define BYT_PTE_WRITEABLE REG_BIT(1) +#define MTL_PPGTT_PTE_PAT3 BIT_ULL(62)#define GEN12_PPGTT_PTE_LM BIT_ULL(11) +#define GEN12_PPGTT_PTE_PAT2 BIT_ULL(7) +#define GEN12_PPGTT_PTE_NC BIT_ULL(5) +#define GEN12_PPGTT_PTE_PAT1 BIT_ULL(4) +#define GEN12_PPGTT_PTE_PAT0 BIT_ULL(3) -#define GEN12_GGTT_PTE_LM BIT_ULL(1) +#define GEN12_GGTT_PTE_LM BIT_ULL(1) +#define MTL_GGTT_PTE_PAT0 BIT_ULL(52) +#define MTL_GGTT_PTE_PAT1 BIT_ULL(53) +#define GEN12_GGTT_PTE_ADDR_MASK GENMASK_ULL(45, 12) +#define MTL_GGTT_PTE_PAT_MASK GENMASK_ULL(53, 52)#define GEN12_PDE_64K BIT(6)#define GEN12_PTE_PS64 BIT(8)@@ -147,6 +156,15 @@ typedef u64 gen8_pte_t;#define GEN8_PDE_IPS_64K BIT(11)#define GEN8_PDE_PS_2M BIT(7) +#define MTL_PPAT_L4_CACHE_POLICY_MASK REG_GENMASK(3, 2) +#define MTL_PAT_INDEX_COH_MODE_MASK REG_GENMASK(1, 0) +#define MTL_PPAT_L4_3_UC REG_FIELD_PREP(MTL_PPAT_L4_CACHE_POLICY_MASK, 3) +#define MTL_PPAT_L4_1_WT REG_FIELD_PREP(MTL_PPAT_L4_CACHE_POLICY_MASK, 1) +#define MTL_PPAT_L4_0_WB REG_FIELD_PREP(MTL_PPAT_L4_CACHE_POLICY_MASK, 0) +#define MTL_3_COH_2W REG_FIELD_PREP(MTL_PAT_INDEX_COH_MODE_MASK, 3) +#define MTL_2_COH_1W REG_FIELD_PREP(MTL_PAT_INDEX_COH_MODE_MASK, 2) +#define MTL_0_COH_NON REG_FIELD_PREP(MTL_PAT_INDEX_COH_MODE_MASK, 0) +enum i915_cache_level ;struct drm_i915_gem_object ;drivers/gpu/drm/i915/gt/intel_mocs.c +72
-4@@ -40,6 +40,10 @@ struct drm_i915_mocs_table {#define LE_COS (value) ((value) << 15)#define LE_SSE (value) ((value) << 17) +/* Defines for the tables (GLOB_MOCS_0 - GLOB_MOCS_16) */ +#define _L4_CACHEABILITY (value) ((value) << 2) +#define IG_PAT (value) ((value) << 8) +/* Defines for the tables (LNCFMOCS0 - LNCFMOCS31) - two entries per word */ #define L3_ESC (value) ((value) << 0)#define L3_SCC (value) ((value) << 1)@@ -50,6 +54,7 @@ struct drm_i915_mocs_table {/* Helper defines */ #define GEN9_NUM_MOCS_ENTRIES 64/* 63-64 are reserved, but configured. */ #define PVC_NUM_MOCS_ENTRIES 3 +#define MTL_NUM_MOCS_ENTRIES 16/* (e)LLC caching options */ /* @@ -73,6 +78,12 @@ struct drm_i915_mocs_table {#define L3_2_RESERVED _L3_CACHEABILITY(2)#define L3_3_WB _L3_CACHEABILITY(3) +/* L4 caching options */ +#define L4_0_WB _L4_CACHEABILITY(0) +#define L4_1_WT _L4_CACHEABILITY(1) +#define L4_2_RESERVED _L4_CACHEABILITY(2) +#define L4_3_UC _L4_CACHEABILITY(3) +#define MOCS_ENTRY (__idx, __control_value, __l3cc_value) \ [__idx] = { \ .control_value = __control_value, \@@ -416,6 +427,57 @@ static const struct drm_i915_mocs_entry pvc_mocs_table[] = { MOCS_ENTRY(2, 0, L3_3_WB), }; +static const struct drm_i915_mocs_entry mtl_mocs_table[] = { +/* Error - Reserved for Non-Use */ +MOCS_ENTRY (0 , +IG_PAT (0 ), +L3_LKUP (1 ) |L3_3_WB ), +/* Cached - L3 + L4 */ +MOCS_ENTRY (1 , +IG_PAT (1 ), +L3_LKUP (1 ) |L3_3_WB ), +/* L4 - GO:L3 */ +MOCS_ENTRY (2 , +IG_PAT (1 ), +L3_LKUP (1 ) |L3_1_UC ), +/* Uncached - GO:L3 */ +MOCS_ENTRY (3 , +IG_PAT (1 ) |L4_3_UC , +L3_LKUP (1 ) |L3_1_UC ), +/* L4 - GO:Mem */ +MOCS_ENTRY (4 , +IG_PAT (1 ), +L3_LKUP (1 ) |L3_GLBGO (1 ) |L3_1_UC ), +/* Uncached - GO:Mem */ +MOCS_ENTRY (5 , +IG_PAT (1 ) |L4_3_UC , +L3_LKUP (1 ) |L3_GLBGO (1 ) |L3_1_UC ), +/* L4 - L3:NoLKUP; GO:L3 */ +MOCS_ENTRY (6 , +IG_PAT (1 ), +L3_1_UC ), +/* Uncached - L3:NoLKUP; GO:L3 */ +MOCS_ENTRY (7 , +IG_PAT (1 ) |L4_3_UC , +L3_1_UC ), +/* L4 - L3:NoLKUP; GO:Mem */ +MOCS_ENTRY (8 , +IG_PAT (1 ), +L3_GLBGO (1 ) |L3_1_UC ), +/* Uncached - L3:NoLKUP; GO:Mem */ +MOCS_ENTRY (9 , +IG_PAT (1 ) |L4_3_UC , +L3_GLBGO (1 ) |L3_1_UC ), +/* Display - L3; L4:WT */ +MOCS_ENTRY (14 , +IG_PAT (1 ) |L4_1_WT , +L3_LKUP (1 ) |L3_3_WB ), +/* CCS - Non-Displayable */ +MOCS_ENTRY (15 , +IG_PAT (1 ), +L3_GLBGO (1 ) |L3_1_UC ), +}; +enum {HAS_GLOBAL_MOCS =BIT (0 ),HAS_ENGINE_MOCS =BIT (1 ),@@ -445,7 +507,13 @@ static unsigned int get_mocs_settings(const struct drm_i915_private *i915,memset (table,0 ,sizeof (struct drm_i915_mocs_table )); table->unused_entries_index =I915_MOCS_PTE ; -if (IS_PONTEVECCHIO (i915)) { +if (IS_METEORLAKE (i915)) { + table->size =ARRAY_SIZE (mtl_mocs_table); + table->table = mtl_mocs_table; + table->n_entries =MTL_NUM_MOCS_ENTRIES ; + table->uc_index =9 ; + table->unused_entries_index =1 ; + }else if (IS_PONTEVECCHIO (i915)) { table->size =ARRAY_SIZE (pvc_mocs_table); table->table = pvc_mocs_table; table->n_entries =PVC_NUM_MOCS_ENTRIES ;@@ -646,9 +714,9 @@ void intel_mocs_init_engine(struct intel_engine_cs *engine)init_l3cc_table (engine->gt, &table); } -static u32 global_mocs_offset (void ) +static u32 global_mocs_offset (struct intel_gt *gt) { -return i915_mmio_reg_offset (GEN12_GLOBAL_MOCS (0 )); +return i915_mmio_reg_offset (GEN12_GLOBAL_MOCS (0 )) + gt->uncore->gsi_offset; }void intel_set_mocs_index (struct intel_gt *gt)@@ -671,7 +739,7 @@ void intel_mocs_init(struct intel_gt *gt)*/ flags =get_mocs_settings (gt->i915, &table);if (flags &HAS_GLOBAL_MOCS ) -__init_mocs_table (gt->uncore, &table,global_mocs_offset ()); +__init_mocs_table (gt->uncore, &table,global_mocs_offset (gt));/* * Initialize the L3CC table as part of mocs initalization to make drivers/gpu/drm/i915/gt/selftest_mocs.c +0
-0
drivers/gpu/drm/i915/gt/selftest_mocs.c static int read_mocs_table(struct i915_request *rq, · line 142
Quoted 7 lines
drivers/gpu/drm/i915/gt/selftest_mocs.c +1
-1@@ -137,7 +137,7 @@ static int read_mocs_table(struct i915_request *rq,return 0 ;if (HAS_GLOBAL_MOCS_REGISTERS (rq->engine->i915)) - addr =global_mocs_offset (); + addr =global_mocs_offset (rq->engine->gt);else addr =mocs_offset (rq->engine);
Regards
Andrzej
Quoted 1 line
Quoted 19 lines
Quoted 8 lines
void
setup_private_pat(struct intel_gt *gt)GEM_BUG_ON(GRAPHICS_VER(i915) < 8);drivers/gpu/drm/i915/gt/intel_gtt.c +0
-4-if (GRAPHICS_VER_FULL (i915) >=IP_VER (12 ,50 )) -xehp_setup_private_ppat (gt); -else if (GRAPHICS_VER (i915) >=12 ) -tgl_setup_private_ppat (uncore);drivers/gpu/drm/i915/gt/intel_gtt.c void setup_private_pat(struct intel_gt *gt) · line 645
Quoted 10 lines
drivers/gpu/drm/i915/gt/intel_gtt.c +4
-6-else if (GRAPHICS_VER (i915) >=11 ) -icl_setup_private_ppat (uncore); -else if (IS_CHERRYVIEW (i915) ||IS_GEN9_LP (i915)) -chv_setup_private_ppat (uncore); -else -bdw_setup_private_ppat (uncore); +if (gt->type ==GT_MEDIA ) { +xelpmp_setup_private_ppat (gt->uncore); + }else { +if (GRAPHICS_VER_FULL (i915) >=IP_VER (12 ,70 ))
Quoted 1 line
You could just use "else if" here to avoid indendation, for now it would work, up to you.
Will update.
Quoted 13 lines
Quoted 13 lines
drivers/gpu/drm/i915/gt/intel_gtt.c +12
-0+xelpg_setup_private_ppat (gt); + else if (GRAPHICS_VER_FULL(i915) >= IP_VER(12, 50)) + xehp_setup_private_ppat(gt); + else if (GRAPHICS_VER(i915) >= 12) + tgl_setup_private_ppat(uncore); + else if (GRAPHICS_VER(i915) >= 11) + icl_setup_private_ppat(uncore); + else if (IS_CHERRYVIEW(i915) || IS_GEN9_LP(i915)) + chv_setup_private_ppat(uncore); + else +bdw_setup_private_ppat (uncore ); + } }
......
Quoted 4 lines · On 4/17/2023 8:24 AM, [email protected] wrote:
From: Madhumitha Tolakanahalli Pradeep <[email protected]>
On MTL, GT can no longer allocate on LLC - only the CPU can. This, along with addition of support for L4 cache calls a
s/calls a/calls for a
Quoted 2 lines
MOCS/PAT table update.
Alos the PAT index registers are multicasted for primary GT,
s/Alos/Also
Quoted 2 lines
and there is an address jump from index 7 to 8. This patch makes sure these registers are programmed in the proper way.
"Makes sure that"
With those minor nits fixed:
Quoted 297 lines
BSpec: 44509, 45101, 44235
Cc Matt Roper <[email protected]>Cc Lucas De Marchi <[email protected]>Signed-off-by Madhumitha Tolakanahalli Pradeep <[email protected]>Signed-off-by Aravind Iddamsetty <[email protected]>Signed-off-by Nirmoy Das <[email protected]>Signed-off-by Fei Yang <[email protected]>--- drivers/gpu/drm/i915/gt/intel_gt_regs.h | 6 +- drivers/gpu/drm/i915/gt/intel_gtt.c | 62 ++++++++++++++++---- drivers/gpu/drm/i915/gt/intel_gtt.h | 20 ++++++- drivers/gpu/drm/i915/gt/intel_mocs.c | 76 +++++++++++++++++++++++-- drivers/gpu/drm/i915/gt/selftest_mocs.c | 2 +- 5 files changed, 149 insertions(+), 17 deletions(-)drivers/gpu/drm/i915/gt/intel_gt_regs.h +5
-1@@ -356,7 +356,11 @@#define GEN7_TLB_RD_ADDR _MMIO(0x4700)#define GEN12_PAT_INDEX (index) _MMIO(0x4800 + (index) * 4) -#define XEHP_PAT_INDEX (index) MCR_REG(0x4800 + (index) * 4) +#define _PAT_INDEX (index) _PICK_EVEN_2RANGES(index, 8, \ + 0x4800, 0x4804, \ + 0x4848, 0x484c) +#define XEHP_PAT_INDEX (index) MCR_REG(_PAT_INDEX(index)) +#define XELPMP_PAT_INDEX (index) _MMIO(_PAT_INDEX(index))#define XEHP_TILE0_ADDR_RANGE MCR_REG(0x4900)#define XEHP_TILE_LMEM_RANGE_SHIFT 8drivers/gpu/drm/i915/gt/intel_gtt.c +52
-10@@ -468,6 +468,42 @@ void gtt_write_workarounds(struct intel_gt *gt) } } +static void xelpmp_setup_private_ppat (struct intel_uncore *uncore) +{ +intel_uncore_write (uncore,XELPMP_PAT_INDEX (0 ),MTL_PPAT_L4_0_WB ); +intel_uncore_write (uncore,XELPMP_PAT_INDEX (1 ),MTL_PPAT_L4_1_WT ); +intel_uncore_write (uncore,XELPMP_PAT_INDEX (2 ),MTL_PPAT_L4_3_UC ); +intel_uncore_write (uncore,XELPMP_PAT_INDEX (3 ), +MTL_PPAT_L4_0_WB |MTL_2_COH_1W ); +intel_uncore_write (uncore,XELPMP_PAT_INDEX (4 ), +MTL_PPAT_L4_0_WB |MTL_3_COH_2W ); + +/* +* Remaining PAT entries are left at the hardware-default +* fully-cached setting +*/ + +} + +static void xelpg_setup_private_ppat (struct intel_gt *gt) +{ +intel_gt_mcr_multicast_write (gt,XEHP_PAT_INDEX (0 ), +MTL_PPAT_L4_0_WB ); +intel_gt_mcr_multicast_write (gt,XEHP_PAT_INDEX (1 ), +MTL_PPAT_L4_1_WT ); +intel_gt_mcr_multicast_write (gt,XEHP_PAT_INDEX (2 ), +MTL_PPAT_L4_3_UC ); +intel_gt_mcr_multicast_write (gt,XEHP_PAT_INDEX (3 ), +MTL_PPAT_L4_0_WB |MTL_2_COH_1W ); +intel_gt_mcr_multicast_write (gt,XEHP_PAT_INDEX (4 ), +MTL_PPAT_L4_0_WB |MTL_3_COH_2W ); + +/* +* Remaining PAT entries are left at the hardware-default +* fully-cached setting +*/ +} +static void tgl_setup_private_ppat (struct intel_uncore *uncore) {/* TGL doesn't support LLC or AGE settings */ @@ -603,16 +639,22 @@ void setup_private_pat(struct intel_gt *gt)GEM_BUG_ON (GRAPHICS_VER (i915) <8 ); -if (GRAPHICS_VER_FULL (i915) >=IP_VER (12 ,50 )) -xehp_setup_private_ppat (gt); -else if (GRAPHICS_VER (i915) >=12 ) -tgl_setup_private_ppat (uncore); -else if (GRAPHICS_VER (i915) >=11 ) -icl_setup_private_ppat (uncore); -else if (IS_CHERRYVIEW (i915) ||IS_GEN9_LP (i915)) -chv_setup_private_ppat (uncore); -else -bdw_setup_private_ppat (uncore); +if (gt->type ==GT_MEDIA ) { +xelpmp_setup_private_ppat (gt->uncore); + }else { +if (GRAPHICS_VER_FULL (i915) >=IP_VER (12 ,70 )) +xelpg_setup_private_ppat (gt); +else if (GRAPHICS_VER_FULL (i915) >=IP_VER (12 ,50 )) +xehp_setup_private_ppat (gt); +else if (GRAPHICS_VER (i915) >=12 ) +tgl_setup_private_ppat (uncore); +else if (GRAPHICS_VER (i915) >=11 ) +icl_setup_private_ppat (uncore); +else if (IS_CHERRYVIEW (i915) ||IS_GEN9_LP (i915)) +chv_setup_private_ppat (uncore); +else +bdw_setup_private_ppat (uncore); + } } struct i915_vma *drivers/gpu/drm/i915/gt/intel_gtt.h +19
-1@@ -88,9 +88,18 @@ typedef u64 gen8_pte_t;#define BYT_PTE_SNOOPED_BY_CPU_CACHES REG_BIT(2)#define BYT_PTE_WRITEABLE REG_BIT(1) +#define MTL_PPGTT_PTE_PAT3 BIT_ULL(62)#define GEN12_PPGTT_PTE_LM BIT_ULL(11) +#define GEN12_PPGTT_PTE_PAT2 BIT_ULL(7) +#define GEN12_PPGTT_PTE_NC BIT_ULL(5) +#define GEN12_PPGTT_PTE_PAT1 BIT_ULL(4) +#define GEN12_PPGTT_PTE_PAT0 BIT_ULL(3) -#define GEN12_GGTT_PTE_LM BIT_ULL(1) +#define GEN12_GGTT_PTE_LM BIT_ULL(1) +#define MTL_GGTT_PTE_PAT0 BIT_ULL(52) +#define MTL_GGTT_PTE_PAT1 BIT_ULL(53) +#define GEN12_GGTT_PTE_ADDR_MASK GENMASK_ULL(45, 12) +#define MTL_GGTT_PTE_PAT_MASK GENMASK_ULL(53, 52)#define GEN12_PDE_64K BIT(6)#define GEN12_PTE_PS64 BIT(8)@@ -147,6 +156,15 @@ typedef u64 gen8_pte_t;#define GEN8_PDE_IPS_64K BIT(11)#define GEN8_PDE_PS_2M BIT(7) +#define MTL_PPAT_L4_CACHE_POLICY_MASK REG_GENMASK(3, 2) +#define MTL_PAT_INDEX_COH_MODE_MASK REG_GENMASK(1, 0) +#define MTL_PPAT_L4_3_UC REG_FIELD_PREP(MTL_PPAT_L4_CACHE_POLICY_MASK, 3) +#define MTL_PPAT_L4_1_WT REG_FIELD_PREP(MTL_PPAT_L4_CACHE_POLICY_MASK, 1) +#define MTL_PPAT_L4_0_WB REG_FIELD_PREP(MTL_PPAT_L4_CACHE_POLICY_MASK, 0) +#define MTL_3_COH_2W REG_FIELD_PREP(MTL_PAT_INDEX_COH_MODE_MASK, 3) +#define MTL_2_COH_1W REG_FIELD_PREP(MTL_PAT_INDEX_COH_MODE_MASK, 2) +#define MTL_0_COH_NON REG_FIELD_PREP(MTL_PAT_INDEX_COH_MODE_MASK, 0) +enum i915_cache_level ;struct drm_i915_gem_object ;drivers/gpu/drm/i915/gt/intel_mocs.c +72
-4@@ -40,6 +40,10 @@ struct drm_i915_mocs_table {#define LE_COS (value) ((value) << 15)#define LE_SSE (value) ((value) << 17) +/* Defines for the tables (GLOB_MOCS_0 - GLOB_MOCS_16) */ +#define _L4_CACHEABILITY (value) ((value) << 2) +#define IG_PAT (value) ((value) << 8) +/* Defines for the tables (LNCFMOCS0 - LNCFMOCS31) - two entries per word */ #define L3_ESC (value) ((value) << 0)#define L3_SCC (value) ((value) << 1)@@ -50,6 +54,7 @@ struct drm_i915_mocs_table {/* Helper defines */ #define GEN9_NUM_MOCS_ENTRIES 64/* 63-64 are reserved, but configured. */ #define PVC_NUM_MOCS_ENTRIES 3 +#define MTL_NUM_MOCS_ENTRIES 16/* (e)LLC caching options */ /* @@ -73,6 +78,12 @@ struct drm_i915_mocs_table {#define L3_2_RESERVED _L3_CACHEABILITY(2)#define L3_3_WB _L3_CACHEABILITY(3) +/* L4 caching options */ +#define L4_0_WB _L4_CACHEABILITY(0) +#define L4_1_WT _L4_CACHEABILITY(1) +#define L4_2_RESERVED _L4_CACHEABILITY(2) +#define L4_3_UC _L4_CACHEABILITY(3) +#define MOCS_ENTRY (__idx, __control_value, __l3cc_value) \ [__idx] = { \ .control_value = __control_value, \@@ -416,6 +427,57 @@ static const struct drm_i915_mocs_entry pvc_mocs_table[] = { MOCS_ENTRY(2, 0, L3_3_WB), }; +static const struct drm_i915_mocs_entry mtl_mocs_table[] = { +/* Error - Reserved for Non-Use */ +MOCS_ENTRY (0 , +IG_PAT (0 ), +L3_LKUP (1 ) |L3_3_WB ), +/* Cached - L3 + L4 */ +MOCS_ENTRY (1 , +IG_PAT (1 ), +L3_LKUP (1 ) |L3_3_WB ), +/* L4 - GO:L3 */ +MOCS_ENTRY (2 , +IG_PAT (1 ), +L3_LKUP (1 ) |L3_1_UC ), +/* Uncached - GO:L3 */ +MOCS_ENTRY (3 , +IG_PAT (1 ) |L4_3_UC , +L3_LKUP (1 ) |L3_1_UC ), +/* L4 - GO:Mem */ +MOCS_ENTRY (4 , +IG_PAT (1 ), +L3_LKUP (1 ) |L3_GLBGO (1 ) |L3_1_UC ), +/* Uncached - GO:Mem */ +MOCS_ENTRY (5 , +IG_PAT (1 ) |L4_3_UC , +L3_LKUP (1 ) |L3_GLBGO (1 ) |L3_1_UC ), +/* L4 - L3:NoLKUP; GO:L3 */ +MOCS_ENTRY (6 , +IG_PAT (1 ), +L3_1_UC ), +/* Uncached - L3:NoLKUP; GO:L3 */ +MOCS_ENTRY (7 , +IG_PAT (1 ) |L4_3_UC , +L3_1_UC ), +/* L4 - L3:NoLKUP; GO:Mem */ +MOCS_ENTRY (8 , +IG_PAT (1 ), +L3_GLBGO (1 ) |L3_1_UC ), +/* Uncached - L3:NoLKUP; GO:Mem */ +MOCS_ENTRY (9 , +IG_PAT (1 ) |L4_3_UC , +L3_GLBGO (1 ) |L3_1_UC ), +/* Display - L3; L4:WT */ +MOCS_ENTRY (14 , +IG_PAT (1 ) |L4_1_WT , +L3_LKUP (1 ) |L3_3_WB ), +/* CCS - Non-Displayable */ +MOCS_ENTRY (15 , +IG_PAT (1 ), +L3_GLBGO (1 ) |L3_1_UC ), +}; +enum {HAS_GLOBAL_MOCS =BIT (0 ),HAS_ENGINE_MOCS =BIT (1 ),@@ -445,7 +507,13 @@ static unsigned int get_mocs_settings(const struct drm_i915_private *i915,memset (table,0 ,sizeof (struct drm_i915_mocs_table )); table->unused_entries_index =I915_MOCS_PTE ; -if (IS_PONTEVECCHIO (i915)) { +if (IS_METEORLAKE (i915)) { + table->size =ARRAY_SIZE (mtl_mocs_table); + table->table = mtl_mocs_table; + table->n_entries =MTL_NUM_MOCS_ENTRIES ; + table->uc_index =9 ; + table->unused_entries_index =1 ; + }else if (IS_PONTEVECCHIO (i915)) { table->size =ARRAY_SIZE (pvc_mocs_table); table->table = pvc_mocs_table; table->n_entries =PVC_NUM_MOCS_ENTRIES ;@@ -646,9 +714,9 @@ void intel_mocs_init_engine(struct intel_engine_cs *engine)init_l3cc_table (engine->gt, &table); } -static u32 global_mocs_offset (void ) +static u32 global_mocs_offset (struct intel_gt *gt) { -return i915_mmio_reg_offset (GEN12_GLOBAL_MOCS (0 )); +return i915_mmio_reg_offset (GEN12_GLOBAL_MOCS (0 )) + gt->uncore->gsi_offset; }void intel_set_mocs_index (struct intel_gt *gt)@@ -671,7 +739,7 @@ void intel_mocs_init(struct intel_gt *gt)*/ flags =get_mocs_settings (gt->i915, &table);if (flags &HAS_GLOBAL_MOCS ) -__init_mocs_table (gt->uncore, &table,global_mocs_offset ()); +__init_mocs_table (gt->uncore, &table,global_mocs_offset (gt));/* * Initialize the L3CC table as part of mocs initalization to make drivers/gpu/drm/i915/gt/selftest_mocs.c +1
-1@@ -137,7 +137,7 @@ static int read_mocs_table(struct i915_request *rq,return 0 ;if (HAS_GLOBAL_MOCS_REGISTERS (rq->engine->i915)) - addr =global_mocs_offset (); + addr =global_mocs_offset (rq->engine->gt);else addr =mocs_offset (rq->engine);
Quoted 3 lines
Quoted 2 lines
On MTL, GT can no longer allocate on LLC - only the CPU can. This, along with addition of support for L4 cache calls a
s/calls a/calls for a
Will update
Quoted 7 lines
Quoted 2 lines
MOCS/PAT table update.
Alos the PAT index registers are multicasted for primary GT,s/Alos/Also
Quoted 2 lines
and there is an address jump from index 7 to 8. This patch makes sure these registers are programmed in the proper way.
"Makes sure that"
Will update.
PATCH 3/8 drm/i915/mtl: Add PTE encode function
In reply to [email protected]From: Fei Yang <[email protected]>
PTE encode functions are platform dependent. This patch implements PTE functions for MTL, and ensures the correct PTE encode function is used by calling pte_encode function pointer instead of the hardcoded gen8 version of PTE encode.
--- drivers/gpu/drm/i915/display/intel_dpt.c | 2 +- drivers/gpu/drm/i915/gt/gen8_ppgtt.c | 45 ++++++++++++++++++++---- drivers/gpu/drm/i915/gt/gen8_ppgtt.h | 3 ++ drivers/gpu/drm/i915/gt/intel_ggtt.c | 36 +++++++++++++++++-- 4 files changed, 75 insertions(+), 11 deletions(-)
drivers/gpu/drm/i915/display/intel_dpt.c +1 -1
@@ -300,7 +300,7 @@ intel_dpt_create(struct intel_framebuffer *fb) vm->vma_ops.bind_vma = dpt_bind_vma; vm->vma_ops.unbind_vma = dpt_unbind_vma; - vm->pte_encode = gen8_ggtt_pte_encode; + vm->pte_encode = vm->gt->ggtt->vm.pte_encode; dpt->obj = dpt_obj; dpt->obj->is_dpt = true;
drivers/gpu/drm/i915/gt/gen8_ppgtt.c +38 -7
87 lines not on this page · raw message
drivers/gpu/drm/i915/gt/gen8_ppgtt.h +3 -0
@@ -18,5 +18,8 @@ struct i915_ppgtt *gen8_ppgtt_create(struct intel_gt *gt,u64 gen8_ggtt_pte_encode (dma_addr_t addr,enum i915_cache_level level,u32 flags); +u64 mtl_ggtt_pte_encode (dma_addr_t addr, +unsigned int pat_index, +u32 flags);#endif
drivers/gpu/drm/i915/gt/intel_ggtt.c +33 -3
@@ -220,6 +220,33 @@ static void guc_ggtt_invalidate(struct i915_ggtt *ggtt) } } +u64 mtl_ggtt_pte_encode (dma_addr_t addr, +enum i915_cache_level level, +u32 flags) +{ +gen8_pte_t pte = addr |GEN8_PAGE_PRESENT ; + +GEM_BUG_ON (addr & ~GEN12_GGTT_PTE_ADDR_MASK ); + +if (flags &PTE_LM ) + pte |=GEN12_GGTT_PTE_LM ; + +switch (level) { +case I915_CACHE_NONE : + pte |=MTL_GGTT_PTE_PAT1 ; +break ; +case I915_CACHE_LLC : +case I915_CACHE_L3_LLC : + pte |=MTL_GGTT_PTE_PAT0 |MTL_GGTT_PTE_PAT1 ; +break ; +case I915_CACHE_WT : + pte |=MTL_GGTT_PTE_PAT0 ; +break ; + } + +return pte; +} +u64 gen8_ggtt_pte_encode (dma_addr_t addr,enum i915_cache_level level,u32 flags)
@@ -247,7 +274,7 @@ static void gen8_ggtt_insert_page(struct i915_address_space *vm,gen8_pte_t __iomem *pte = (gen8_pte_t __iomem *)ggtt->gsm + offset /I915_GTT_PAGE_SIZE ; -gen8_set_pte (pte,gen8_ggtt_pte_encode (addr, level, flags)); +gen8_set_pte (pte, ggtt->vm.pte_encode (addr, level, flags)); ggtt->invalidate (ggtt); }
@@ -257,8 +284,8 @@ static void gen8_ggtt_insert_entries(struct i915_address_space *vm, enum i915_cache_level level, u32 flags) { -const gen8_pte_t pte_encode =gen8_ggtt_pte_encode (0 , level, flags);struct i915_ggtt *ggtt =i915_vm_to_ggtt (vm); +const gen8_pte_t pte_encode = ggtt->vm.pte_encode (0 , level, flags);gen8_pte_t __iomem *gte;gen8_pte_t __iomem *end;struct sgt_iter iter;
@@ -981,7 +1008,10 @@ static int gen8_gmch_probe(struct i915_ggtt *ggtt) ggtt->vm.vma_ops.bind_vma = intel_ggtt_bind_vma; ggtt->vm.vma_ops.unbind_vma = intel_ggtt_unbind_vma; - ggtt->vm.pte_encode = gen8_ggtt_pte_encode; +if (GRAPHICS_VER_FULL (i915) >=IP_VER (12 ,70 )) + ggtt->vm.pte_encode = mtl_ggtt_pte_encode; +else + ggtt->vm.pte_encode = gen8_ggtt_pte_encode;return ggtt_probe_common (ggtt, size); }
Signature · 1 line
2.25.1
Re: [Intel-gfx] [PATCH 3/8] drm/i915/mtl: Add PTE encode function
Hi Fei,
Quoted 8 lines · On Sun, Apr 16, 2023 at 11:24:58PM -0700, [email protected] wrote:
From: Fei Yang <[email protected]>
PTE encode functions are platform dependent. This patch implements PTE functions for MTL, and ensures the correct PTE encode function is used by calling
pte_encodefunction pointer instead of the hardcoded gen8 version of PTE encode.Signed-off-by Fei Yang <[email protected]>
Andi
Re: [Intel-gfx] [PATCH 3/8] drm/i915/mtl: Add PTE encode function
In reply to [email protected]Quoted 8 lines · On 17.04.2023 08:24, [email protected] wrote:
From: Fei Yang <[email protected]>
PTE encode functions are platform dependent. This patch implements PTE functions for MTL, and ensures the correct PTE encode function is used by calling
pte_encodefunction pointer instead of the hardcoded gen8 version of PTE encode.Signed-off-by Fei Yang <[email protected]>
Regards
Andrzej
Quoted 200 lines
--- drivers/gpu/drm/i915/display/intel_dpt.c | 2 +- drivers/gpu/drm/i915/gt/gen8_ppgtt.c | 45 ++++++++++++++++++++---- drivers/gpu/drm/i915/gt/gen8_ppgtt.h | 3 ++ drivers/gpu/drm/i915/gt/intel_ggtt.c | 36 +++++++++++++++++-- 4 files changed, 75 insertions(+), 11 deletions(-)drivers/gpu/drm/i915/display/intel_dpt.c +1
-1@@ -300,7 +300,7 @@ intel_dpt_create(struct intel_framebuffer *fb) vm->vma_ops.bind_vma = dpt_bind_vma; vm->vma_ops.unbind_vma = dpt_unbind_vma; - vm->pte_encode = gen8_ggtt_pte_encode; + vm->pte_encode = vm->gt->ggtt->vm.pte_encode; dpt->obj = dpt_obj; dpt->obj->is_dpt = true;drivers/gpu/drm/i915/gt/gen8_ppgtt.c +38
-7@@ -55,6 +55,34 @@ static u64 gen8_pte_encode(dma_addr_t addr,return pte; } +static u64 mtl_pte_encode (dma_addr_t addr, +enum i915_cache_level level, +u32 flags) +{ +gen8_pte_t pte = addr |GEN8_PAGE_PRESENT |GEN8_PAGE_RW ; + +if (unlikely (flags &PTE_READ_ONLY )) + pte &= ~GEN8_PAGE_RW ; + +if (flags &PTE_LM ) + pte |=GEN12_PPGTT_PTE_LM |GEN12_PPGTT_PTE_NC ; + +switch (level) { +case I915_CACHE_NONE : + pte |=GEN12_PPGTT_PTE_PAT1 ; +break ; +case I915_CACHE_LLC : +case I915_CACHE_L3_LLC : + pte |=GEN12_PPGTT_PTE_PAT0 |GEN12_PPGTT_PTE_PAT1 ; +break ; +case I915_CACHE_WT : + pte |=GEN12_PPGTT_PTE_PAT0 ; +break ; + } + +return pte; +} +static void gen8_ppgtt_notify_vgt (struct i915_ppgtt *ppgtt,bool create) {struct drm_i915_private *i915 = ppgtt->vm.i915;@@ -427,7 +455,7 @@ gen8_ppgtt_insert_pte(struct i915_ppgtt *ppgtt, u32 flags) {struct i915_page_directory *pd; -const gen8_pte_t pte_encode =gen8_pte_encode (0 , cache_level, flags); +const gen8_pte_t pte_encode = ppgtt->vm.pte_encode (0 , cache_level, flags);gen8_pte_t *vaddr; pd =i915_pd_entry (pdp,gen8_pd_index (idx,2 ));@@ -580,7 +608,7 @@ static void gen8_ppgtt_insert_huge(struct i915_address_space *vm, enum i915_cache_level cache_level, u32 flags) { -const gen8_pte_t pte_encode =gen8_pte_encode (0 , cache_level, flags); +const gen8_pte_t pte_encode = vm->pte_encode (0 , cache_level, flags);unsigned int rem =sg_dma_len (iter->sg);u64 start = vma_res->start;@@ -743,7 +771,7 @@ static void gen8_ppgtt_insert_entry(struct i915_address_space *vm,GEM_BUG_ON (pt->is_compact); vaddr =px_vaddr (pt); - vaddr[gen8_pd_index (idx,0 )] =gen8_pte_encode (addr, level, flags); + vaddr[gen8_pd_index (idx,0 )] = vm->pte_encode (addr, level, flags);drm_clflush_virt_range (&vaddr[gen8_pd_index (idx,0 )],sizeof (*vaddr)); }@@ -773,7 +801,7 @@ static void __xehpsdv_ppgtt_insert_entry_lm(struct i915_address_space *vm, } vaddr =px_vaddr (pt); - vaddr[gen8_pd_index (idx,0 ) /16 ] =gen8_pte_encode (addr, level, flags); + vaddr[gen8_pd_index (idx,0 ) /16 ] = vm->pte_encode (addr, level, flags); } static void xehpsdv_ppgtt_insert_entry(struct i915_address_space *vm,@@ -820,8 +848,8 @@ static int gen8_init_scratch(struct i915_address_space *vm) pte_flags |=PTE_LM ; vm->scratch[0 ]->encode = -gen8_pte_encode (px_dma (vm->scratch[0 ]), -I915_CACHE_NONE , pte_flags); + vm->pte_encode (px_dma (vm->scratch[0 ]), +I915_CACHE_NONE , pte_flags);for (i =1 ; i <= vm->top; i++) {struct drm_i915_gem_object *obj;@@ -963,7 +991,10 @@ struct i915_ppgtt *gen8_ppgtt_create(struct intel_gt *gt,*/ ppgtt->vm.alloc_scratch_dma = alloc_pt_dma; - ppgtt->vm.pte_encode = gen8_pte_encode; +if (GRAPHICS_VER_FULL (gt->i915) >=IP_VER (12 ,70 )) + ppgtt->vm.pte_encode = mtl_pte_encode; +else + ppgtt->vm.pte_encode = gen8_pte_encode; ppgtt->vm.bind_async_flags =I915_VMA_LOCAL_BIND ; ppgtt->vm.insert_entries = gen8_ppgtt_insert;drivers/gpu/drm/i915/gt/gen8_ppgtt.h +3
-0@@ -18,5 +18,8 @@ struct i915_ppgtt *gen8_ppgtt_create(struct intel_gt *gt,u64 gen8_ggtt_pte_encode (dma_addr_t addr,enum i915_cache_level level,u32 flags); +u64 mtl_ggtt_pte_encode (dma_addr_t addr, +unsigned int pat_index, +u32 flags);#endif drivers/gpu/drm/i915/gt/intel_ggtt.c +33
-3@@ -220,6 +220,33 @@ static void guc_ggtt_invalidate(struct i915_ggtt *ggtt) } } +u64 mtl_ggtt_pte_encode (dma_addr_t addr, +enum i915_cache_level level, +u32 flags) +{ +gen8_pte_t pte = addr |GEN8_PAGE_PRESENT ; + +GEM_BUG_ON (addr & ~GEN12_GGTT_PTE_ADDR_MASK ); + +if (flags &PTE_LM ) + pte |=GEN12_GGTT_PTE_LM ; + +switch (level) { +case I915_CACHE_NONE : + pte |=MTL_GGTT_PTE_PAT1 ; +break ; +case I915_CACHE_LLC : +case I915_CACHE_L3_LLC : + pte |=MTL_GGTT_PTE_PAT0 |MTL_GGTT_PTE_PAT1 ; +break ; +case I915_CACHE_WT : + pte |=MTL_GGTT_PTE_PAT0 ; +break ; + } + +return pte; +} +u64 gen8_ggtt_pte_encode (dma_addr_t addr,enum i915_cache_level level,u32 flags)@@ -247,7 +274,7 @@ static void gen8_ggtt_insert_page(struct i915_address_space *vm,gen8_pte_t __iomem *pte = (gen8_pte_t __iomem *)ggtt->gsm + offset /I915_GTT_PAGE_SIZE ; -gen8_set_pte (pte,gen8_ggtt_pte_encode (addr, level, flags)); +gen8_set_pte (pte, ggtt->vm.pte_encode (addr, level, flags)); ggtt->invalidate (ggtt); }@@ -257,8 +284,8 @@ static void gen8_ggtt_insert_entries(struct i915_address_space *vm, enum i915_cache_level level, u32 flags) { -const gen8_pte_t pte_encode =gen8_ggtt_pte_encode (0 , level, flags);struct i915_ggtt *ggtt =i915_vm_to_ggtt (vm); +const gen8_pte_t pte_encode = ggtt->vm.pte_encode (0 , level, flags);gen8_pte_t __iomem *gte;gen8_pte_t __iomem *end;struct sgt_iter iter;@@ -981,7 +1008,10 @@ static int gen8_gmch_probe(struct i915_ggtt *ggtt) ggtt->vm.vma_ops.bind_vma = intel_ggtt_bind_vma; ggtt->vm.vma_ops.unbind_vma = intel_ggtt_unbind_vma; - ggtt->vm.pte_encode = gen8_ggtt_pte_encode; +if (GRAPHICS_VER_FULL (i915) >=IP_VER (12 ,70 )) + ggtt->vm.pte_encode = mtl_ggtt_pte_encode; +else + ggtt->vm.pte_encode = gen8_ggtt_pte_encode;return ggtt_probe_common (ggtt, size); }
Re: [PATCH 3/8] drm/i915/mtl: Add PTE encode function
In reply to [email protected]Quoted 131 lines · On 4/17/2023 8:24 AM, [email protected] wrote:
From: Fei Yang <[email protected]>
PTE encode functions are platform dependent. This patch implements PTE functions for MTL, and ensures the correct PTE encode function is used by calling
pte_encodefunction pointer instead of the hardcoded gen8 version of PTE encode.Signed-off-by Fei Yang <[email protected]>--- drivers/gpu/drm/i915/display/intel_dpt.c | 2 +- drivers/gpu/drm/i915/gt/gen8_ppgtt.c | 45 ++++++++++++++++++++---- drivers/gpu/drm/i915/gt/gen8_ppgtt.h | 3 ++ drivers/gpu/drm/i915/gt/intel_ggtt.c | 36 +++++++++++++++++-- 4 files changed, 75 insertions(+), 11 deletions(-)drivers/gpu/drm/i915/display/intel_dpt.c +1
-1@@ -300,7 +300,7 @@ intel_dpt_create(struct intel_framebuffer *fb) vm->vma_ops.bind_vma = dpt_bind_vma; vm->vma_ops.unbind_vma = dpt_unbind_vma; - vm->pte_encode = gen8_ggtt_pte_encode; + vm->pte_encode = vm->gt->ggtt->vm.pte_encode; dpt->obj = dpt_obj; dpt->obj->is_dpt = true;drivers/gpu/drm/i915/gt/gen8_ppgtt.c +38
-7@@ -55,6 +55,34 @@ static u64 gen8_pte_encode(dma_addr_t addr,return pte; } +static u64 mtl_pte_encode (dma_addr_t addr, +enum i915_cache_level level, +u32 flags) +{ +gen8_pte_t pte = addr |GEN8_PAGE_PRESENT |GEN8_PAGE_RW ; + +if (unlikely (flags &PTE_READ_ONLY )) + pte &= ~GEN8_PAGE_RW ; + +if (flags &PTE_LM ) + pte |=GEN12_PPGTT_PTE_LM |GEN12_PPGTT_PTE_NC ; + +switch (level) { +case I915_CACHE_NONE : + pte |=GEN12_PPGTT_PTE_PAT1 ; +break ; +case I915_CACHE_LLC : +case I915_CACHE_L3_LLC : + pte |=GEN12_PPGTT_PTE_PAT0 |GEN12_PPGTT_PTE_PAT1 ; +break ; +case I915_CACHE_WT : + pte |=GEN12_PPGTT_PTE_PAT0 ; +break ; + } + +return pte; +} +static void gen8_ppgtt_notify_vgt (struct i915_ppgtt *ppgtt,bool create) {struct drm_i915_private *i915 = ppgtt->vm.i915;@@ -427,7 +455,7 @@ gen8_ppgtt_insert_pte(struct i915_ppgtt *ppgtt, u32 flags) {struct i915_page_directory *pd; -const gen8_pte_t pte_encode =gen8_pte_encode (0 , cache_level, flags); +const gen8_pte_t pte_encode = ppgtt->vm.pte_encode (0 , cache_level, flags);gen8_pte_t *vaddr; pd =i915_pd_entry (pdp,gen8_pd_index (idx,2 ));@@ -580,7 +608,7 @@ static void gen8_ppgtt_insert_huge(struct i915_address_space *vm, enum i915_cache_level cache_level, u32 flags) { -const gen8_pte_t pte_encode =gen8_pte_encode (0 , cache_level, flags); +const gen8_pte_t pte_encode = vm->pte_encode (0 , cache_level, flags);unsigned int rem =sg_dma_len (iter->sg);u64 start = vma_res->start;@@ -743,7 +771,7 @@ static void gen8_ppgtt_insert_entry(struct i915_address_space *vm,GEM_BUG_ON (pt->is_compact); vaddr =px_vaddr (pt); - vaddr[gen8_pd_index (idx,0 )] =gen8_pte_encode (addr, level, flags); + vaddr[gen8_pd_index (idx,0 )] = vm->pte_encode (addr, level, flags);drm_clflush_virt_range (&vaddr[gen8_pd_index (idx,0 )],sizeof (*vaddr)); }@@ -773,7 +801,7 @@ static void __xehpsdv_ppgtt_insert_entry_lm(struct i915_address_space *vm, } vaddr =px_vaddr (pt); - vaddr[gen8_pd_index (idx,0 ) /16 ] =gen8_pte_encode (addr, level, flags); + vaddr[gen8_pd_index (idx,0 ) /16 ] = vm->pte_encode (addr, level, flags); } static void xehpsdv_ppgtt_insert_entry(struct i915_address_space *vm,@@ -820,8 +848,8 @@ static int gen8_init_scratch(struct i915_address_space *vm) pte_flags |=PTE_LM ; vm->scratch[0 ]->encode = -gen8_pte_encode (px_dma (vm->scratch[0 ]), -I915_CACHE_NONE , pte_flags); + vm->pte_encode (px_dma (vm->scratch[0 ]), +I915_CACHE_NONE , pte_flags);for (i =1 ; i <= vm->top; i++) {struct drm_i915_gem_object *obj;@@ -963,7 +991,10 @@ struct i915_ppgtt *gen8_ppgtt_create(struct intel_gt *gt,*/ ppgtt->vm.alloc_scratch_dma = alloc_pt_dma; - ppgtt->vm.pte_encode = gen8_pte_encode; +if (GRAPHICS_VER_FULL (gt->i915) >=IP_VER (12 ,70 )) + ppgtt->vm.pte_encode = mtl_pte_encode; +else + ppgtt->vm.pte_encode = gen8_pte_encode; ppgtt->vm.bind_async_flags =I915_VMA_LOCAL_BIND ; ppgtt->vm.insert_entries = gen8_ppgtt_insert;drivers/gpu/drm/i915/gt/gen8_ppgtt.h +0
-0
drivers/gpu/drm/i915/gt/gen8_ppgtt.h struct i915_ppgtt *gen8_ppgtt_create(struct intel_gt *gt, · line 24
Quoted 7 lines
drivers/gpu/drm/i915/gt/gen8_ppgtt.h +3
-0@@ -18,5 +18,8 @@ struct i915_ppgtt *gen8_ppgtt_create(struct intel_gt *gt,u64 gen8_ggtt_pte_encode (dma_addr_t addr,enum i915_cache_level level,u32 flags); +u64 mtl_ggtt_pte_encode (dma_addr_t addr, +unsigned int pat_index, +u32 flags);
I don't see any user of mtl_ggtt_pte_encode() outside intel_ggtt.c so I think there is no need to expose this.
Otherwise the patch LGTM
Quoted 70 lines
drivers/gpu/drm/i915/gt/gen8_ppgtt.h +0
-0#endif drivers/gpu/drm/i915/gt/intel_ggtt.c +33
-3@@ -220,6 +220,33 @@ static void guc_ggtt_invalidate(struct i915_ggtt *ggtt) } } +u64 mtl_ggtt_pte_encode (dma_addr_t addr, +enum i915_cache_level level, +u32 flags) +{ +gen8_pte_t pte = addr |GEN8_PAGE_PRESENT ; + +GEM_BUG_ON (addr & ~GEN12_GGTT_PTE_ADDR_MASK ); + +if (flags &PTE_LM ) + pte |=GEN12_GGTT_PTE_LM ; + +switch (level) { +case I915_CACHE_NONE : + pte |=MTL_GGTT_PTE_PAT1 ; +break ; +case I915_CACHE_LLC : +case I915_CACHE_L3_LLC : + pte |=MTL_GGTT_PTE_PAT0 |MTL_GGTT_PTE_PAT1 ; +break ; +case I915_CACHE_WT : + pte |=MTL_GGTT_PTE_PAT0 ; +break ; + } + +return pte; +} +u64 gen8_ggtt_pte_encode (dma_addr_t addr,enum i915_cache_level level,u32 flags)@@ -247,7 +274,7 @@ static void gen8_ggtt_insert_page(struct i915_address_space *vm,gen8_pte_t __iomem *pte = (gen8_pte_t __iomem *)ggtt->gsm + offset /I915_GTT_PAGE_SIZE ; -gen8_set_pte (pte,gen8_ggtt_pte_encode (addr, level, flags)); +gen8_set_pte (pte, ggtt->vm.pte_encode (addr, level, flags)); ggtt->invalidate (ggtt); }@@ -257,8 +284,8 @@ static void gen8_ggtt_insert_entries(struct i915_address_space *vm, enum i915_cache_level level, u32 flags) { -const gen8_pte_t pte_encode =gen8_ggtt_pte_encode (0 , level, flags);struct i915_ggtt *ggtt =i915_vm_to_ggtt (vm); +const gen8_pte_t pte_encode = ggtt->vm.pte_encode (0 , level, flags);gen8_pte_t __iomem *gte;gen8_pte_t __iomem *end;struct sgt_iter iter;@@ -981,7 +1008,10 @@ static int gen8_gmch_probe(struct i915_ggtt *ggtt) ggtt->vm.vma_ops.bind_vma = intel_ggtt_bind_vma; ggtt->vm.vma_ops.unbind_vma = intel_ggtt_unbind_vma; - ggtt->vm.pte_encode = gen8_ggtt_pte_encode; +if (GRAPHICS_VER_FULL (i915) >=IP_VER (12 ,70 )) + ggtt->vm.pte_encode = mtl_ggtt_pte_encode; +else + ggtt->vm.pte_encode = gen8_ggtt_pte_encode;return ggtt_probe_common (ggtt, size); }
PATCH 4/8 drm/i915/mtl: workaround coherency issue for Media
In reply to [email protected]From: Fei Yang <[email protected]>
This patch implements Wa_22016122933.
In MTL, memory writes initiated by Media tile update the whole cache line even for partial writes. This creates a coherency problem for cacheable memory if both CPU and GPU are writing data to different locations within a single cache line. CTB communication is impacted by this issue because the head and tail pointers are adjacent words within a cache line (see struct guc_ct_buffer_desc), where one is written by GuC and the other by the host. This patch circumvents the issue by making CPU/GPU shared memory uncacheable (WC on CPU side, and PAT index 2 for GPU). Also for CTB which is being updated by both CPU and GuC, mfence instruction is added to make sure the CPU writes are visible to GPU right away (flush the write combining buffer).
While fixing the CTB issue, we noticed some random GSC firmware loading failure because the share buffers are cacheable (WB) on CPU side but uncached on GPU side. To fix these issues we need to map such shared buffers as WC on CPU side. Since such allocations are not all done through GuC allocator, to avoid too many code changes, the i915_coherent_map_type() is now hard coded to return WC for MTL.
BSpec: 45101
--- drivers/gpu/drm/i915/gem/i915_gem_pages.c | 5 ++++- drivers/gpu/drm/i915/gt/uc/intel_gsc_fw.c | 13 +++++++++++++ drivers/gpu/drm/i915/gt/uc/intel_guc.c | 7 +++++++ drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c | 18 ++++++++++++------ 4 files changed, 36 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/gem/i915_gem_pages.c +4 -1
@@ -469,7 +469,10 @@ enum i915_map_type i915_coherent_map_type(struct drm_i915_private *i915, struct drm_i915_gem_object *obj, bool always_coherent) { - if (i915_gem_object_is_lmem(obj)) +/* +* Wa_22016122933: always return I915_MAP_WC for MTL +*/ +if (i915_gem_object_is_lmem (obj) ||IS_METEORLAKE (i915))return I915_MAP_WC ;if (HAS_LLC (i915) || always_coherent)return I915_MAP_WB ;
drivers/gpu/drm/i915/gt/uc/intel_gsc_fw.c +13 -0
@@ -110,6 +110,13 @@ static int gsc_fw_load_prepare(struct intel_gsc_uc *gsc)if (obj->base.size < gsc->fw.size)return -ENOSPC ; +/* +* Wa_22016122933: For MTL the shared memory needs to be mapped +* as WC on CPU side and UC (PAT index 2) on GPU side +*/ +if (IS_METEORLAKE (i915)) +i915_gem_object_set_cache_coherency (obj,I915_CACHE_NONE ); + dst =i915_gem_object_pin_map_unlocked (obj,i915_coherent_map_type (i915, obj, true));if (IS_ERR (dst))
@@ -125,6 +132,12 @@ static int gsc_fw_load_prepare(struct intel_gsc_uc *gsc)memset (dst,0 , obj->base.size);memcpy (dst, src, gsc->fw.size); +/* +* Wa_22016122933: Making sure the data in dst is +* visible to GSC right away +*/ +intel_guc_write_barrier (>->uc.guc); +i915_gem_object_unpin_map (gsc->fw.obj);i915_gem_object_unpin_map (obj);
drivers/gpu/drm/i915/gt/uc/intel_guc.c +7 -0
@@ -743,6 +743,13 @@ struct i915_vma *intel_guc_allocate_vma(struct intel_guc *guc, u32 size)if (IS_ERR (obj))return ERR_CAST (obj); +/* +* Wa_22016122933: For MTL the shared memory needs to be mapped +* as WC on CPU side and UC (PAT index 2) on GPU side +*/ +if (IS_METEORLAKE (gt->i915)) +i915_gem_object_set_cache_coherency (obj,I915_CACHE_NONE ); + vma =i915_vma_instance (obj, >->ggtt->vm,NULL );if (IS_ERR (vma)) goto err;
drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c +12 -6
@@ -415,12 +415,6 @@ static int ct_write(struct intel_guc_ct *ct, }GEM_BUG_ON (tail > size); -/* -* make sure H2G buffer update and LRC tail update (if this triggering a -* submission) are visible before updating the descriptor tail -*/ -intel_guc_write_barrier (ct_to_guc (ct)); -/* update local copies */ ctb->tail = tail;GEM_BUG_ON (atomic_read (&ctb->space) < len +GUC_CTB_HDR_LEN );
@@ -429,6 +423,12 @@ static int ct_write(struct intel_guc_ct *ct,/* now update descriptor */ WRITE_ONCE (desc->tail, tail); +/* +* make sure H2G buffer update and LRC tail update (if this triggering a +* submission) are visible before updating the descriptor tail +*/ +intel_guc_write_barrier (ct_to_guc (ct)); +return 0 ; corrupted:
@@ -902,6 +902,12 @@ static int ct_read(struct intel_guc_ct *ct, struct ct_incoming_msg **msg)/* now update descriptor */ WRITE_ONCE (desc->head, head); +/* +* Wa_22016122933: Making sure the head update is +* visible to GuC right away +*/ +intel_guc_write_barrier (ct_to_guc (ct)); +return available - len; corrupted:
Signature · 1 line
2.25.1
Re: [Intel-gfx] [PATCH 4/8] drm/i915/mtl: workaround coherency issue for Media
Hi Fei,
drivers/gpu/drm/i915/gt/uc/intel_guc.c struct i915_vma *intel_guc_allocate_vma(struct intel_guc *guc, u32 size) · line 748
Quoted 9 lines
drivers/gpu/drm/i915/gt/uc/intel_guc.c +3
-0@@ -743,6 +743,13 @@ struct i915_vma *intel_guc_allocate_vma(struct intel_guc *guc, u32 size)if (IS_ERR (obj))return ERR_CAST (obj); +/* +* Wa_22016122933: For MTL the shared memory needs to be mapped +* as WC on CPU side and UC (PAT index 2) on GPU side
Isn't UC PAT index 3?
Andi
Andi Shyti
Reviewed-byRe: [Intel-gfx] [PATCH 4/8] drm/i915/mtl: workaround coherency issue for Media
Hi Fei,
Quoted 8 lines · Andi Shyti
Hi Fei,
Quoted 6 lines
drivers/gpu/drm/i915/gt/uc/intel_guc.c +0
-0@@ -743,6 +743,13 @@ struct i915_vma *intel_guc_allocate_vma(struct intel_guc *guc, u32 size)if (IS_ERR (obj))return ERR_CAST (obj);
Quoted 5 lines
drivers/gpu/drm/i915/gt/uc/intel_guc.c struct i915_vma *intel_guc_allocate_vma(struct intel_guc *guc, u32 size) · line 748
Quoted 3 lines
drivers/gpu/drm/i915/gt/uc/intel_guc.c +3
-0+/* +* Wa_22016122933: For MTL the shared memory needs to be mapped +* as WC on CPU side and UC (PAT index 2) on GPU side Isn't UC PAT index 3?
Sorry, it's 2... I was reading the wrong table.
Andi
Re: [PATCH 4/8] drm/i915/mtl: workaround coherency issue for Media
In reply to [email protected]Quoted 24 lines · On 4/17/2023 8:24 AM, [email protected] wrote:
From: Fei Yang <[email protected]>
This patch implements
Wa_22016122933.In MTL, memory writes initiated by Media tile update the whole cache line even for partial writes. This creates a coherency problem for cacheable memory if both CPU and GPU are writing data to different locations within a single cache line. CTB communication is impacted by this issue because the head and tail pointers are adjacent words within a cache line (see struct
guc_ct_buffer_desc), where one is written by GuC and the other by the host. This patch circumvents the issue by making CPU/GPU shared memory uncacheable (WC on CPU side, and PAT index 2 for GPU). Also for CTB which is being updated by both CPU and GuC, mfence instruction is added to make sure the CPU writes are visible to GPU right away (flush the write combining buffer).While fixing the CTB issue, we noticed some random GSC firmware loading failure because the share buffers are cacheable (WB) on CPU side but uncached on GPU side. To fix these issues we need to map such shared buffers as WC on CPU side. Since such allocations are not all done through GuC allocator, to avoid too many code changes, the
i915_coherent_map_type()is now hard coded to return WC for MTL.
Quoted 3 lines
BSpec: 45101
Signed-off-by Fei Yang <[email protected]>
This was a great find :)
Quoted 115 lines
--- drivers/gpu/drm/i915/gem/i915_gem_pages.c | 5 ++++- drivers/gpu/drm/i915/gt/uc/intel_gsc_fw.c | 13 +++++++++++++ drivers/gpu/drm/i915/gt/uc/intel_guc.c | 7 +++++++ drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c | 18 ++++++++++++------ 4 files changed, 36 insertions(+), 7 deletions(-)drivers/gpu/drm/i915/gem/i915_gem_pages.c +4
-1@@ -469,7 +469,10 @@ enum i915_map_type i915_coherent_map_type(struct drm_i915_private *i915, struct drm_i915_gem_object *obj, bool always_coherent) { - if (i915_gem_object_is_lmem(obj)) +/* +* Wa_22016122933: always return I915_MAP_WC for MTL +*/ +if (i915_gem_object_is_lmem (obj) ||IS_METEORLAKE (i915))return I915_MAP_WC ;if (HAS_LLC (i915) || always_coherent)return I915_MAP_WB ;drivers/gpu/drm/i915/gt/uc/intel_gsc_fw.c +13
-0@@ -110,6 +110,13 @@ static int gsc_fw_load_prepare(struct intel_gsc_uc *gsc)if (obj->base.size < gsc->fw.size)return -ENOSPC ; +/* +* Wa_22016122933: For MTL the shared memory needs to be mapped +* as WC on CPU side and UC (PAT index 2) on GPU side +*/ +if (IS_METEORLAKE (i915)) +i915_gem_object_set_cache_coherency (obj,I915_CACHE_NONE ); + dst =i915_gem_object_pin_map_unlocked (obj,i915_coherent_map_type (i915, obj, true));if (IS_ERR (dst))@@ -125,6 +132,12 @@ static int gsc_fw_load_prepare(struct intel_gsc_uc *gsc)memset (dst,0 , obj->base.size);memcpy (dst, src, gsc->fw.size); +/* +* Wa_22016122933: Making sure the data in dst is +* visible to GSC right away +*/ +intel_guc_write_barrier (>->uc.guc); +i915_gem_object_unpin_map (gsc->fw.obj);i915_gem_object_unpin_map (obj);drivers/gpu/drm/i915/gt/uc/intel_guc.c +7
-0@@ -743,6 +743,13 @@ struct i915_vma *intel_guc_allocate_vma(struct intel_guc *guc, u32 size)if (IS_ERR (obj))return ERR_CAST (obj); +/* +* Wa_22016122933: For MTL the shared memory needs to be mapped +* as WC on CPU side and UC (PAT index 2) on GPU side +*/ +if (IS_METEORLAKE (gt->i915)) +i915_gem_object_set_cache_coherency (obj,I915_CACHE_NONE ); + vma =i915_vma_instance (obj, >->ggtt->vm,NULL );if (IS_ERR (vma)) goto err;drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c +12
-6@@ -415,12 +415,6 @@ static int ct_write(struct intel_guc_ct *ct, }GEM_BUG_ON (tail > size); -/* -* make sure H2G buffer update and LRC tail update (if this triggering a -* submission) are visible before updating the descriptor tail -*/ -intel_guc_write_barrier (ct_to_guc (ct)); -/* update local copies */ ctb->tail = tail;GEM_BUG_ON (atomic_read (&ctb->space) < len +GUC_CTB_HDR_LEN );@@ -429,6 +423,12 @@ static int ct_write(struct intel_guc_ct *ct,/* now update descriptor */ WRITE_ONCE (desc->tail, tail); +/* +* make sure H2G buffer update and LRC tail update (if this triggering a +* submission) are visible before updating the descriptor tail +*/ +intel_guc_write_barrier (ct_to_guc (ct)); +return 0 ; corrupted:@@ -902,6 +902,12 @@ static int ct_read(struct intel_guc_ct *ct, struct ct_incoming_msg **msg)/* now update descriptor */ WRITE_ONCE (desc->head, head); +/* +* Wa_22016122933: Making sure the head update is +* visible to GuC right away +*/ +intel_guc_write_barrier (ct_to_guc (ct)); +return available - len; corrupted:
Re: [Intel-gfx] [PATCH 4/8] drm/i915/mtl: workaround coherency issue for Media
In reply to [email protected]Quoted 117 lines · On 17.04.2023 08:24, [email protected] wrote:
From: Fei Yang <[email protected]>
This patch implements
Wa_22016122933.In MTL, memory writes initiated by Media tile update the whole cache line even for partial writes. This creates a coherency problem for cacheable memory if both CPU and GPU are writing data to different locations within a single cache line. CTB communication is impacted by this issue because the head and tail pointers are adjacent words within a cache line (see struct
guc_ct_buffer_desc), where one is written by GuC and the other by the host. This patch circumvents the issue by making CPU/GPU shared memory uncacheable (WC on CPU side, and PAT index 2 for GPU). Also for CTB which is being updated by both CPU and GuC, mfence instruction is added to make sure the CPU writes are visible to GPU right away (flush the write combining buffer).While fixing the CTB issue, we noticed some random GSC firmware loading failure because the share buffers are cacheable (WB) on CPU side but uncached on GPU side. To fix these issues we need to map such shared buffers as WC on CPU side. Since such allocations are not all done through GuC allocator, to avoid too many code changes, the
i915_coherent_map_type()is now hard coded to return WC for MTL.BSpec: 45101
Signed-off-by Fei Yang <[email protected]>--- drivers/gpu/drm/i915/gem/i915_gem_pages.c | 5 ++++- drivers/gpu/drm/i915/gt/uc/intel_gsc_fw.c | 13 +++++++++++++ drivers/gpu/drm/i915/gt/uc/intel_guc.c | 7 +++++++ drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c | 18 ++++++++++++------ 4 files changed, 36 insertions(+), 7 deletions(-)drivers/gpu/drm/i915/gem/i915_gem_pages.c +4
-1@@ -469,7 +469,10 @@ enum i915_map_type i915_coherent_map_type(struct drm_i915_private *i915, struct drm_i915_gem_object *obj, bool always_coherent) { - if (i915_gem_object_is_lmem(obj)) +/* +* Wa_22016122933: always return I915_MAP_WC for MTL +*/ +if (i915_gem_object_is_lmem (obj) ||IS_METEORLAKE (i915))return I915_MAP_WC ;if (HAS_LLC (i915) || always_coherent)return I915_MAP_WB ;drivers/gpu/drm/i915/gt/uc/intel_gsc_fw.c +13
-0@@ -110,6 +110,13 @@ static int gsc_fw_load_prepare(struct intel_gsc_uc *gsc)if (obj->base.size < gsc->fw.size)return -ENOSPC ; +/* +* Wa_22016122933: For MTL the shared memory needs to be mapped +* as WC on CPU side and UC (PAT index 2) on GPU side +*/ +if (IS_METEORLAKE (i915)) +i915_gem_object_set_cache_coherency (obj,I915_CACHE_NONE ); + dst =i915_gem_object_pin_map_unlocked (obj,i915_coherent_map_type (i915, obj, true));if (IS_ERR (dst))@@ -125,6 +132,12 @@ static int gsc_fw_load_prepare(struct intel_gsc_uc *gsc)memset (dst,0 , obj->base.size);memcpy (dst, src, gsc->fw.size); +/* +* Wa_22016122933: Making sure the data in dst is +* visible to GSC right away +*/ +intel_guc_write_barrier (>->uc.guc); +i915_gem_object_unpin_map (gsc->fw.obj);i915_gem_object_unpin_map (obj);drivers/gpu/drm/i915/gt/uc/intel_guc.c +7
-0@@ -743,6 +743,13 @@ struct i915_vma *intel_guc_allocate_vma(struct intel_guc *guc, u32 size)if (IS_ERR (obj))return ERR_CAST (obj); +/* +* Wa_22016122933: For MTL the shared memory needs to be mapped +* as WC on CPU side and UC (PAT index 2) on GPU side +*/ +if (IS_METEORLAKE (gt->i915)) +i915_gem_object_set_cache_coherency (obj,I915_CACHE_NONE ); + vma =i915_vma_instance (obj, >->ggtt->vm,NULL );if (IS_ERR (vma)) goto err;drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c +0
-6@@ -415,12 +415,6 @@ static int ct_write(struct intel_guc_ct *ct, }GEM_BUG_ON (tail > size); -/* -* make sure H2G buffer update and LRC tail update (if this triggering a -* submission) are visible before updating the descriptor tail -*/ -intel_guc_write_barrier (ct_to_guc (ct)); -/* update local copies */ ctb->tail = tail;GEM_BUG_ON (atomic_read (&ctb->space) < len +GUC_CTB_HDR_LEN );
drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c static int ct_write(struct intel_guc_ct *ct, · line 430
Quoted 8 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c +5
-0@@ -429,6 +423,12 @@ static int ct_write(struct intel_guc_ct *ct,/* now update descriptor */ WRITE_ONCE (desc->tail, tail); +/* +* make sure H2G buffer update and LRC tail update (if this triggering a +* submission) are visible before updating the descriptor tail +*/ +intel_guc_write_barrier (ct_to_guc (ct));
The comment above needs update, if this is correct change. The question is why it is correct? If yes, it implies that old barrier is incorrect, maybe it should be then separate fix? I am not an expert, but previous location of the barrier seems sane to me - assure GuC will see proper buffer, before updating buffer's tail.
And according to commit message this new barrier should flush WC buffer, so for me it seems to be different thing.
Am I missing something?
Regards
Andrzej
Quoted 17 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c +7
-0+return 0 ; corrupted:@@ -902,6 +902,12 @@ static int ct_read(struct intel_guc_ct *ct, struct ct_incoming_msg **msg)/* now update descriptor */ WRITE_ONCE (desc->head, head); +/* +* Wa_22016122933: Making sure the head update is +* visible to GuC right away +*/ +intel_guc_write_barrier (ct_to_guc (ct)); +return available - len; corrupted:
RE: [Intel-gfx] [PATCH 4/8] drm/i915/mtl: workaround coherency issue for Media
Quoted 22 lines
Quoted 22 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c +0
-7@@ -415,12 +415,6 @@ static int ct_write(struct intel_guc_ct *ct, }GEM_BUG_ON (tail > size); -/* -* make sure H2G buffer update and LRC tail update (if this triggering a -* submission) are visible before updating the descriptor tail -*/ -intel_guc_write_barrier (ct_to_guc (ct)); -/* update local copies */ ctb->tail = tail; GEM_BUG_ON(atomic_read(&ctb->space) < len + GUC_CTB_HDR_LEN); @@ -429,6 +423,12 @@ static int ct_write(struct intel_guc_ct *ct,/* now update descriptor */ WRITE_ONCE (desc->tail, tail);
Quoted 7 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c static int ct_write(struct intel_guc_ct *ct, · line 430
Quoted 5 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c +5
-0+/* +* make sure H2G buffer update and LRC tail update (if this triggering a +* submission) are visible before updating the descriptor tail +*/ +intel_guc_write_barrier (ct_to_guc (ct));The comment above needs update,
Will update the comment.
Quoted 2 lines
if this is correct change. The question is why it is correct? If yes, it implies that old barrier is incorrect, maybe it should be then separate fix?
There is WRITE_ONCE(desc->tail, tail) right after the H2G buffer update which is also seen by the GuC firmware, the barrier is needed for both, thus moved it down a few lines to cover them all.
Quoted 2 lines
I am not an expert, but previous location of the barrier seems sane to me - assure GuC will see proper buffer, before updating buffer's tail.
That is correct, but the barrier is needed for both H2G buffer and descriptor, as they are all shared with GuC firmware.
-Fei
Quoted 7 lines
And according to commit message this new barrier should flush WC buffer, so for me it seems to be different thing.
Am I missing something?Regards
Andrzej
RE: [Intel-gfx] [PATCH 4/8] drm/i915/mtl: workaround coherency issue for Media
Quoted 22 lines
Quoted 22 lines
Quoted 22 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c +0
-7@@ -415,12 +415,6 @@ static int ct_write(struct intel_guc_ct *ct, }GEM_BUG_ON (tail > size); -/* -* make sure H2G buffer update and LRC tail update (if this triggering a -* submission) are visible before updating the descriptor tail -*/ -intel_guc_write_barrier (ct_to_guc (ct)); -/* update local copies */ ctb->tail = tail; GEM_BUG_ON(atomic_read(&ctb->space) < len + GUC_CTB_HDR_LEN); @@ -429,6 +423,12 @@ static int ct_write(struct intel_guc_ct *ct,/* now update descriptor */ WRITE_ONCE (desc->tail, tail);
Quoted 7 lines
Quoted 7 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c static int ct_write(struct intel_guc_ct *ct, · line 430
Quoted 5 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c +5
-0+/* +* make sure H2G buffer update and LRC tail update (if this triggering a +* submission) are visible before updating the descriptor tail +*/ +intel_guc_write_barrier (ct_to_guc (ct));The comment above needs update,
Never mind, I decided to revert this change because it's not necessary. There is a MMIO write following the ct_write() call which would flush the write combining buffer anyway, so the barrier is redundant here.
Quoted 24 lines
Will update the comment.
Quoted 2 lines
if this is correct change. The question is why it is correct? If yes, it implies that old barrier is incorrect, maybe it should be then separate fix?
There is
WRITE_ONCE(desc->tail, tail)right after the H2G buffer update which is also seen by the GuC firmware, the barrier is needed for both, thus moved it down a few lines to cover them all.Quoted 2 lines
I am not an expert, but previous location of the barrier seems sane to me - assure GuC will see proper buffer, before updating buffer's tail.
That is correct, but the barrier is needed for both H2G buffer and descriptor, as they are all shared with GuC firmware.
-Fei
Quoted 7 lines
And according to commit message this new barrier should flush WC buffer, so for me it seems to be different thing.
Am I missing something?Regards
Andrzej
PATCH 5/8 drm/i915/mtl: end support for set caching ioctl
In reply to [email protected]From: Fei Yang <[email protected]>
The design is to keep Buffer Object's caching policy immutable through out its life cycle. This patch ends the support for set caching ioctl from MTL onward. While doing that we also set BO's to be 1-way coherent at creation time because GPU is no longer automatically snooping CPU cache.
--- drivers/gpu/drm/i915/gem/i915_gem_domain.c | 3 +++ drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 9 ++++++++- 2 files changed, 11 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/gem/i915_gem_domain.c +3 -0
@@ -337,6 +337,9 @@ int i915_gem_set_caching_ioctl(struct drm_device *dev, void *data,if (IS_DGFX (i915))return -ENODEV ; +if (GRAPHICS_VER_FULL (i915) >=IP_VER (12 ,70 )) +return -EOPNOTSUPP ; +switch (args->caching) {case I915_CACHING_NONE : level =I915_CACHE_NONE ;
drivers/gpu/drm/i915/gem/i915_gem_shmem.c +8 -1
@@ -601,7 +601,14 @@ static int shmem_object_init(struct intel_memory_region *mem, obj->write_domain =I915_GEM_DOMAIN_CPU ; obj->read_domains =I915_GEM_DOMAIN_CPU ; -if (HAS_LLC (i915)) +/* +* MTL doesn't snooping CPU cache by default for GPU access (namely +* 1-way coherency). However some UMD's are currently depending on +* that. Make 1-way coherent the default setting for MTL. A follow +* up patch will extend the GEM_CREATE uAPI to allow UMD's specify +* caching mode at BO creation time +*/ +if (HAS_LLC (i915) || (GRAPHICS_VER_FULL (i915) >=IP_VER (12 ,70 )))/* On some devices, we can have the GPU use the LLC (the CPU * cache) for about a 10% performance improvement * compared to uncached. Graphics requests other than
Signature · 1 line
2.25.1
Re: [Intel-gfx] [PATCH 5/8] drm/i915/mtl: end support for set caching ioctl
Hi Fei,
Quoted 9 lines · On Sun, Apr 16, 2023 at 11:25:00PM -0700, [email protected] wrote:
From: Fei Yang <[email protected]>
The design is to keep Buffer Object's caching policy immutable through out its life cycle. This patch ends the support for set caching ioctl from MTL onward. While doing that we also set BO's to be 1-way coherent at creation time because GPU is no longer automatically snooping CPU cache.
Signed-off-by Fei Yang <[email protected]>
Andi
Re: [Intel-gfx] [PATCH 5/8] drm/i915/mtl: end support for set caching ioctl
In reply to [email protected]Quoted 33 lines · On 17.04.2023 08:25, [email protected] wrote:
From: Fei Yang <[email protected]>
The design is to keep Buffer Object's caching policy immutable through out its life cycle. This patch ends the support for set caching ioctl from MTL onward. While doing that we also set BO's to be 1-way coherent at creation time because GPU is no longer automatically snooping CPU cache.
Signed-off-by Fei Yang <[email protected]>--- drivers/gpu/drm/i915/gem/i915_gem_domain.c | 3 +++ drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 9 ++++++++- 2 files changed, 11 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/gem/i915_gem_domain.c +3
-0@@ -337,6 +337,9 @@ int i915_gem_set_caching_ioctl(struct drm_device *dev, void *data,if (IS_DGFX (i915))return -ENODEV ; +if (GRAPHICS_VER_FULL (i915) >=IP_VER (12 ,70 )) +return -EOPNOTSUPP ; +switch (args->caching) {case I915_CACHING_NONE : level =I915_CACHE_NONE ;drivers/gpu/drm/i915/gem/i915_gem_shmem.c +0
-0
drivers/gpu/drm/i915/gem/i915_gem_shmem.c static int shmem_object_init(struct intel_memory_region *mem, · line 605
Quoted 6 lines
drivers/gpu/drm/i915/gem/i915_gem_shmem.c +2
-1@@ -601,7 +601,14 @@ static int shmem_object_init(struct intel_memory_region *mem, obj->write_domain =I915_GEM_DOMAIN_CPU ; obj->read_domains =I915_GEM_DOMAIN_CPU ; -if (HAS_LLC (i915)) +/* +* MTL doesn't snooping CPU cache by default for GPU access (namely
Sounds strange, "doesn't snoop" ?
drivers/gpu/drm/i915/gem/i915_gem_shmem.c static int shmem_object_init(struct intel_memory_region *mem, · line 609
Quoted 4 lines
drivers/gpu/drm/i915/gem/i915_gem_shmem.c +4
-0+* 1-way coherency). However some UMD's are currently depending on +* that. Make 1-way coherent the default setting for MTL. A follow +* up patch will extend the GEM_CREATE uAPI to allow UMD's specify +* caching mode at BO creation time
Shouldn't such comment be a part of patch description? or at least removed by follow-up patch.
Regards
Andrzej
Quoted 5 lines
drivers/gpu/drm/i915/gem/i915_gem_shmem.c +2
-0+*/ +if (HAS_LLC (i915) || (GRAPHICS_VER_FULL (i915) >=IP_VER (12 ,70 )))/* On some devices, we can have the GPU use the LLC (the CPU * cache) for about a 10% performance improvement * compared to uncached. Graphics requests other than
RE: [Intel-gfx] [PATCH 5/8] drm/i915/mtl: end support for set caching ioctl
Quoted 39 lines · On 17.04.2023 08:25, [email protected] wrote:
Quoted 38 lines
From: Fei Yang <[email protected]>
The design is to keep Buffer Object's caching policy immutable through out its life cycle. This patch ends the support for set caching ioctl from MTL onward. While doing that we also set BO's to be 1-way coherent at creation time because GPU is no longer automatically snooping CPU cache.
Signed-off-by Fei Yang <[email protected]>--- drivers/gpu/drm/i915/gem/i915_gem_domain.c | 3 +++ drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 9 ++++++++- 2 files changed, 11 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/gem/i915_gem_domain.c +3
-0@@ -337,6 +337,9 @@ int i915_gem_set_caching_ioctl(struct drm_device *dev, void *data,if (IS_DGFX (i915))return -ENODEV ; +if (GRAPHICS_VER_FULL (i915) >=IP_VER (12 ,70 )) +return -EOPNOTSUPP ; +switch (args->caching) {case I915_CACHING_NONE : level =I915_CACHE_NONE ;drivers/gpu/drm/i915/gem/i915_gem_shmem.c +0
-0@@ -601,7 +601,14 @@ static int shmem_object_init(struct intel_memory_region *mem, obj->write_domain =I915_GEM_DOMAIN_CPU ; obj->read_domains =I915_GEM_DOMAIN_CPU ;
Quoted 5 lines
drivers/gpu/drm/i915/gem/i915_gem_shmem.c static int shmem_object_init(struct intel_memory_region *mem, · line 605
Quoted 3 lines
drivers/gpu/drm/i915/gem/i915_gem_shmem.c +2
-1-if (HAS_LLC (i915)) +/* +* MTL doesn't snooping CPU cache by default for GPU access (namely Sounds strange, "doesn't snoop" ?
Will update.
Quoted 7 lines
drivers/gpu/drm/i915/gem/i915_gem_shmem.c static int shmem_object_init(struct intel_memory_region *mem, · line 609
Quoted 4 lines
drivers/gpu/drm/i915/gem/i915_gem_shmem.c +4
-0+* 1-way coherency). However some UMD's are currently depending on +* that. Make 1-way coherent the default setting for MTL. A follow +* up patch will extend the GEM_CREATE uAPI to allow UMD's specify +* caching mode at BO creation time Shouldn't such comment be a part of patch description? or at least removed by follow-up patch.
Will update.
-Fei
Quoted 11 lines
Reviewed-by Andrzej Hajda <[email protected]>Regards
AndrzejQuoted 5 lines
drivers/gpu/drm/i915/gem/i915_gem_shmem.c +2
-0+*/ +if (HAS_LLC (i915) || (GRAPHICS_VER_FULL (i915) >=IP_VER (12 ,70 )))/* On some devices, we can have the GPU use the LLC (the CPU * cache) for about a 10% performance improvement * compared to uncached. Graphics requests other than
PATCH 6/8 drm/i915: preparation for using PAT index
In reply to [email protected]From: Fei Yang <[email protected]>
This patch is a preparation for replacing enum i915_cache_level with PAT index. Caching policy for buffer objects is set through the PAT index in PTE, the old i915_cache_level is not sufficient to represent all caching modes supported by the hardware.
Preparing the transition by adding some platform dependent data structures and helper functions to translate the cache_level to pat_index.
cachelevel_to_pat: a platform dependent array mapping cache_level to
pat_index.
max_pat_index: the maximum PAT index supported by the hardware. Needed for
validating the PAT index passed in from user space.
i915_gem_get_pat_index: function to convert cache_level to PAT index.
obj_to_i915(obj): macro moved to header file for wider usage.
I915_MAX_CACHE_LEVEL: upper bound of i915_cache_level for the
convenience of coding.
--- drivers/gpu/drm/i915/gem/i915_gem_object.c | 9 +++ drivers/gpu/drm/i915/gem/i915_gem_object.h | 4 + .../gpu/drm/i915/gem/i915_gem_object_types.h | 1 + drivers/gpu/drm/i915/gem/i915_gem_shrinker.c | 2 - drivers/gpu/drm/i915/gt/gen8_ppgtt.c | 6 ++ drivers/gpu/drm/i915/gt/intel_ggtt.c | 6 ++ drivers/gpu/drm/i915/i915_pci.c | 75 +++++++++++++++++-- drivers/gpu/drm/i915/intel_device_info.h | 5 ++ .../gpu/drm/i915/selftests/mock_gem_device.c | 10 +++ 9 files changed, 108 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/gem/i915_gem_object.c +9 -0
@@ -45,6 +45,15 @@ static struct kmem_cache *slab_objects;static const struct drm_gem_object_funcs i915_gem_object_funcs; +unsigned int i915_gem_get_pat_index (struct drm_i915_private *i915, +enum i915_cache_level level) +{ +if (drm_WARN_ON (&i915->drm, level >=I915_MAX_CACHE_LEVEL )) +return 0 ; + +return INTEL_INFO (i915)->cachelevel_to_pat[level]; +} +struct drm_i915_gem_object *i915_gem_object_alloc (void ) {struct drm_i915_gem_object *obj;
drivers/gpu/drm/i915/gem/i915_gem_object.h +4 -0
@@ -20,6 +20,8 @@enum intel_region_id ; +#define obj_to_i915 (obj__) to_i915((obj__)->base.dev) +static inline bool i915_gem_object_size_2big (u64 size) {struct drm_i915_gem_object *obj;
@@ -30,6 +32,8 @@ static inline bool i915_gem_object_size_2big(u64 size)return false; } +unsigned int i915_gem_get_pat_index (struct drm_i915_private *i915, +enum i915_cache_level level);void i915_gem_init__objects (struct drm_i915_private *i915);void i915_objects_module_exit (void );
drivers/gpu/drm/i915/gem/i915_gem_object_types.h +1 -0
@@ -194,6 +194,7 @@ enum i915_cache_level {* engine. */ I915_CACHE_WT , + I915_MAX_CACHE_LEVEL, }; enum i915_map_type {
drivers/gpu/drm/i915/gem/i915_gem_shrinker.c +0 -2
@@ -460,8 +460,6 @@ void i915_gem_shrinker_taints_mutex(struct drm_i915_private *i915,fs_reclaim_release (GFP_KERNEL ); } -#define obj_to_i915 (obj__) to_i915((obj__)->base.dev) -/** * i915_gem_object_make_unshrinkable - Hide the object from the shrinker. By * default all object types that support shrinking(see IS_SHRINKABLE), will also
drivers/gpu/drm/i915/gt/gen8_ppgtt.c +6 -0
@@ -78,6 +78,12 @@ static u64 mtl_pte_encode(dma_addr_t addr,case I915_CACHE_WT : pte |=GEN12_PPGTT_PTE_PAT0 ;break ; +default : +/* This should never happen. Added to deal with the compile +* error due to the addition of I915_MAX_CACHE_LEVEL. Will +* be removed by the pat_index patch. +*/ +break ; }return pte;
drivers/gpu/drm/i915/gt/intel_ggtt.c +6 -0
@@ -242,6 +242,12 @@ u64 mtl_ggtt_pte_encode(dma_addr_t addr,case I915_CACHE_WT : pte |=MTL_GGTT_PTE_PAT0 ;break ; +default : +/* This should never happen. Added to deal with the compile +* error due to the addition of I915_MAX_CACHE_LEVEL. Will +* be removed by the pat_index patch. +*/ +break ; }return pte;
drivers/gpu/drm/i915/i915_pci.c +67 -8
225 lines not on this page · raw message
drivers/gpu/drm/i915/intel_device_info.h +5 -0
@@ -35,6 +35,8 @@#include "gt/intel_context_types.h" #include "gt/intel_sseu.h" +#include "gem/i915_gem_object_types.h" +struct drm_printer ;struct drm_i915_private ;struct intel_gt_definition ;
@@ -308,6 +310,9 @@ struct intel_device_info {* Initial runtime info. Do not access outside of i915_driver_create(). */ const struct intel_runtime_info __runtime; + +u32 cachelevel_to_pat[I915_MAX_CACHE_LEVEL ]; +u32 max_pat_index; };struct intel_driver_caps {
drivers/gpu/drm/i915/selftests/mock_gem_device.c +10 -0
@@ -123,7 +123,9 @@ struct drm_i915_private *mock_gem_device(void)static struct dev_iommu fake_iommu = { .priv = (void *)-1 };#endif struct drm_i915_private *i915; +struct intel_device_info *i915_info;struct pci_dev *pdev; +unsigned int i;int ret; pdev =kzalloc (sizeof (*pdev),GFP_KERNEL );
@@ -180,6 +182,14 @@ struct drm_i915_private *mock_gem_device(void)I915_GTT_PAGE_SIZE_2M ;RUNTIME_INFO (i915)->memory_regions =REGION_SMEM ; + + +/* simply use legacy cache level for mock device */ + i915_info = (struct intel_device_info *)INTEL_INFO (i915); + i915_info->max_pat_index =3 ; +for (i =0 ; i <I915_MAX_CACHE_LEVEL ; i++) + i915_info->cachelevel_to_pat[i] = i; +intel_memory_regions_hw_probe (i915);spin_lock_init (&i915->gpu_error.lock);
Signature · 1 line
2.25.1
Re: [PATCH 6/8] drm/i915: preparation for using PAT index
Hi Fei,
[...]
drivers/gpu/drm/i915/selftests/mock_gem_device.c struct drm_i915_private *mock_gem_device(void) · line 186
Quoted 6 lines
drivers/gpu/drm/i915/selftests/mock_gem_device.c +2
-0@@ -180,6 +182,14 @@ struct drm_i915_private *mock_gem_device(void)I915_GTT_PAGE_SIZE_2M ;RUNTIME_INFO (i915)->memory_regions =REGION_SMEM ; + +
double space here, otherwise:
Andi
Quoted 11 lines
drivers/gpu/drm/i915/selftests/mock_gem_device.c +6
-0+/* simply use legacy cache level for mock device */ + i915_info = (struct intel_device_info *)INTEL_INFO (i915); + i915_info->max_pat_index =3 ; +for (i =0 ; i <I915_MAX_CACHE_LEVEL ; i++) + i915_info->cachelevel_to_pat[i] = i; +intel_memory_regions_hw_probe (i915);spin_lock_init (&i915->gpu_error.lock);Signature · 1 line
2.25.1
PATCH 7/8 drm/i915: use pat_index instead of cache_level
In reply to [email protected]From: Fei Yang <[email protected]>
Currently the KMD is using enum i915_cache_level to set caching policy for buffer objects. This is flaky because the PAT index which really controls the caching behavior in PTE has far more levels than what's defined in the enum. In addition, the PAT index is platform dependent, having to translate between i915_cache_level and PAT index is not reliable, and makes the code more complicated.
From UMD's perspective there is also a necessity to set caching policy for performance fine tuning. It's much easier for the UMD to directly use PAT index because the behavior of each PAT index is clearly defined in Bspec. Haivng the abstracted i915_cache_level sitting in between would only cause more ambiguity.
For these reasons this patch replaces i915_cache_level with PAT index. Also note, the cache_level is not completely removed yet, because the KMD still has the need of creating buffer objects with simple cache settings such as cached, uncached, or writethrough. For these simple cases, using cache_level would help simplify the code.
--- drivers/gpu/drm/i915/display/intel_dpt.c | 12 +-- drivers/gpu/drm/i915/gem/i915_gem_domain.c | 27 ++---- .../gpu/drm/i915/gem/i915_gem_execbuffer.c | 10 ++- drivers/gpu/drm/i915/gem/i915_gem_mman.c | 3 +- drivers/gpu/drm/i915/gem/i915_gem_object.c | 52 +++++++++++- drivers/gpu/drm/i915/gem/i915_gem_object.h | 4 + .../gpu/drm/i915/gem/i915_gem_object_types.h | 25 +++++- drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 4 +- drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c | 16 ++-- .../gpu/drm/i915/gem/selftests/huge_pages.c | 2 +- .../drm/i915/gem/selftests/i915_gem_migrate.c | 2 +- .../drm/i915/gem/selftests/i915_gem_mman.c | 2 +- drivers/gpu/drm/i915/gt/gen6_ppgtt.c | 10 ++- drivers/gpu/drm/i915/gt/gen8_ppgtt.c | 71 ++++++++-------- drivers/gpu/drm/i915/gt/gen8_ppgtt.h | 3 +- drivers/gpu/drm/i915/gt/intel_ggtt.c | 82 +++++++++---------- drivers/gpu/drm/i915/gt/intel_gtt.h | 20 ++--- drivers/gpu/drm/i915/gt/intel_migrate.c | 47 ++++++----- drivers/gpu/drm/i915/gt/intel_migrate.h | 13 ++- drivers/gpu/drm/i915/gt/intel_ppgtt.c | 6 +- drivers/gpu/drm/i915/gt/selftest_migrate.c | 47 ++++++----- drivers/gpu/drm/i915/gt/selftest_reset.c | 8 +- drivers/gpu/drm/i915/gt/selftest_timeline.c | 2 +- drivers/gpu/drm/i915/gt/selftest_tlb.c | 4 +- drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 10 ++- drivers/gpu/drm/i915/i915_debugfs.c | 55 ++++++++++--- drivers/gpu/drm/i915/i915_gem.c | 16 +++- drivers/gpu/drm/i915/i915_gpu_error.c | 8 +- drivers/gpu/drm/i915/i915_vma.c | 16 ++-- drivers/gpu/drm/i915/i915_vma.h | 2 +- drivers/gpu/drm/i915/i915_vma_types.h | 2 - drivers/gpu/drm/i915/selftests/i915_gem.c | 5 +- .../gpu/drm/i915/selftests/i915_gem_evict.c | 4 +- drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 15 ++-- .../drm/i915/selftests/intel_memory_region.c | 4 +- drivers/gpu/drm/i915/selftests/mock_gtt.c | 8 +- 36 files changed, 378 insertions(+), 239 deletions(-)
drivers/gpu/drm/i915/display/intel_dpt.c +6 -6
@@ -43,24 +43,24 @@ static void gen8_set_pte(void __iomem *addr, gen8_pte_t pte)static void dpt_insert_page (struct i915_address_space *vm,dma_addr_t addr,u64 offset, -enum i915_cache_level level, +unsigned int pat_index,u32 flags) {struct i915_dpt *dpt =i915_vm_to_dpt (vm);gen8_pte_t __iomem *base = dpt->iomem;gen8_set_pte (base + offset /I915_GTT_PAGE_SIZE , - vm->pte_encode (addr, level, flags)); + vm->pte_encode (addr, pat_index, flags)); }static void dpt_insert_entries (struct i915_address_space *vm,struct i915_vma_resource *vma_res, -enum i915_cache_level level, +unsigned int pat_index,u32 flags) {struct i915_dpt *dpt =i915_vm_to_dpt (vm);gen8_pte_t __iomem *base = dpt->iomem; -const gen8_pte_t pte_encode = vm->pte_encode (0 , level, flags); +const gen8_pte_t pte_encode = vm->pte_encode (0 , pat_index, flags);struct sgt_iter sgt_iter;dma_addr_t addr;int i;
@@ -83,7 +83,7 @@ static void dpt_clear_range(struct i915_address_space *vm,static void dpt_bind_vma (struct i915_address_space *vm,struct i915_vm_pt_stash *stash,struct i915_vma_resource *vma_res, -enum i915_cache_level cache_level, +unsigned int pat_index,u32 flags) {u32 pte_flags;
@@ -98,7 +98,7 @@ static void dpt_bind_vma(struct i915_address_space *vm,if (vma_res->bi.lmem) pte_flags |=PTE_LM ; - vm->insert_entries (vm, vma_res, cache_level, pte_flags); + vm->insert_entries (vm, vma_res, pat_index, pte_flags); vma_res->page_sizes_gtt =I915_GTT_PAGE_SIZE ;
drivers/gpu/drm/i915/gem/i915_gem_domain.c +9 -18
@@ -27,8 +27,8 @@ static bool gpu_write_needs_clflush(struct drm_i915_gem_object *obj)if (IS_DGFX (i915))return false; -return !(obj->cache_level ==I915_CACHE_NONE || - obj->cache_level ==I915_CACHE_WT ); +return !(i915_gem_object_has_cache_level (obj,I915_CACHE_NONE ) || +i915_gem_object_has_cache_level (obj,I915_CACHE_WT )); }bool i915_gem_cpu_write_needs_clflush (struct drm_i915_gem_object *obj)
@@ -267,7 +267,7 @@ int i915_gem_object_set_cache_level(struct drm_i915_gem_object *obj, {int ret; -if (obj->cache_level == cache_level) +if (i915_gem_object_has_cache_level (obj, cache_level))return 0 ; ret = i915_gem_object_wait(obj,
@@ -278,10 +278,8 @@ int i915_gem_object_set_cache_level(struct drm_i915_gem_object *obj,return ret;/* Always invalidate stale cachelines */ -if (obj->cache_level != cache_level) { -i915_gem_object_set_cache_coherency (obj, cache_level); - obj->cache_dirty = true; - } +i915_gem_object_set_cache_coherency (obj, cache_level); + obj->cache_dirty = true;/* The cache-level will be applied when each vma is rebound. */ return i915_gem_object_unbind(obj,
@@ -306,20 +304,13 @@ int i915_gem_get_caching_ioctl(struct drm_device *dev, void *data, goto out; } -switch (obj->cache_level) { -case I915_CACHE_LLC : -case I915_CACHE_L3_LLC : +if (i915_gem_object_has_cache_level (obj,I915_CACHE_LLC ) || +i915_gem_object_has_cache_level (obj,I915_CACHE_L3_LLC )) args->caching =I915_CACHING_CACHED ; -break ; - -case I915_CACHE_WT : +else if (i915_gem_object_has_cache_level (obj,I915_CACHE_WT )) args->caching =I915_CACHING_DISPLAY ; -break ; - -default : +else args->caching =I915_CACHING_NONE ; -break ; - } out:rcu_read_unlock ();return err;
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +6 -4
@@ -642,7 +642,7 @@ static inline int use_cpu_reloc(const struct reloc_cache *cache,return (cache->has_llc || obj->cache_dirty || - obj->cache_level !=I915_CACHE_NONE ); + !i915_gem_object_has_cache_level (obj,I915_CACHE_NONE )); } static int eb_reserve_vma(struct i915_execbuffer *eb,
@@ -1323,8 +1323,10 @@ static void *reloc_iomap(struct i915_vma *batch, offset = cache->node.start;if (drm_mm_node_allocated (&cache->node)) { ggtt->vm.insert_page (&ggtt->vm, -i915_gem_object_get_dma_address (obj, page), - offset,I915_CACHE_NONE ,0 ); +i915_gem_object_get_dma_address (obj, page), + offset, +i915_gem_get_pat_index (ggtt->vm.i915,I915_CACHE_NONE ), +0 ); }else { offset += page <<PAGE_SHIFT ; }
@@ -1464,7 +1466,7 @@ eb_relocate_entry(struct i915_execbuffer *eb,reloc_cache_unmap (&eb->reloc_cache);mutex_lock (&vma->vm->mutex); err =i915_vma_bind (target->vma, - target->vma->obj->cache_level, + target->vma->obj->pat_index,PIN_GLOBAL ,NULL ,NULL );mutex_unlock (&vma->vm->mutex);reloc_cache_remap (&eb->reloc_cache, ev->vma->obj);
drivers/gpu/drm/i915/gem/i915_gem_mman.c +2 -1
@@ -383,7 +383,8 @@ static vm_fault_t vm_fault_gtt(struct vm_fault *vmf) }/* Access to snoopable pages through the GTT is incoherent. */ -if (obj->cache_level !=I915_CACHE_NONE && !HAS_LLC (i915)) { +if (!(i915_gem_object_has_cache_level (obj,I915_CACHE_NONE ) || +HAS_LLC (i915))) { ret = -EFAULT ; goto err_unpin; }
drivers/gpu/drm/i915/gem/i915_gem_object.c +51 -1
70 lines not on this page · raw message
drivers/gpu/drm/i915/gem/i915_gem_object.h +4 -0
@@ -34,6 +34,8 @@ static inline bool i915_gem_object_size_2big(u64 size)unsigned int i915_gem_get_pat_index (struct drm_i915_private *i915,enum i915_cache_level level); +bool i915_gem_object_has_cache_level (const struct drm_i915_gem_object *obj, +enum i915_cache_level lvl);void i915_gem_init__objects (struct drm_i915_private *i915);void i915_objects_module_exit (void );
@@ -764,6 +766,8 @@ bool i915_gem_object_has_unknown_state(struct drm_i915_gem_object *obj);void i915_gem_object_set_cache_coherency (struct drm_i915_gem_object *obj,unsigned int cache_level); +void i915_gem_object_set_pat_index (struct drm_i915_gem_object *obj, +unsigned int pat_index);bool i915_gem_object_can_bypass_llc (struct drm_i915_gem_object *obj);void i915_gem_object_flush_if_display (struct drm_i915_gem_object *obj);void i915_gem_object_flush_if_display_locked (struct drm_i915_gem_object *obj);
drivers/gpu/drm/i915/gem/i915_gem_object_types.h +22 -3
@@ -195,6 +195,7 @@ enum i915_cache_level {*/ I915_CACHE_WT ,I915_MAX_CACHE_LEVEL , + I915_CACHE_INVAL = I915_MAX_CACHE_LEVEL, }; enum i915_map_type {
@@ -358,10 +359,28 @@ struct drm_i915_gem_object {#define I915_BO_FLAG_STRUCT_PAGE BIT(0)/* Object backed by struct pages */ #define I915_BO_FLAG_IOMEM BIT(1)/* Object backed by IO memory */ /** -* @cache_level: The desired GTT caching level. +* @pat_index: The desired PAT index. +* +* See hardware specification for valid PAT indices for each platform. +* This field used to contain a value of enum i915_cache_level. It's +* changed to an unsigned int because PAT indices are being used by +* both UMD and KMD for caching policy control after GEN12. +* For backward compatibility, this field will continue to contain +* value of i915_cache_level for pre-GEN12 platforms so that the PTE +* encode functions for these legacy platforms can stay the same. +* In the meantime platform specific tables are created to translate +* i915_cache_level into pat index, for more details check the macros +* defined i915/i915_pci.c, e.g. PVC_CACHELEVEL. +*/ + unsigned int pat_index:6; +/** +* @cache_level: Indicate whether pat_index is set by UMD * -* See enum i915_cache_level for possible values, along with what -* each does. +* This used to hold desired GTT caching level, but is now replaced by +* pat_index. It's kept here for KMD to tell whether the pat_index is +* set by UMD or converted from enum i915_cache_level. +* This field should be 0 by default, but I915_CACHE_INVAL if the +* pat_index is set by UMD. */ unsigned int cache_level:3;/**
drivers/gpu/drm/i915/gem/i915_gem_stolen.c +3 -1
@@ -565,7 +565,9 @@ static void dbg_poison(struct i915_ggtt *ggtt, ggtt->vm.insert_page (&ggtt->vm, addr, ggtt->error_capture.start, -I915_CACHE_NONE ,0 ); +i915_gem_get_pat_index (ggtt->vm.i915, +I915_CACHE_NONE ), +0 );mb (); s = io_mapping_map_wc(&ggtt->iomap,
drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c +9 -7
@@ -214,7 +214,8 @@ static struct dma_fence *i915_ttm_accel_move(struct ttm_buffer_object *bo,intel_engine_pm_get (to_gt (i915)->migrate.context->engine); ret =intel_context_migrate_clear (to_gt (i915)->migrate.context, deps, - dst_st->sgl, dst_level, + dst_st->sgl, +i915_gem_get_pat_index (i915, dst_level),i915_ttm_gtt_binds_lmem (dst_mem),0 , &rq); }else {
@@ -227,12 +228,13 @@ static struct dma_fence *i915_ttm_accel_move(struct ttm_buffer_object *bo, src_level =i915_ttm_cache_level (i915, bo->resource, src_ttm);intel_engine_pm_get (to_gt (i915)->migrate.context->engine); ret =intel_context_migrate_copy (to_gt (i915)->migrate.context, - deps, src_rsgt->table.sgl, - src_level, -i915_ttm_gtt_binds_lmem (bo->resource), - dst_st->sgl, dst_level, -i915_ttm_gtt_binds_lmem (dst_mem), - &rq); + deps, src_rsgt->table.sgl, +i915_gem_get_pat_index (i915, src_level), +i915_ttm_gtt_binds_lmem (bo->resource), + dst_st->sgl, +i915_gem_get_pat_index (i915, dst_level), +i915_ttm_gtt_binds_lmem (dst_mem), + &rq);i915_refct_sgt_put (src_rsgt); }
drivers/gpu/drm/i915/gem/selftests/huge_pages.c +1 -1
@@ -354,7 +354,7 @@ fake_huge_pages_object(struct drm_i915_private *i915, u64 size, bool single) obj->write_domain =I915_GEM_DOMAIN_CPU ; obj->read_domains =I915_GEM_DOMAIN_CPU ; - obj->cache_level =I915_CACHE_NONE ; + obj->pat_index =i915_gem_get_pat_index (i915,I915_CACHE_NONE );return obj; }
drivers/gpu/drm/i915/gem/selftests/i915_gem_migrate.c +1 -1
@@ -219,7 +219,7 @@ static int __igt_lmem_pages_migrate(struct intel_gt *gt,continue ; err =intel_migrate_clear (>->migrate, &ww, deps, - obj->mm.pages->sgl, obj->cache_level, + obj->mm.pages->sgl, obj->pat_index,i915_gem_object_is_lmem (obj),0xdeadbeaf , &rq);if (rq) {
drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c +1 -1
@@ -1222,7 +1222,7 @@ static int __igt_mmap_migrate(struct intel_memory_region **placements, } err =intel_context_migrate_clear (to_gt (i915)->migrate.context,NULL , - obj->mm.pages->sgl, obj->cache_level, + obj->mm.pages->sgl, obj->pat_index,i915_gem_object_is_lmem (obj),expand32 (POISON_INUSE ), &rq);i915_gem_object_unpin_pages (obj);
drivers/gpu/drm/i915/gt/gen6_ppgtt.c +6 -4
@@ -109,7 +109,7 @@ static void gen6_ppgtt_clear_range(struct i915_address_space *vm,static void gen6_ppgtt_insert_entries (struct i915_address_space *vm,struct i915_vma_resource *vma_res, -enum i915_cache_level cache_level, +unsigned int pat_index,u32 flags) {struct i915_ppgtt *ppgtt =i915_vm_to_ppgtt (vm);
@@ -117,7 +117,7 @@ static void gen6_ppgtt_insert_entries(struct i915_address_space *vm,unsigned int first_entry = vma_res->start /I915_GTT_PAGE_SIZE ;unsigned int act_pt = first_entry /GEN6_PTES ;unsigned int act_pte = first_entry %GEN6_PTES ; -const u32 pte_encode = vm->pte_encode (0 , cache_level, flags); +const u32 pte_encode = vm->pte_encode (0 , pat_index, flags);struct sgt_dma iter =sgt_dma (vma_res);gen6_pte_t *vaddr;
@@ -227,7 +227,9 @@ static int gen6_ppgtt_init_scratch(struct gen6_ppgtt *ppgtt) vm->scratch[0 ]->encode = vm->pte_encode (px_dma (vm->scratch[0 ]), -I915_CACHE_NONE ,PTE_READ_ONLY ); +i915_gem_get_pat_index (vm->i915, +I915_CACHE_NONE ), +PTE_READ_ONLY ); vm->scratch[1 ] = vm->alloc_pt_dma (vm,I915_GTT_PAGE_SIZE_4K );if (IS_ERR (vm->scratch[1 ])) {
@@ -278,7 +280,7 @@ static void gen6_ppgtt_cleanup(struct i915_address_space *vm)static void pd_vma_bind (struct i915_address_space *vm,struct i915_vm_pt_stash *stash,struct i915_vma_resource *vma_res, -enum i915_cache_level cache_level, +unsigned int pat_index,u32 unused) {struct i915_ggtt *ggtt =i915_vm_to_ggtt (vm);
drivers/gpu/drm/i915/gt/gen8_ppgtt.c +34 -37
174 lines not on this page · raw message
drivers/gpu/drm/i915/gt/gen8_ppgtt.h +1 -2
@@ -10,13 +10,12 @@struct i915_address_space ;struct intel_gt ; -enum i915_cache_level ;struct i915_ppgtt *gen8_ppgtt_create (struct intel_gt *gt,unsigned long lmem_pt_obj_flags);u64 gen8_ggtt_pte_encode (dma_addr_t addr, -enum i915_cache_level level, +unsigned int pat_index,u32 flags); u64 mtl_ggtt_pte_encode(dma_addr_t addr, unsigned int pat_index,
drivers/gpu/drm/i915/gt/intel_ggtt.c +40 -42
229 lines not on this page · raw message
drivers/gpu/drm/i915/gt/intel_gtt.h +9 -11
@@ -165,8 +165,6 @@ typedef u64 gen8_pte_t;#define MTL_2_COH_1W REG_FIELD_PREP(MTL_PAT_INDEX_COH_MODE_MASK, 2)#define MTL_0_COH_NON REG_FIELD_PREP(MTL_PAT_INDEX_COH_MODE_MASK, 0) -enum i915_cache_level ; -struct drm_i915_gem_object ;struct i915_fence_reg ;struct i915_vma ;
@@ -234,7 +232,7 @@ struct i915_vma_ops {void (*bind_vma)(struct i915_address_space *vm,struct i915_vm_pt_stash *stash,struct i915_vma_resource *vma_res, -enum i915_cache_level cache_level, +unsigned int pat_index,u32 flags);/* * Unmap an object from an address space. This usually consists of
@@ -306,7 +304,7 @@ struct i915_address_space { (*alloc_scratch_dma)(struct i915_address_space *vm, int sz);u64 (*pte_encode)(dma_addr_t addr, -enum i915_cache_level level, +unsigned int pat_index,u32 flags);/* Create a valid PTE */ #define PTE_READ_ONLY BIT(0)#define PTE_LM BIT(1)
@@ -321,20 +319,20 @@ struct i915_address_space {void (*insert_page)(struct i915_address_space *vm,dma_addr_t addr,u64 offset, -enum i915_cache_level cache_level, +unsigned int pat_index,u32 flags);void (*insert_entries)(struct i915_address_space *vm,struct i915_vma_resource *vma_res, -enum i915_cache_level cache_level, +unsigned int pat_index,u32 flags);void (*raw_insert_page)(struct i915_address_space *vm,dma_addr_t addr,u64 offset, -enum i915_cache_level cache_level, +unsigned int pat_index,u32 flags);void (*raw_insert_entries)(struct i915_address_space *vm,struct i915_vma_resource *vma_res, -enum i915_cache_level cache_level, +unsigned int pat_index,u32 flags);void (*cleanup)(struct i915_address_space *vm);
@@ -581,7 +579,7 @@ void ppgtt_init(struct i915_ppgtt *ppgtt, struct intel_gt *gt,void intel_ggtt_bind_vma (struct i915_address_space *vm,struct i915_vm_pt_stash *stash,struct i915_vma_resource *vma_res, -enum i915_cache_level cache_level, +unsigned int pat_index,u32 flags);void intel_ggtt_unbind_vma (struct i915_address_space *vm,struct i915_vma_resource *vma_res);
@@ -639,7 +637,7 @@ void __set_pd_entry(struct i915_page_directory * const pd, const unsigned short idx, struct i915_page_table *pt, - u64 (*encode)(const dma_addr_t, const enum i915_cache_level)); + u64 (*encode)(const dma_addr_t, const unsigned int pat_index));#define set_pd_entry (pd, idx, to) \ __set_pd_entry((pd), (idx), px_pt(to), gen8_pde_encode)
@@ -659,7 +657,7 @@ void gen6_ggtt_invalidate(struct i915_ggtt *ggtt);void ppgtt_bind_vma (struct i915_address_space *vm,struct i915_vm_pt_stash *stash,struct i915_vma_resource *vma_res, -enum i915_cache_level cache_level, +unsigned int pat_index,u32 flags);void ppgtt_unbind_vma (struct i915_address_space *vm,struct i915_vma_resource *vma_res);
drivers/gpu/drm/i915/gt/intel_migrate.c +26 -21
156 lines not on this page · raw message
drivers/gpu/drm/i915/gt/intel_migrate.h +6 -7
@@ -16,7 +16,6 @@ struct i915_request;struct i915_gem_ww_ctx ;struct intel_gt ;struct scatterlist ; -enum i915_cache_level ;int intel_migrate_init (struct intel_migrate *m,struct intel_gt *gt);
@@ -26,20 +25,20 @@ int intel_migrate_copy(struct intel_migrate *m,struct i915_gem_ww_ctx *ww, const struct i915_deps *deps, struct scatterlist *src, - enum i915_cache_level src_cache_level, + unsigned int src_pat_index, bool src_is_lmem, struct scatterlist *dst, - enum i915_cache_level dst_cache_level, + unsigned int dst_pat_index, bool dst_is_lmem, struct i915_request **out);int intel_context_migrate_copy (struct intel_context *ce,const struct i915_deps *deps,struct scatterlist *src, -enum i915_cache_level src_cache_level, +unsigned int src_pat_index,bool src_is_lmem,struct scatterlist *dst, -enum i915_cache_level dst_cache_level, +unsigned int dst_pat_index,bool dst_is_lmem,struct i915_request **out);
@@ -48,7 +47,7 @@ intel_migrate_clear(struct intel_migrate *m,struct i915_gem_ww_ctx *ww, const struct i915_deps *deps, struct scatterlist *sg, - enum i915_cache_level cache_level, + unsigned int pat_index, bool is_lmem, u32 value, struct i915_request **out);
@@ -56,7 +55,7 @@ int intel_context_migrate_clear(struct intel_context *ce, const struct i915_deps *deps, struct scatterlist *sg, - enum i915_cache_level cache_level, + unsigned int pat_index, bool is_lmem, u32 value, struct i915_request **out);
drivers/gpu/drm/i915/gt/intel_ppgtt.c +3 -3
@@ -98,7 +98,7 @@ void __set_pd_entry(struct i915_page_directory * const pd, const unsigned short idx, struct i915_page_table * const to, - u64 (*encode)(const dma_addr_t, const enum i915_cache_level)) + u64 (*encode)(const dma_addr_t, const unsigned int)) { /* Each thread pre-pins the pd, and we may have a thread per pde. */ GEM_BUG_ON(atomic_read(px_used(pd)) > NALLOC * I915_PDES);
@@ -181,7 +181,7 @@ struct i915_ppgtt *i915_ppgtt_create(struct intel_gt *gt,void ppgtt_bind_vma (struct i915_address_space *vm,struct i915_vm_pt_stash *stash,struct i915_vma_resource *vma_res, -enum i915_cache_level cache_level, +unsigned int pat_index,u32 flags) {u32 pte_flags;
@@ -199,7 +199,7 @@ void ppgtt_bind_vma(struct i915_address_space *vm,if (vma_res->bi.lmem) pte_flags |=PTE_LM ; - vm->insert_entries (vm, vma_res, cache_level, pte_flags); + vm->insert_entries (vm, vma_res, pat_index, pte_flags);wmb (); }
drivers/gpu/drm/i915/gt/selftest_migrate.c +25 -22
156 lines not on this page · raw message
drivers/gpu/drm/i915/gt/selftest_reset.c +6 -2
@@ -86,7 +86,9 @@ __igt_reset_stolen(struct intel_gt *gt, ggtt->vm.insert_page (&ggtt->vm, dma, ggtt->error_capture.start, -I915_CACHE_NONE ,0 ); +i915_gem_get_pat_index (gt->i915, +I915_CACHE_NONE ), +0 );mb (); s = io_mapping_map_wc(&ggtt->iomap,
@@ -127,7 +129,9 @@ __igt_reset_stolen(struct intel_gt *gt, ggtt->vm.insert_page (&ggtt->vm, dma, ggtt->error_capture.start, -I915_CACHE_NONE ,0 ); +i915_gem_get_pat_index (gt->i915, +I915_CACHE_NONE ), +0 );mb (); s = io_mapping_map_wc(&ggtt->iomap,
drivers/gpu/drm/i915/gt/selftest_timeline.c +1 -1
@@ -836,7 +836,7 @@ static int setup_watcher(struct hwsp_watcher *w, struct intel_gt *gt,return PTR_ERR (obj);/* keep the same cache settings as timeline */ -i915_gem_object_set_cache_coherency (obj, tl->hwsp_ggtt->obj->cache_level); +i915_gem_object_set_pat_index (obj, tl->hwsp_ggtt->obj->pat_index); w->map =i915_gem_object_pin_map_unlocked (obj,page_unmask_bits (tl->hwsp_ggtt->obj->mm.mapping));if (IS_ERR (w->map)) {
drivers/gpu/drm/i915/gt/selftest_tlb.c +3 -1
@@ -36,6 +36,8 @@ pte_tlbinv(struct intel_context *ce, u64 length, struct rnd_state *prng) { +const unsigned int pat_index = +i915_gem_get_pat_index (ce->vm->i915,I915_CACHE_NONE );struct drm_i915_gem_object *batch;struct drm_mm_node vb_node;struct i915_request *rq;
@@ -155,7 +157,7 @@ pte_tlbinv(struct intel_context *ce,/* Flip the PTE between A and B */ if (i915_gem_object_is_lmem (vb->obj)) pte_flags |=PTE_LM ; - ce->vm->insert_entries (ce->vm, &vb_res,0 , pte_flags); + ce->vm->insert_entries (ce->vm, &vb_res, pat_index, pte_flags);/* Flush the PTE update to concurrent HW */ tlbinv (ce->vm, addr & -length, length);
drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c +8 -2
@@ -890,9 +890,15 @@ static void uc_fw_bind_ggtt(struct intel_uc_fw *uc_fw) pte_flags |=PTE_LM ;if (ggtt->vm.raw_insert_entries) - ggtt->vm.raw_insert_entries (&ggtt->vm, dummy,I915_CACHE_NONE , pte_flags); + ggtt->vm.raw_insert_entries (&ggtt->vm, dummy, +i915_gem_get_pat_index (ggtt->vm.i915, +I915_CACHE_NONE ), + pte_flags);else - ggtt->vm.insert_entries (&ggtt->vm, dummy,I915_CACHE_NONE , pte_flags); + ggtt->vm.insert_entries (&ggtt->vm, dummy, +i915_gem_get_pat_index (ggtt->vm.i915, +I915_CACHE_NONE ), + pte_flags); }static void uc_fw_unbind_ggtt (struct intel_uc_fw *uc_fw)
drivers/gpu/drm/i915/i915_debugfs.c +45 -10
73 lines not on this page · raw message
drivers/gpu/drm/i915/i915_gem.c +12 -4
@@ -420,8 +420,12 @@ i915_gem_gtt_pread(struct drm_i915_gem_object *obj, page_length = remain < page_length ? remain : page_length;if (drm_mm_node_allocated (&node)) { ggtt->vm.insert_page (&ggtt->vm, -i915_gem_object_get_dma_address (obj, offset >>PAGE_SHIFT ), - node.start,I915_CACHE_NONE ,0 ); +i915_gem_object_get_dma_address (obj, + offset >>PAGE_SHIFT ), + node.start, +i915_gem_get_pat_index (i915, +I915_CACHE_NONE ), +0 ); }else { page_base += offset &PAGE_MASK ; }
@@ -598,8 +602,12 @@ i915_gem_gtt_pwrite_fast(struct drm_i915_gem_object *obj,/* flush the write before we modify the GGTT */ intel_gt_flush_ggtt_writes (ggtt->vm.gt); ggtt->vm.insert_page (&ggtt->vm, -i915_gem_object_get_dma_address (obj, offset >>PAGE_SHIFT ), - node.start,I915_CACHE_NONE ,0 ); +i915_gem_object_get_dma_address (obj, + offset >>PAGE_SHIFT ), + node.start, +i915_gem_get_pat_index (i915, +I915_CACHE_NONE ), +0 );wmb ();/* flush modifications to the GGTT (insert_page) */ }else { page_base += offset &PAGE_MASK ;
drivers/gpu/drm/i915/i915_gpu_error.c +6 -2
@@ -1117,10 +1117,14 @@ i915_vma_coredump_create(const struct intel_gt *gt,mutex_lock (&ggtt->error_mutex);if (ggtt->vm.raw_insert_page) ggtt->vm.raw_insert_page (&ggtt->vm, dma, slot, -I915_CACHE_NONE ,0 ); +i915_gem_get_pat_index (gt->i915, +I915_CACHE_NONE ), +0 );else ggtt->vm.insert_page (&ggtt->vm, dma, slot, -I915_CACHE_NONE ,0 ); +i915_gem_get_pat_index (gt->i915, +I915_CACHE_NONE ), +0 );mb (); s =io_mapping_map_wc (&ggtt->iomap, slot,PAGE_SIZE );
drivers/gpu/drm/i915/i915_vma.c +8 -8
@@ -315,7 +315,7 @@ struct i915_vma_work {struct i915_vma_resource *vma_res;struct drm_i915_gem_object *obj;struct i915_sw_dma_fence_cb cb; -enum i915_cache_level cache_level; +unsigned int pat_index;unsigned int flags; };
@@ -334,7 +334,7 @@ static void __vma_bind(struct dma_fence_work *work)return ; vma_res->ops->bind_vma (vma_res->vm, &vw->stash, - vma_res, vw->cache_level, vw->flags); + vma_res, vw->pat_index, vw->flags); }static void __vma_release (struct dma_fence_work *work)
@@ -426,7 +426,7 @@ i915_vma_resource_init_from_vma(struct i915_vma_resource *vma_res,/** * i915_vma_bind - Sets up PTEs for an VMA in it's corresponding address space. * @vma: VMA to map -* @cache_level: mapping cache level +* @pat_index: PAT index to set in PTE * @flags: flags like global or local mapping * @work: preallocated worker for allocating and binding the PTE * @vma_res: pointer to a preallocated vma resource. The resource is either
@@ -437,7 +437,7 @@ i915_vma_resource_init_from_vma(struct i915_vma_resource *vma_res,* Note that DMA addresses are also the only part of the SG table we care about. */ int i915_vma_bind (struct i915_vma *vma, -enum i915_cache_level cache_level, +unsigned int pat_index,u32 flags,struct i915_vma_work *work,struct i915_vma_resource *vma_res)
@@ -507,7 +507,7 @@ int i915_vma_bind(struct i915_vma *vma,struct dma_fence *prev; work->vma_res =i915_vma_resource_get (vma->resource); - work->cache_level = cache_level; + work->pat_index = pat_index; work->flags = bind_flags;/*
@@ -537,7 +537,7 @@ int i915_vma_bind(struct i915_vma *vma,return ret; } - vma->ops->bind_vma (vma->vm,NULL , vma->resource, cache_level, + vma->ops->bind_vma (vma->vm,NULL , vma->resource, pat_index, bind_flags); }
@@ -814,7 +814,7 @@ i915_vma_insert(struct i915_vma *vma, struct i915_gem_ww_ctx *ww, color =0 ;if (i915_vm_has_cache_coloring (vma->vm)) - color = vma->obj->cache_level; + color = vma->obj->pat_index;if (flags &PIN_OFFSET_FIXED ) {u64 offset = flags &PIN_OFFSET_MASK ;
@@ -1518,7 +1518,7 @@ int i915_vma_pin_ww(struct i915_vma *vma, struct i915_gem_ww_ctx *ww,GEM_BUG_ON (!vma->pages); err =i915_vma_bind (vma, - vma->obj->cache_level, + vma->obj->pat_index, flags, work, vma_res); vma_res =NULL ;if (err)
drivers/gpu/drm/i915/i915_vma.h +1 -1
@@ -250,7 +250,7 @@ i915_vma_compare(struct i915_vma *vma,struct i915_vma_work *i915_vma_work (void );int i915_vma_bind (struct i915_vma *vma, -enum i915_cache_level cache_level, +unsigned int pat_index,u32 flags,struct i915_vma_work *work,struct i915_vma_resource *vma_res);
drivers/gpu/drm/i915/i915_vma_types.h +0 -2
@@ -32,8 +32,6 @@#include "gem/i915_gem_object_types.h" -enum i915_cache_level ; -/** * DOC: Global GTT views *
drivers/gpu/drm/i915/selftests/i915_gem.c +4 -1
@@ -57,7 +57,10 @@ static void trash_stolen(struct drm_i915_private *i915)u32 __iomem *s;int x; - ggtt->vm.insert_page (&ggtt->vm, dma, slot,I915_CACHE_NONE ,0 ); + ggtt->vm.insert_page (&ggtt->vm, dma, slot, +i915_gem_get_pat_index (i915, +I915_CACHE_NONE ), +0 ); s =io_mapping_map_atomic_wc (&ggtt->iomap, slot);for (x =0 ; x <PAGE_SIZE /sizeof (u32); x++) {
drivers/gpu/drm/i915/selftests/i915_gem_evict.c +2 -2
@@ -245,7 +245,7 @@ static int igt_evict_for_cache_color(void *arg)struct drm_mm_node target = { .start =I915_GTT_PAGE_SIZE *2 , .size =I915_GTT_PAGE_SIZE , - .color =I915_CACHE_LLC , + .color =i915_gem_get_pat_index (gt->i915,I915_CACHE_LLC ), };struct drm_i915_gem_object *obj;struct i915_vma *vma;
@@ -308,7 +308,7 @@ static int igt_evict_for_cache_color(void *arg)/* Attempt to remove the first *pinned* vma, by removing the (empty) * neighbour -- this should fail. */ - target.color =I915_CACHE_L3_LLC ; + target.color =i915_gem_get_pat_index (gt->i915,I915_CACHE_L3_LLC );mutex_lock (&ggtt->vm.mutex); err =i915_gem_evict_for_node (&ggtt->vm,NULL , &target,0 );
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +10 -5
@@ -135,7 +135,7 @@ fake_dma_object(struct drm_i915_private *i915, u64 size) obj->write_domain =I915_GEM_DOMAIN_CPU ; obj->read_domains =I915_GEM_DOMAIN_CPU ; - obj->cache_level =I915_CACHE_NONE ; + obj->pat_index =i915_gem_get_pat_index (i915,I915_CACHE_NONE );/* Preallocate the "backing storage" */ if (i915_gem_object_pin_pages_unlocked (obj))
@@ -359,7 +359,9 @@ static int lowlevel_hole(struct i915_address_space *vm,with_intel_runtime_pm (vm->gt->uncore->rpm, wakeref) vm->insert_entries(vm, mock_vma_res, -I915_CACHE_NONE ,0 ); +i915_gem_get_pat_index (vm->i915, +I915_CACHE_NONE ), +0 ); } count = n;
@@ -1377,7 +1379,10 @@ static int igt_ggtt_page(void *arg) ggtt->vm.insert_page (&ggtt->vm,i915_gem_object_get_dma_address (obj,0 ), - offset,I915_CACHE_NONE ,0 ); + offset, +i915_gem_get_pat_index (i915, +I915_CACHE_NONE ), +0 ); } order =i915_random_order (count, &prng);
@@ -1510,7 +1515,7 @@ static int reserve_gtt_with_resource(struct i915_vma *vma, u64 offset)mutex_lock (&vm->mutex); err =i915_gem_gtt_reserve (vm,NULL , &vma->node, obj->base.size, offset, - obj->cache_level, + obj->pat_index,0 );if (!err) {i915_vma_resource_init_from_vma (vma_res, vma);
@@ -1690,7 +1695,7 @@ static int insert_gtt_with_resource(struct i915_vma *vma)mutex_lock (&vm->mutex); err =i915_gem_gtt_insert (vm,NULL , &vma->node, obj->base.size,0 , - obj->cache_level,0 , vm->total,0 ); + obj->pat_index,0 , vm->total,0 );if (!err) {i915_vma_resource_init_from_vma (vma_res, vma); vma->resource = vma_res;
drivers/gpu/drm/i915/selftests/intel_memory_region.c +3 -1
@@ -1070,7 +1070,9 @@ static int igt_lmem_write_cpu(void *arg)/* Put the pages into a known state -- from the gpu for added fun */ intel_engine_pm_get (engine); err =intel_context_migrate_clear (engine->gt->migrate.context,NULL , - obj->mm.pages->sgl,I915_CACHE_NONE , + obj->mm.pages->sgl, +i915_gem_get_pat_index (i915, +I915_CACHE_NONE ), true,0xdeadbeaf , &rq);if (rq) { dma_resv_add_fence(obj->base.resv, &rq->fence,
drivers/gpu/drm/i915/selftests/mock_gtt.c +4 -4
@@ -27,21 +27,21 @@static void mock_insert_page (struct i915_address_space *vm,dma_addr_t addr,u64 offset, -enum i915_cache_level level, +unsigned int pat_index,u32 flags) { }static void mock_insert_entries (struct i915_address_space *vm,struct i915_vma_resource *vma_res, -enum i915_cache_level level,u32 flags) +unsigned int pat_index,u32 flags) { }static void mock_bind_ppgtt (struct i915_address_space *vm,struct i915_vm_pt_stash *stash,struct i915_vma_resource *vma_res, -enum i915_cache_level cache_level, +unsigned int pat_index,u32 flags) {GEM_BUG_ON (flags &I915_VMA_GLOBAL_BIND );
@@ -94,7 +94,7 @@ struct i915_ppgtt *mock_ppgtt(struct drm_i915_private *i915, const char *name)static void mock_bind_ggtt (struct i915_address_space *vm,struct i915_vm_pt_stash *stash,struct i915_vma_resource *vma_res, -enum i915_cache_level cache_level, +unsigned int pat_index,u32 flags) { }
Signature · 1 line
2.25.1
Re: [Intel-gfx] [PATCH 7/8] drm/i915: use pat_index instead of cache_level
Hi Fei,
Quoted 10 lines · On Sun, Apr 16, 2023 at 11:25:02PM -0700, [email protected] wrote:
From: Fei Yang <[email protected]>
Currently the KMD is using enum
i915_cache_levelto set caching policy for buffer objects. This is flaky because the PAT index which really controls the caching behavior in PTE has far more levels than what's defined in the enum. In addition, the PAT index is platform dependent, having to translate betweeni915_cache_leveland PAT index is not reliable, and makes the code more complicated.Quoted 1 line
From UMD's perspective there is also a necessity to set caching policy for
you have an extra '>' here.
Quoted 3 lines
performance fine tuning. It's much easier for the UMD to directly use PAT index because the behavior of each PAT index is clearly defined in Bspec. Haivng the abstracted
i915_cache_levelsitting in between would only cause
/Haivng/Having/
Quoted 11 lines
more ambiguity.
For these reasons this patch replaces
i915_cache_levelwith PAT index. Also note, thecache_levelis not completely removed yet, because the KMD still has the need of creating buffer objects with simple cache settings such as cached, uncached, or writethrough. For these simple cases, usingcache_levelwould help simplify the code.Cc Chris Wilson <[email protected]>Cc Matt Roper <[email protected]>Signed-off-by Fei Yang <[email protected]>
fiuuuuu... quite a run this patch! But I did review it once, anyway I checked it again, it looks all correct.
Andi
PATCH 8/8 drm/i915: Allow user to set cache at BO creation
In reply to [email protected]From: Fei Yang <[email protected]>
To comply with the design that buffer objects shall have immutable cache setting through out its life cycle, {set, get}_caching ioctl's are no longer supported from MTL onward. With that change caching policy can only be set at object creation time. The current code applies a default (platform dependent) cache setting for all objects. However this is not optimal for performance tuning. The patch extends the existing gem_create uAPI to let user set PAT index for the object at creation time.
The new extension is platform independent, so UMD's can switch to using this extension for older platforms as well, while {set, get}_caching are still supported on these legacy paltforms for compatibility reason.
--- drivers/gpu/drm/i915/gem/i915_gem_create.c | 36 ++++++++++++++++++++++ drivers/gpu/drm/i915/gem/i915_gem_object.c | 6 ++++ include/uapi/drm/i915_drm.h | 36 ++++++++++++++++++++++ tools/include/uapi/drm/i915_drm.h | 36 ++++++++++++++++++++++ 4 files changed, 114 insertions(+)
drivers/gpu/drm/i915/gem/i915_gem_create.c +36 -0
@@ -245,6 +245,7 @@ struct create_ext {unsigned int n_placements;unsigned int placement_mask;unsigned long flags; +unsigned int pat_index; }; static void repr_placements(char *buf, size_t size,
@@ -394,11 +395,39 @@ static int ext_set_protected(struct i915_user_extension __user *base, void *datareturn 0 ; } +static int ext_set_pat (struct i915_user_extension __user *base,void *data) +{ +struct create_ext *ext_data = data; +struct drm_i915_private *i915 = ext_data->i915; +struct drm_i915_gem_create_ext_set_pat ext; +unsigned int max_pat_index; + +BUILD_BUG_ON (sizeof (struct drm_i915_gem_create_ext_set_pat ) != + offsetofend(struct drm_i915_gem_create_ext_set_pat, rsvd)); + +if (copy_from_user (&ext, base,sizeof (ext))) +return -EFAULT ; + + max_pat_index =INTEL_INFO (i915)->max_pat_index; + +if (ext.pat_index > max_pat_index) { +drm_dbg (&i915->drm,"PAT index is invalid: %u\n" , + ext.pat_index); +return -EINVAL ; + } + + ext_data->pat_index = ext.pat_index; + +return 0 ; +} +static const i915_user_extension_fn create_extensions[] = { [I915_GEM_CREATE_EXT_MEMORY_REGIONS ] = ext_set_placements, [I915_GEM_CREATE_EXT_PROTECTED_CONTENT ] = ext_set_protected, + [I915_GEM_CREATE_EXT_SET_PAT ] = ext_set_pat, }; +#define PAT_INDEX_NOT_SET 0xffff/** * i915_gem_create_ext_ioctl - Creates a new mm object and returns a handle to it. * @dev: drm device pointer
@@ -418,6 +447,7 @@ i915_gem_create_ext_ioctl(struct drm_device *dev, void *data,if (args->flags & ~I915_GEM_CREATE_EXT_FLAG_NEEDS_CPU_ACCESS )return -EINVAL ; + ext_data.pat_index =PAT_INDEX_NOT_SET ; ret = i915_user_extensions(u64_to_user_ptr(args->extensions), create_extensions, ARRAY_SIZE(create_extensions),
@@ -454,5 +484,11 @@ i915_gem_create_ext_ioctl(struct drm_device *dev, void *data,if (IS_ERR (obj))return PTR_ERR (obj); +if (ext_data.pat_index !=PAT_INDEX_NOT_SET ) { +i915_gem_object_set_pat_index (obj, ext_data.pat_index); +/* Mark pat_index is set by UMD */ + obj->cache_level =I915_CACHE_INVAL ; + } +return i915_gem_publish (obj, file, &args->size, &args->handle); }
drivers/gpu/drm/i915/gem/i915_gem_object.c +6 -0
@@ -209,6 +209,12 @@ bool i915_gem_object_can_bypass_llc(struct drm_i915_gem_object *obj)if (!(obj->flags &I915_BO_ALLOC_USER ))return false; +/* +* Always flush cache for UMD objects at creation time. +*/ +if (obj->cache_level ==I915_CACHE_INVAL ) +return true; +/* * EHL and JSL add the 'Bypass LLC' MOCS entry, which should make it * possible for userspace to bypass the GTT caching bits set by the
include/uapi/drm/i915_drm.h +36 -0
@@ -3630,9 +3630,13 @@ struct drm_i915_gem_create_ext {* * For I915_GEM_CREATE_EXT_PROTECTED_CONTENT usage see * struct drm_i915_gem_create_ext_protected_content. +* +* For I915_GEM_CREATE_EXT_SET_PAT usage see +* struct drm_i915_gem_create_ext_set_pat. */ #define I915_GEM_CREATE_EXT_MEMORY_REGIONS 0#define I915_GEM_CREATE_EXT_PROTECTED_CONTENT 1 +#define I915_GEM_CREATE_EXT_SET_PAT 2__u64 extensions; };
@@ -3747,6 +3751,38 @@ struct drm_i915_gem_create_ext_protected_content {__u32 flags; }; +/** +* struct drm_i915_gem_create_ext_set_pat - The +* I915_GEM_CREATE_EXT_SET_PAT extension. +* +* If this extension is provided, the specified caching policy (PAT index) is +* applied to the buffer object. +* +* Below is an example on how to create an object with specific caching policy: +* +* .. code-block:: C +* +* struct drm_i915_gem_create_ext_set_pat set_pat_ext = { +* .base = { .name = I915_GEM_CREATE_EXT_SET_PAT }, +* .pat_index = 0, +* }; +* struct drm_i915_gem_create_ext create_ext = { +* .size = PAGE_SIZE, +* .extensions = (uintptr_t)&set_pat_ext, +* }; +* +* int err = ioctl(fd, DRM_IOCTL_I915_GEM_CREATE_EXT, &create_ext); +* if (err) ... +*/ +struct drm_i915_gem_create_ext_set_pat { +/** @base: Extension link. See struct i915_user_extension. */ +struct i915_user_extension base; +/** @pat_index: PAT index to be set */ +__u32 pat_index; +/** @rsvd: reserved for future use */ +__u32 rsvd; +}; +/* ID of the protected content session managed by i915 when PXP is active */ #define I915_PROTECTED_CONTENT_DEFAULT_SESSION 0xf
tools/include/uapi/drm/i915_drm.h +36 -0
@@ -3607,9 +3607,13 @@ struct drm_i915_gem_create_ext {* * For I915_GEM_CREATE_EXT_PROTECTED_CONTENT usage see * struct drm_i915_gem_create_ext_protected_content. +* +* For I915_GEM_CREATE_EXT_SET_PAT usage see +* struct drm_i915_gem_create_ext_set_pat. */ #define I915_GEM_CREATE_EXT_MEMORY_REGIONS 0#define I915_GEM_CREATE_EXT_PROTECTED_CONTENT 1 +#define I915_GEM_CREATE_EXT_SET_PAT 2__u64 extensions; };
@@ -3724,6 +3728,38 @@ struct drm_i915_gem_create_ext_protected_content {__u32 flags; }; +/** +* struct drm_i915_gem_create_ext_set_pat - The +* I915_GEM_CREATE_EXT_SET_PAT extension. +* +* If this extension is provided, the specified caching policy (PAT index) is +* applied to the buffer object. +* +* Below is an example on how to create an object with specific caching policy: +* +* .. code-block:: C +* +* struct drm_i915_gem_create_ext_set_pat set_pat_ext = { +* .base = { .name = I915_GEM_CREATE_EXT_SET_PAT }, +* .pat_index = 0, +* }; +* struct drm_i915_gem_create_ext create_ext = { +* .size = PAGE_SIZE, +* .extensions = (uintptr_t)&set_pat_ext, +* }; +* +* int err = ioctl(fd, DRM_IOCTL_I915_GEM_CREATE_EXT, &create_ext); +* if (err) ... +*/ +struct drm_i915_gem_create_ext_set_pat { +/** @base: Extension link. See struct i915_user_extension. */ +struct i915_user_extension base; +/** @pat_index: PAT index to be set */ +__u32 pat_index; +/** @rsvd: reserved for future use */ +__u32 rsvd; +}; +/* ID of the protected content session managed by i915 when PXP is active */ #define I915_PROTECTED_CONTENT_DEFAULT_SESSION 0xf
Signature · 1 line
2.25.1
Re: [PATCH 8/8] drm/i915: Allow user to set cache at BO creation
Quoted 4 lines · On Sun, Apr 16, 2023 at 11:25:03PM -0700, [email protected] wrote:
From: Fei Yang <[email protected]>
To comply with the design that buffer objects shall have immutable cache setting through out its life cycle, {set, get}_caching ioctl's
/its/their/
Quoted 10 lines
are no longer supported from MTL onward. With that change caching policy can only be set at object creation time. The current code applies a default (platform dependent) cache setting for all objects. However this is not optimal for performance tuning. The patch extends the existing
gem_createuAPI to let user set PAT index for the object at creation time.
The new extension is platform independent, so UMD's can switch to using this extension for older platforms as well, while {set, get}_caching are still supported on these legacy paltforms for compatibility reason.
Quoted 4 lines
Cc Chris Wilson <[email protected]>Cc Matt Roper <[email protected]>Cc Andi Shyti <[email protected]>Signed-off-by Fei Yang <[email protected]>
Andi
[email protected] kirjoitti 17.4.2023 klo 9.24:
Quoted 5 lines
From: Fei Yang <[email protected]>
The series includes patches needed to enable MTL.
Also add new extension forGEM_CREATEuAPI to let
user space set cache policy for buffer objects.
if I'm counting right, this would be version 5 of the series, yet that is not shown anywhere nor the changes between series..
Signature · 1 line
t
Quoted 8 lines
[email protected] kirjoitti 17.4.2023 klo 9.24:
Quoted 5 lines
From: Fei Yang <[email protected]>
The series includes patches needed to enable MTL.
Also add new extension forGEM_CREATEuAPI to let user space set cache policy for buffer objects.if I'm counting right, this would be version 5 of the series, yet that is not shown anywhere nor the changes between series..
Yes, mostly addressing minor issues, just want to keep the commit message clean as it's the enablement patch set for new platform.
Quoted 2 lines
--
t
Quoted 7 lines · Fei
Quoted 7 lines
[email protected] kirjoitti 17.4.2023 klo 9.24:
Quoted 5 lines
From: Fei Yang <[email protected]>
The series includes patches needed to enable MTL.
Also add new extension forGEM_CREATEuAPI to let user space set cache policy for buffer objects.
Quoted 5 lines
Quoted 2 lines
if I'm counting right, this would be version 5 of the series, yet that is not shown anywhere nor the changes between series..
Yes, mostly addressing minor issues, just want to keep the commit message clean as it's the enablement patch set for new platform.
One thing that could help is to use the --subject-prefix parameter to git format-patch so "PATCH v5" would be in the subject of the emails.
Additionally, it's helpful to include full a version history in the cover-letter (0/8) patch so it's clear what has changed in each version of the patches sent out.
-Jordan
Patchwork
CI[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915/mtl: Define MOCS and PAT tables for MTL (rev5)
In reply to [email protected]== Series Details ==
== Series Details ==
Series: drm/i915/mtl: Define MOCS and PAT tables for MTL (rev5)
URL : https://patchwork.freedesktop.org/series/115980/
State : warning
== Summary ==
Error: dim checkpatch failed04d4f946f5f0 drm/i915/mtl: Set has_llc=0f44a8a034a83 drm/i915/mtl: Define MOCS and PAT tables for MTL -:63: CHECK:BRACES: Blank lines aren't necessary before a close brace '}' #63: FILE: drivers/gpu/drm/i915/gt/intel_gtt.c:486:
+
+}
total: 0 errors, 0 warnings, 1 checks, 247 lines checked5496af3927f8 drm/i915/mtl: Add PTE encode function
-:151: WARNING:AVOID_BUG: Do not crash the kernel unless it is absolutely unavoidable--use WARN_ON_ONCE() plus recovery code (if feasible) instead of BUG() or variants #151: FILE: drivers/gpu/drm/i915/gt/intel_ggtt.c:229:
+ GEM_BUG_ON(addr & ~GEN12_GGTT_PTE_ADDR_MASK);
total: 0 errors, 1 warnings, 0 checks, 164 lines checked 72e4d658a8e9 drm/i915/mtl: workaround coherency issue for Media b9a188850588 drm/i915/mtl: end support for set caching ioctl eaa559214e8c drm/i915: preparation for using PAT index -:422: CHECK:LINE_SPACING: Please don't use multiple blank lines #422: FILE: drivers/gpu/drm/i915/selftests/mock_gem_device.c:186:
+
+
total: 0 errors, 0 warnings, 1 checks, 335 lines checked932e5c4abaa6 drm/i915: use pat_index instead of cache_level
-:22: WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line) #22:
cached, uncached, or writethrough. For these simple cases, using cache_level
-:651: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #651: FILE: drivers/gpu/drm/i915/gt/gen8_ppgtt.c:873:
+ i915_gem_get_pat_index(vm->i915,
+ I915_CACHE_NONE));
-:921: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #921: FILE: drivers/gpu/drm/i915/gt/intel_ggtt.c:1303:
+ i915_gem_get_pat_index(vm->i915,
+ I915_CACHE_NONE),
-:1619: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #1619: FILE: drivers/gpu/drm/i915/i915_gem.c:424:
+ i915_gem_object_get_dma_address(obj,
+ offset >> PAGE_SHIFT),
-:1634: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #1634: FILE: drivers/gpu/drm/i915/i915_gem.c:606:
+ i915_gem_object_get_dma_address(obj,
+ offset >> PAGE_SHIFT),
-:1652: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #1652: FILE: drivers/gpu/drm/i915/i915_gpu_error.c:1121:
+ i915_gem_get_pat_index(gt->i915,
+ I915_CACHE_NONE),
-:1658: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #1658: FILE: drivers/gpu/drm/i915/i915_gpu_error.c:1126:
+ i915_gem_get_pat_index(gt->i915,
+ I915_CACHE_NONE),
-:1776: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #1776: FILE: drivers/gpu/drm/i915/selftests/i915_gem.c:62:
+ i915_gem_get_pat_index(i915,
+ I915_CACHE_NONE),
-:1822: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #1822: FILE: drivers/gpu/drm/i915/selftests/i915_gem_gtt.c:363:
+ i915_gem_get_pat_index(vm->i915,
+ I915_CACHE_NONE),
-:1834: ERROR:CODE_INDENT: code indent should use tabs where possible #1834: FILE: drivers/gpu/drm/i915/selftests/i915_gem_gtt.c:1384:
+^I^I^I^I^I I915_CACHE_NONE),$
-:1834: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #1834: FILE: drivers/gpu/drm/i915/selftests/i915_gem_gtt.c:1384:
+ i915_gem_get_pat_index(i915,
+ I915_CACHE_NONE),
-:1868: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #1868: FILE: drivers/gpu/drm/i915/selftests/intel_memory_region.c:1075:
+ i915_gem_get_pat_index(i915,
+ I915_CACHE_NONE),
total: 1 errors, 1 warnings, 10 checks, 1599 lines checked e50cbe9097b5 drm/i915: Allow user to set cache at BO creation
Patchwork
CI[Intel-gfx] ✗ Fi.CI.SPARSE: warning for drm/i915/mtl: Define MOCS and PAT tables for MTL (rev5)
In reply to [email protected]== Series Details ==
== Series Details ==
Series: drm/i915/mtl: Define MOCS and PAT tables for MTL (rev5)
URL : https://patchwork.freedesktop.org/series/115980/
State : warning
== Summary ==
Error: dim sparse failed
Sparse version: v0.6.2
Fast mode used, each commit won't be checked separately.
Patchwork
CI[Intel-gfx] ✗ Fi.CI.BAT: failure for drm/i915/mtl: Define MOCS and PAT tables for MTL (rev5)
In reply to [email protected]== Series Details ==
== Series Details ==
Series: drm/i915/mtl: Define MOCS and PAT tables for MTL (rev5)
URL : https://patchwork.freedesktop.org/series/115980/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_13020 -> Patchwork_115980v5
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_115980v5 absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_115980v5, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115980v5/index.html
Participating hosts (35 -> 36)
------------------------------
Additional (2): fi-tgl-1115g4 bat-adls-5
Missing (1): fi-snb-2520m
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_115980v5:
### IGT changes ###
#### Possible regressions ####
* igt@i915_selftest@live@execlists:
- fi-apl-guc: [PASS][1] -> [ABORT][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13020/fi-apl-guc/igt@i915_selftest@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115980v5/fi-apl-guc/igt@i915_selftest@[email protected]
- fi-glk-j4005: [PASS][3] -> [ABORT][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13020/fi-glk-j4005/igt@i915_selftest@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115980v5/fi-glk-j4005/igt@i915_selftest@[email protected]
* igt@i915_selftest@live@gt_engines:
- fi-glk-j4005: [PASS][5] -> [FAIL][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13020/fi-glk-j4005/igt@i915_selftest@live@gt_engines.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115980v5/fi-glk-j4005/igt@i915_selftest@live@gt_engines.html
* igt@i915_selftest@live@gt_mocs:
- fi-glk-j4005: [PASS][7] -> [DMESG-FAIL][8] +3 similar issues
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13020/fi-glk-j4005/igt@i915_selftest@live@gt_mocs.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115980v5/fi-glk-j4005/igt@i915_selftest@live@gt_mocs.html
* igt@i915_selftest@live@workarounds:
- fi-apl-guc: [PASS][9] -> [DMESG-FAIL][10] +1 similar issue
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13020/fi-apl-guc/igt@i915_selftest@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115980v5/fi-apl-guc/igt@i915_selftest@[email protected]
Known issues
------------
Here are the changes found in Patchwork_115980v5 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@debugfs_test@basic-hwmon:
- bat-adls-5: NOTRUN -> [SKIP][11] ([i915#7456])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115980v5/bat-adls-5/igt@[email protected]
- fi-tgl-1115g4: NOTRUN -> [SKIP][12] ([i915#7456])
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115980v5/fi-tgl-1115g4/igt@[email protected]
* igt@gem_exec_suspend@basic-s3@smem:
- bat-rpls-1: NOTRUN -> [ABORT][13] ([i915#6687] / [i915#7978])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115980v5/bat-rpls-1/igt@gem_exec_suspend@[email protected]
* igt@gem_huc_copy@huc-copy:
- fi-tgl-1115g4: NOTRUN -> [SKIP][14] ([i915#2190])
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115980v5/fi-tgl-1115g4/igt@[email protected]
* igt@gem_lmem_swapping@parallel-random-engines:
- fi-tgl-1115g4: NOTRUN -> [SKIP][15] ([i915#4613]) +3 similar issues
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115980v5/fi-tgl-1115g4/igt@[email protected]
* igt@gem_lmem_swapping@random-engines:
- bat-adls-5: NOTRUN -> [SKIP][16] ([i915#4613]) +3 similar issues
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115980v5/bat-adls-5/igt@[email protected]
* igt@gem_ringfill@basic-all:
- bat-rpls-2: [PASS][17] -> [TIMEOUT][18] ([i915#7937])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13020/bat-rpls-2/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115980v5/bat-rpls-2/igt@[email protected]
* igt@gem_tiled_pread_basic:
- bat-adls-5: NOTRUN -> [SKIP][19] ([i915#3282])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115980v5/bat-adls-5/igt@gem_tiled_pread_basic.html
* igt@i915_pm_backlight@basic-brightness:
- fi-tgl-1115g4: NOTRUN -> [SKIP][20] ([i915#7561])
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115980v5/fi-tgl-1115g4/igt@[email protected]
* igt@i915_pm_rps@basic-api:
- bat-dg2-11: [PASS][21] -> [FAIL][22] ([i915#8308])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13020/bat-dg2-11/igt@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115980v5/bat-dg2-11/igt@[email protected]
* igt@i915_selftest@live@gt_heartbeat:
- fi-kbl-guc: [PASS][23] -> [DMESG-FAIL][24] ([i915#5334] / [i915#7872])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13020/fi-kbl-guc/igt@i915_selftest@live@gt_heartbeat.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115980v5/fi-kbl-guc/igt@i915_selftest@live@gt_heartbeat.html
* igt@i915_selftest@live@hangcheck:
- bat-adls-5: NOTRUN -> [DMESG-WARN][25] ([i915#5591])
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115980v5/bat-adls-5/igt@i915_selftest@[email protected]
* igt@i915_selftest@live@slpc:
- bat-rpls-2: NOTRUN -> [DMESG-FAIL][26] ([i915#6367] / [i915#7913] / [i915#7996])
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115980v5/bat-rpls-2/igt@i915_selftest@[email protected]
- bat-rpls-1: NOTRUN -> [DMESG-FAIL][27] ([i915#6367] / [i915#7996])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115980v5/bat-rpls-1/igt@i915_selftest@[email protected]
* igt@i915_suspend@basic-s3-without-i915:
- fi-tgl-1115g4: NOTRUN -> [INCOMPLETE][28] ([i915#7443])
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115980v5/fi-tgl-1115g4/igt@[email protected]
* igt@kms_chamelium_edid@dp-edid-read:
- fi-tgl-1115g4: NOTRUN -> [SKIP][29] ([i915#7828]) +7 similar issues
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115980v5/fi-tgl-1115g4/igt@[email protected]
* igt@kms_chamelium_hpd@common-hpd-after-suspend:
- bat-rpls-2: NOTRUN -> [SKIP][30] ([i915#7828])
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115980v5/bat-rpls-2/igt@[email protected]
- bat-dg2-11: NOTRUN -> [SKIP][31] ([i915#7828])
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115980v5/bat-dg2-11/igt@[email protected]
* igt@kms_chamelium_hpd@vga-hpd-fast:
- bat-adls-5: NOTRUN -> [SKIP][32] ([i915#7828]) +8 similar issues
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115980v5/bat-adls-5/igt@[email protected]
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic:
- fi-tgl-1115g4: NOTRUN -> [SKIP][33] ([i915#4103]) +1 similar issue
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115980v5/fi-tgl-1115g4/igt@[email protected]
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy:
- bat-adls-5: NOTRUN -> [SKIP][34] ([i915#4103]) +1 similar issue
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115980v5/bat-adls-5/igt@[email protected]
* igt@kms_force_connector_basic@force-load-detect:
- fi-tgl-1115g4: NOTRUN -> [SKIP][35] ([fdo#109285])
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115980v5/fi-tgl-1115g4/igt@[email protected]
- bat-adls-5: NOTRUN -> [SKIP][36] ([fdo#109285])
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115980v5/bat-adls-5/igt@[email protected]
* igt@kms_pipe_crc_basic@suspend-read-crc:
- bat-rpls-2: NOTRUN -> [SKIP][37] ([i915#1845])
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115980v5/bat-rpls-2/igt@[email protected]
* igt@kms_psr@cursor_plane_move:
- fi-tgl-1115g4: NOTRUN -> [SKIP][38] ([fdo#110189]) +3 similar issues
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115980v5/fi-tgl-1115g4/igt@kms_psr@cursor_plane_move.html
* igt@kms_setmode@basic-clone-single-crtc:
- bat-adls-5: NOTRUN -> [SKIP][39] ([i915#3555] / [i915#4579])
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115980v5/bat-adls-5/igt@[email protected]
- fi-tgl-1115g4: NOTRUN -> [SKIP][40] ([i915#3555] / [i915#4579])
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115980v5/fi-tgl-1115g4/igt@[email protected]
* igt@prime_vgem@basic-read:
- bat-adls-5: NOTRUN -> [SKIP][41] ([fdo#109295] / [i915#3291]) +2 similar issues
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115980v5/bat-adls-5/igt@[email protected]
* igt@prime_vgem@basic-userptr:
- fi-tgl-1115g4: NOTRUN -> [SKIP][42] ([fdo#109295] / [i915#3301])
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115980v5/fi-tgl-1115g4/igt@[email protected]
- bat-adls-5: NOTRUN -> [SKIP][43] ([fdo#109295] / [i915#3301])
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115980v5/bat-adls-5/igt@[email protected]
#### Possible fixes ####
* igt@i915_selftest@live@hangcheck:
- bat-dg2-11: [ABORT][44] ([i915#7913] / [i915#7979]) -> [PASS][45]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13020/bat-dg2-11/igt@i915_selftest@[email protected]
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115980v5/bat-dg2-11/igt@i915_selftest@[email protected]
* igt@i915_selftest@live@reset:
- bat-rpls-2: [ABORT][46] ([i915#4983] / [i915#7913]) -> [PASS][47]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13020/bat-rpls-2/igt@i915_selftest@[email protected]
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115980v5/bat-rpls-2/igt@i915_selftest@[email protected]
- bat-rpls-1: [ABORT][48] ([i915#4983]) -> [PASS][49]
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13020/bat-rpls-1/igt@i915_selftest@[email protected]
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115980v5/bat-rpls-1/igt@i915_selftest@[email protected]
[fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[fdo#109295]: https://bugs.freedesktop.org/show_bug.cgi?id=109295
[fdo#110189]: https://bugs.freedesktop.org/show_bug.cgi?id=110189
[i915#1845]: https://gitlab.freedesktop.org/drm/intel/issues/1845
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#3282]: https://gitlab.freedesktop.org/drm/intel/issues/3282
[i915#3291]: https://gitlab.freedesktop.org/drm/intel/issues/3291
[i915#3301]: https://gitlab.freedesktop.org/drm/intel/issues/3301
[i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555
[i915#4103]: https://gitlab.freedesktop.org/drm/intel/issues/4103
[i915#4579]: https://gitlab.freedesktop.org/drm/intel/issues/4579
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#4983]: https://gitlab.freedesktop.org/drm/intel/issues/4983
[i915#5334]: https://gitlab.freedesktop.org/drm/intel/issues/5334
[i915#5591]: https://gitlab.freedesktop.org/drm/intel/issues/5591
[i915#6367]: https://gitlab.freedesktop.org/drm/intel/issues/6367
[i915#6687]: https://gitlab.freedesktop.org/drm/intel/issues/6687
[i915#7443]: https://gitlab.freedesktop.org/drm/intel/issues/7443
[i915#7456]: https://gitlab.freedesktop.org/drm/intel/issues/7456
[i915#7561]: https://gitlab.freedesktop.org/drm/intel/issues/7561
[i915#7828]: https://gitlab.freedesktop.org/drm/intel/issues/7828
[i915#7872]: https://gitlab.freedesktop.org/drm/intel/issues/7872
[i915#7913]: https://gitlab.freedesktop.org/drm/intel/issues/7913
[i915#7937]: https://gitlab.freedesktop.org/drm/intel/issues/7937
[i915#7978]: https://gitlab.freedesktop.org/drm/intel/issues/7978
[i915#7979]: https://gitlab.freedesktop.org/drm/intel/issues/7979
[i915#7996]: https://gitlab.freedesktop.org/drm/intel/issues/7996
[i915#8308]: https://gitlab.freedesktop.org/drm/intel/issues/8308
Build changes
-------------
* Linux: CI_DRM_13020 -> Patchwork_115980v5
CI-20190529: 20190529
CI_DRM_13020: 3e4aefa137a3ae4ee40a89e5b7274cc4d3c02e6f @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7258: ad2eb276eda849b7a7985229009a816c7608186c @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_115980v5: 3e4aefa137a3ae4ee40a89e5b7274cc4d3c02e6f @ git://anongit.freedesktop.org/gfx-ci/linux
### Linux commits
628ffe8adf71 drm/i915: Allow user to set cache at BO creation 1fbf928a4cca drm/i915: use pat_index instead of cache_level 4e2bc8cf3ee3 drm/i915: preparation for using PAT index 79d72064ea70 drm/i915/mtl: end support for set caching ioctl a5998dc8a60d drm/i915/mtl: workaround coherency issue for Media ad5b77468cc8 drm/i915/mtl: Add PTE encode function a2134752acd3 drm/i915/mtl: Define MOCS and PAT tables for MTL 6d51c1434706 drm/i915/mtl: Set has_llc=0
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115980v5/index.html