drm/i915/mtl: Media GT and Render GT share common GGTT
Subsystems (2)
PATCH v2 1/1 drm/i915/mtl: Media GT and Render GT share common GGTT
On XE_LPM+ platforms the media engines are carved out into a separate GT but have a common GGTMMADR address range which essentially makes the GGTT address space to be shared between media and render GT. As a result any updates in GGTT shall invalidate TLB of GTs sharing it and similarly any operation on GGTT requiring an action on a GT will have to involve all GTs sharing it. setup_private_pat was being done on a per GGTT based as that doesn't touch any GGTT structures moved it to per GT based.
BSPEC: 63834
v2:
1. Add details to commit msg
2. includes fix for failure to add item to ggtt->gt_list, as suggested by Lucas
3. as ggtt_flush() is used only for ggtt drop i915_is_ggtt check within it.
4. setup_private_pat moved out of intel_gt_tiles_init
--- drivers/gpu/drm/i915/gt/intel_ggtt.c | 47 ++++++++++++++------- drivers/gpu/drm/i915/gt/intel_gt.c | 13 +++++- drivers/gpu/drm/i915/gt/intel_gt_types.h | 3 ++ drivers/gpu/drm/i915/gt/intel_gtt.h | 4 ++ drivers/gpu/drm/i915/i915_driver.c | 22 +++++++--- drivers/gpu/drm/i915/i915_gem_evict.c | 51 +++++++++++++++++------ drivers/gpu/drm/i915/i915_vma.c | 5 ++- drivers/gpu/drm/i915/selftests/i915_gem.c | 2 + 8 files changed, 112 insertions(+), 35 deletions(-)
drivers/gpu/drm/i915/gt/intel_ggtt.c +33 -14
@@ -8,6 +8,7 @@#include <linux/types.h> #include <linux/stop_machine.h> +#include <drm/drm_managed.h> #include <drm/i915_drm.h> #include <drm/intel-gtt.h>
@@ -196,10 +197,13 @@ void i915_ggtt_suspend_vm(struct i915_address_space *vm)void i915_ggtt_suspend (struct i915_ggtt *ggtt) { +struct intel_gt *gt; +i915_ggtt_suspend_vm (&ggtt->vm); ggtt->invalidate (ggtt); -intel_gt_check_and_clear_faults (ggtt->vm.gt); +list_for_each_entry (gt, &ggtt->gt_list, ggtt_link) +intel_gt_check_and_clear_faults (gt); }void gen6_ggtt_invalidate (struct i915_ggtt *ggtt)
@@ -225,16 +229,21 @@ static void gen8_ggtt_invalidate(struct i915_ggtt *ggtt)static void guc_ggtt_invalidate (struct i915_ggtt *ggtt) { -struct intel_uncore *uncore = ggtt->vm.gt->uncore;struct drm_i915_private *i915 = ggtt->vm.i915;gen8_ggtt_invalidate (ggtt); -if (GRAPHICS_VER (i915) >=12 ) -intel_uncore_write_fw (uncore,GEN12_GUC_TLB_INV_CR , -GEN12_GUC_TLB_INV_CR_INVALIDATE ); -else -intel_uncore_write_fw (uncore,GEN8_GTCR ,GEN8_GTCR_INVALIDATE ); +if (GRAPHICS_VER (i915) >=12 ) { +struct intel_gt *gt; + +list_for_each_entry (gt, &ggtt->gt_list, ggtt_link) +intel_uncore_write_fw (gt->uncore, +GEN12_GUC_TLB_INV_CR , +GEN12_GUC_TLB_INV_CR_INVALIDATE ); + }else { +intel_uncore_write_fw (ggtt->vm.gt->uncore, +GEN8_GTCR ,GEN8_GTCR_INVALIDATE ); + } } u64 gen8_ggtt_pte_encode(dma_addr_t addr,
@@ -986,8 +995,6 @@ static int gen8_gmch_probe(struct i915_ggtt *ggtt) ggtt->vm.pte_encode = gen8_ggtt_pte_encode; -setup_private_pat (ggtt->vm.gt); -return ggtt_probe_common (ggtt, size); }
@@ -1186,7 +1193,7 @@ static int ggtt_probe_hw(struct i915_ggtt *ggtt, struct intel_gt *gt) (u64)ggtt->mappable_end >> 20);drm_dbg (&i915->drm,"DSM size = %lluM\n" , (u64 )resource_size (&intel_graphics_stolen_res) >>20 ); - +INIT_LIST_HEAD (&ggtt->gt_list);return 0 ; }
@@ -1208,6 +1215,19 @@ int i915_ggtt_probe_hw(struct drm_i915_private *i915)return 0 ; } +struct i915_ggtt *i915_ggtt_create (struct drm_i915_private *i915) +{ +struct i915_ggtt *ggtt; + + ggtt =drmm_kzalloc (&i915->drm,sizeof (*ggtt),GFP_KERNEL ); +if (!ggtt) +return ERR_PTR (-ENOMEM ); + +INIT_LIST_HEAD (&ggtt->gt_list); + +return ggtt; +} +int i915_ggtt_enable_hw (struct drm_i915_private *i915) {if (GRAPHICS_VER (i915) <6 )
@@ -1296,9 +1316,11 @@ bool i915_ggtt_resume_vm(struct i915_address_space *vm)void i915_ggtt_resume (struct i915_ggtt *ggtt) { +struct intel_gt *gt;bool flush; -intel_gt_check_and_clear_faults (ggtt->vm.gt); +list_for_each_entry (gt, &ggtt->gt_list, ggtt_link) +intel_gt_check_and_clear_faults (gt); flush =i915_ggtt_resume_vm (&ggtt->vm);
@@ -1307,9 +1329,6 @@ void i915_ggtt_resume(struct i915_ggtt *ggtt)if (flush)wbinvd_on_all_cpus (); -if (GRAPHICS_VER (ggtt->vm.i915) >=8 ) -setup_private_pat (ggtt->vm.gt); -intel_ggtt_restore_fences (ggtt); }
drivers/gpu/drm/i915/gt/intel_gt.c +11 -2
@@ -108,9 +108,18 @@ static int intel_gt_probe_lmem(struct intel_gt *gt)int intel_gt_assign_ggtt (struct intel_gt *gt) { - gt->ggtt =drmm_kzalloc (>->i915->drm,sizeof (*gt->ggtt),GFP_KERNEL ); +/* Media GT shares primary GT's GGTT */ +if (gt->type ==GT_MEDIA ) { + gt->ggtt =to_gt (gt->i915)->ggtt; + }else { + gt->ggtt =i915_ggtt_create (gt->i915); +if (IS_ERR (gt->ggtt)) +return PTR_ERR (gt->ggtt); + } -return gt->ggtt ?0 : -ENOMEM ; +list_add_tail (>->ggtt_link, >->ggtt->gt_list); + +return 0 ; }int intel_gt_init_mmio (struct intel_gt *gt)
drivers/gpu/drm/i915/gt/intel_gt_types.h +3 -0
@@ -275,6 +275,9 @@ struct intel_gt {struct kobject *sysfs_defaults;struct i915_perf_gt perf; + +/** link: &ggtt.gt_list */ +struct list_head ggtt_link; };struct intel_gt_definition {
drivers/gpu/drm/i915/gt/intel_gtt.h +4 -0
@@ -390,6 +390,9 @@ struct i915_ggtt {struct mutex error_mutex;struct drm_mm_node error_capture;struct drm_mm_node uc_fw; + +/** List of GTs mapping this GGTT */ +struct list_head gt_list; };struct i915_ppgtt {
@@ -584,6 +587,7 @@ void i915_ggtt_disable_guc(struct i915_ggtt *ggtt);int i915_init_ggtt (struct drm_i915_private *i915);void i915_ggtt_driver_release (struct drm_i915_private *i915);void i915_ggtt_driver_late_release (struct drm_i915_private *i915); +struct i915_ggtt *i915_ggtt_create (struct drm_i915_private *i915);static inline bool i915_ggtt_has_aperture (const struct i915_ggtt *ggtt) {
drivers/gpu/drm/i915/i915_driver.c +17 -5
@@ -577,7 +577,8 @@ static int i915_driver_hw_probe(struct drm_i915_private *dev_priv) {struct pci_dev *pdev =to_pci_dev (dev_priv->drm.dev);struct pci_dev *root_pdev; -int ret; +struct intel_gt *gt; +int ret, i;if (i915_inject_probe_failure (dev_priv))return -ENODEV ;
@@ -614,9 +615,14 @@ static int i915_driver_hw_probe(struct drm_i915_private *dev_priv)i915_perf_init (dev_priv); - ret =intel_gt_assign_ggtt (to_gt (dev_priv)); -if (ret) - goto err_perf; +for_each_gt (gt, dev_priv, i) { + ret =intel_gt_assign_ggtt (gt); +if (ret) + goto err_perf; + +if (GRAPHICS_VER (dev_priv) >=8 ) +setup_private_pat (gt); + } ret =i915_ggtt_probe_hw (dev_priv);if (ret)
@@ -1318,7 +1324,8 @@ int i915_driver_suspend_switcheroo(struct drm_i915_private *i915,static int i915_drm_resume (struct drm_device *dev) {struct drm_i915_private *dev_priv =to_i915 (dev); -int ret; +struct intel_gt *gt; +int ret, i;disable_rpm_wakeref_asserts (&dev_priv->runtime_pm);
@@ -1333,6 +1340,11 @@ static int i915_drm_resume(struct drm_device *dev)drm_err (&dev_priv->drm,"failed to re-enable GGTT\n" );i915_ggtt_resume (to_gt (dev_priv)->ggtt); + +for_each_gt (gt, dev_priv, i) +if (GRAPHICS_VER (gt->i915) >=8 ) +setup_private_pat (gt); +/* Must be called after GGTT is resumed. */ intel_dpt_resume (dev_priv);
drivers/gpu/drm/i915/i915_gem_evict.c +38 -13
88 lines not on this page · raw message
drivers/gpu/drm/i915/i915_vma.c +4 -1
@@ -1542,6 +1542,8 @@ static int __i915_ggtt_pin(struct i915_vma *vma, struct i915_gem_ww_ctx *ww, u32 align, unsigned int flags) {struct i915_address_space *vm = vma->vm; +struct intel_gt *gt; +struct i915_ggtt *ggtt =i915_vm_to_ggtt (vm);int err; do {
@@ -1557,7 +1559,8 @@ static int __i915_ggtt_pin(struct i915_vma *vma, struct i915_gem_ww_ctx *ww, }/* Unlike i915_vma_pin, we don't take no for an answer! */ -flush_idle_contexts (vm->gt); +list_for_each_entry_rcu (gt, &ggtt->gt_list, ggtt_link) +flush_idle_contexts (gt);if (mutex_lock_interruptible (&vm->mutex) ==0 ) {/* * We pass NULL ww here, as we don't want to unbind
drivers/gpu/drm/i915/selftests/i915_gem.c +2 -0
@@ -127,6 +127,8 @@ static void igt_pm_resume(struct drm_i915_private *i915)*/ with_intel_runtime_pm(&i915->runtime_pm, wakeref) {i915_ggtt_resume (to_gt (i915)->ggtt); +if (GRAPHICS_VER (i915) >=8 ) +setup_private_pat (to_gt (i915));i915_gem_resume (i915); } }
Signature · 1 line
2.25.1
Jani Nikula
maintainerQuoted 228 lines · Aravind Iddamsetty
On XE_LPM+ platforms the media engines are carved out into a separate GT but have a common GGTMMADR address range which essentially makes the GGTT address space to be shared between media and render GT. As a result any updates in GGTT shall invalidate TLB of GTs sharing it and similarly any operation on GGTT requiring an action on a GT will have to involve all GTs sharing it.
setup_private_patwas being done on a per GGTT based as that doesn't touch any GGTT structures moved it to per GT based.BSPEC: 63834
v2:
1. Add details to commit msg
2. includes fix for failure to add item toggtt->gt_list, as suggested by Lucas
3. asggtt_flush()is used only for ggtt dropi915_is_ggttcheck within it.
4.setup_private_patmoved out ofintel_gt_tiles_initCc Matt Roper <[email protected]>Signed-off-by Aravind Iddamsetty <[email protected]>--- drivers/gpu/drm/i915/gt/intel_ggtt.c | 47 ++++++++++++++------- drivers/gpu/drm/i915/gt/intel_gt.c | 13 +++++- drivers/gpu/drm/i915/gt/intel_gt_types.h | 3 ++ drivers/gpu/drm/i915/gt/intel_gtt.h | 4 ++ drivers/gpu/drm/i915/i915_driver.c | 22 +++++++--- drivers/gpu/drm/i915/i915_gem_evict.c | 51 +++++++++++++++++------ drivers/gpu/drm/i915/i915_vma.c | 5 ++- drivers/gpu/drm/i915/selftests/i915_gem.c | 2 + 8 files changed, 112 insertions(+), 35 deletions(-)drivers/gpu/drm/i915/gt/intel_ggtt.c +33
-14@@ -8,6 +8,7 @@#include <linux/types.h> #include <linux/stop_machine.h> +#include <drm/drm_managed.h> #include <drm/i915_drm.h> #include <drm/intel-gtt.h> @@ -196,10 +197,13 @@ void i915_ggtt_suspend_vm(struct i915_address_space *vm)void i915_ggtt_suspend (struct i915_ggtt *ggtt) { +struct intel_gt *gt; +i915_ggtt_suspend_vm (&ggtt->vm); ggtt->invalidate (ggtt); -intel_gt_check_and_clear_faults (ggtt->vm.gt); +list_for_each_entry (gt, &ggtt->gt_list, ggtt_link) +intel_gt_check_and_clear_faults (gt); }void gen6_ggtt_invalidate (struct i915_ggtt *ggtt)@@ -225,16 +229,21 @@ static void gen8_ggtt_invalidate(struct i915_ggtt *ggtt)static void guc_ggtt_invalidate (struct i915_ggtt *ggtt) { -struct intel_uncore *uncore = ggtt->vm.gt->uncore;struct drm_i915_private *i915 = ggtt->vm.i915;gen8_ggtt_invalidate (ggtt); -if (GRAPHICS_VER (i915) >=12 ) -intel_uncore_write_fw (uncore,GEN12_GUC_TLB_INV_CR , -GEN12_GUC_TLB_INV_CR_INVALIDATE ); -else -intel_uncore_write_fw (uncore,GEN8_GTCR ,GEN8_GTCR_INVALIDATE ); +if (GRAPHICS_VER (i915) >=12 ) { +struct intel_gt *gt; + +list_for_each_entry (gt, &ggtt->gt_list, ggtt_link) +intel_uncore_write_fw (gt->uncore, +GEN12_GUC_TLB_INV_CR , +GEN12_GUC_TLB_INV_CR_INVALIDATE ); + }else { +intel_uncore_write_fw (ggtt->vm.gt->uncore, +GEN8_GTCR ,GEN8_GTCR_INVALIDATE ); + } } u64 gen8_ggtt_pte_encode(dma_addr_t addr,@@ -986,8 +995,6 @@ static int gen8_gmch_probe(struct i915_ggtt *ggtt) ggtt->vm.pte_encode = gen8_ggtt_pte_encode; -setup_private_pat (ggtt->vm.gt); -return ggtt_probe_common (ggtt, size); }@@ -1186,7 +1193,7 @@ static int ggtt_probe_hw(struct i915_ggtt *ggtt, struct intel_gt *gt) (u64)ggtt->mappable_end >> 20);drm_dbg (&i915->drm,"DSM size = %lluM\n" , (u64 )resource_size (&intel_graphics_stolen_res) >>20 ); - +INIT_LIST_HEAD (&ggtt->gt_list);return 0 ; }@@ -1208,6 +1215,19 @@ int i915_ggtt_probe_hw(struct drm_i915_private *i915)return 0 ; } +struct i915_ggtt *i915_ggtt_create (struct drm_i915_private *i915) +{ +struct i915_ggtt *ggtt; + + ggtt =drmm_kzalloc (&i915->drm,sizeof (*ggtt),GFP_KERNEL ); +if (!ggtt) +return ERR_PTR (-ENOMEM ); + +INIT_LIST_HEAD (&ggtt->gt_list); + +return ggtt; +} +int i915_ggtt_enable_hw (struct drm_i915_private *i915) {if (GRAPHICS_VER (i915) <6 )@@ -1296,9 +1316,11 @@ bool i915_ggtt_resume_vm(struct i915_address_space *vm)void i915_ggtt_resume (struct i915_ggtt *ggtt) { +struct intel_gt *gt;bool flush; -intel_gt_check_and_clear_faults (ggtt->vm.gt); +list_for_each_entry (gt, &ggtt->gt_list, ggtt_link) +intel_gt_check_and_clear_faults (gt); flush =i915_ggtt_resume_vm (&ggtt->vm);@@ -1307,9 +1329,6 @@ void i915_ggtt_resume(struct i915_ggtt *ggtt)if (flush)wbinvd_on_all_cpus (); -if (GRAPHICS_VER (ggtt->vm.i915) >=8 ) -setup_private_pat (ggtt->vm.gt); -intel_ggtt_restore_fences (ggtt); }drivers/gpu/drm/i915/gt/intel_gt.c +11
-2@@ -108,9 +108,18 @@ static int intel_gt_probe_lmem(struct intel_gt *gt)int intel_gt_assign_ggtt (struct intel_gt *gt) { - gt->ggtt =drmm_kzalloc (>->i915->drm,sizeof (*gt->ggtt),GFP_KERNEL ); +/* Media GT shares primary GT's GGTT */ +if (gt->type ==GT_MEDIA ) { + gt->ggtt =to_gt (gt->i915)->ggtt; + }else { + gt->ggtt =i915_ggtt_create (gt->i915); +if (IS_ERR (gt->ggtt)) +return PTR_ERR (gt->ggtt); + } -return gt->ggtt ?0 : -ENOMEM ; +list_add_tail (>->ggtt_link, >->ggtt->gt_list); + +return 0 ; }int intel_gt_init_mmio (struct intel_gt *gt)drivers/gpu/drm/i915/gt/intel_gt_types.h +3
-0@@ -275,6 +275,9 @@ struct intel_gt {struct kobject *sysfs_defaults;struct i915_perf_gt perf; + +/** link: &ggtt.gt_list */ +struct list_head ggtt_link; };struct intel_gt_definition {drivers/gpu/drm/i915/gt/intel_gtt.h +4
-0@@ -390,6 +390,9 @@ struct i915_ggtt {struct mutex error_mutex;struct drm_mm_node error_capture;struct drm_mm_node uc_fw; + +/** List of GTs mapping this GGTT */ +struct list_head gt_list; };struct i915_ppgtt {@@ -584,6 +587,7 @@ void i915_ggtt_disable_guc(struct i915_ggtt *ggtt);int i915_init_ggtt (struct drm_i915_private *i915);void i915_ggtt_driver_release (struct drm_i915_private *i915);void i915_ggtt_driver_late_release (struct drm_i915_private *i915); +struct i915_ggtt *i915_ggtt_create (struct drm_i915_private *i915);static inline bool i915_ggtt_has_aperture (const struct i915_ggtt *ggtt) {drivers/gpu/drm/i915/i915_driver.c +2
-2@@ -577,7 +577,8 @@ static int i915_driver_hw_probe(struct drm_i915_private *dev_priv) {struct pci_dev *pdev =to_pci_dev (dev_priv->drm.dev);struct pci_dev *root_pdev; -int ret; +struct intel_gt *gt; +int ret, i;if (i915_inject_probe_failure (dev_priv))return -ENODEV ;@@ -614,9 +615,14 @@ static int i915_driver_hw_probe(struct drm_i915_private *dev_priv)i915_perf_init (dev_priv); - ret =intel_gt_assign_ggtt (to_gt (dev_priv));
drivers/gpu/drm/i915/i915_driver.c static int i915_driver_hw_probe(struct drm_i915_private *dev_priv) · line 625
Quoted 10 lines
drivers/gpu/drm/i915/i915_driver.c +8
-2-if (ret) - goto err_perf; +for_each_gt (gt, dev_priv, i) { + ret =intel_gt_assign_ggtt (gt); +if (ret) + goto err_perf; + +if (GRAPHICS_VER (dev_priv) >=8 ) +setup_private_pat (gt); + }
Drive-by note, I think the for_each_gt() loops don't belong in i915_driver.c. This is higher level code than that.
BR,
Jani.
Quoted 159 lines
drivers/gpu/drm/i915/i915_driver.c +7
-1ret =i915_ggtt_probe_hw (dev_priv);if (ret)@@ -1318,7 +1324,8 @@ int i915_driver_suspend_switcheroo(struct drm_i915_private *i915,static int i915_drm_resume (struct drm_device *dev) {struct drm_i915_private *dev_priv =to_i915 (dev); -int ret; +struct intel_gt *gt; +int ret, i;disable_rpm_wakeref_asserts (&dev_priv->runtime_pm);@@ -1333,6 +1340,11 @@ static int i915_drm_resume(struct drm_device *dev)drm_err (&dev_priv->drm,"failed to re-enable GGTT\n" );i915_ggtt_resume (to_gt (dev_priv)->ggtt); + +for_each_gt (gt, dev_priv, i) +if (GRAPHICS_VER (gt->i915) >=8 ) +setup_private_pat (gt); +/* Must be called after GGTT is resumed. */ intel_dpt_resume (dev_priv);drivers/gpu/drm/i915/i915_gem_evict.c +38
-13@@ -43,16 +43,25 @@ static bool dying_vma(struct i915_vma *vma)return !kref_read (&vma->obj->base.refcount); } -static int ggtt_flush (struct intel_gt *gt) +static int ggtt_flush (struct i915_address_space *vm) { -/* -* Not everything in the GGTT is tracked via vma (otherwise we -* could evict as required with minimal stalling) so we are forced -* to idle the GPU and explicitly retire outstanding requests in -* the hopes that we can then remove contexts and the like only -* bound by their active reference. -*/ -return intel_gt_wait_for_idle (gt,MAX_SCHEDULE_TIMEOUT ); +struct i915_ggtt *ggtt =i915_vm_to_ggtt (vm); +struct intel_gt *gt; +int ret =0 ; + +list_for_each_entry (gt, &ggtt->gt_list, ggtt_link) { +/* +* Not everything in the GGTT is tracked via vma (otherwise we +* could evict as required with minimal stalling) so we are forced +* to idle the GPU and explicitly retire outstanding requests in +* the hopes that we can then remove contexts and the like only +* bound by their active reference. +*/ + ret =intel_gt_wait_for_idle (gt,MAX_SCHEDULE_TIMEOUT ); +if (ret) +return ret; + } +return ret; }static bool grab_vma (struct i915_vma *vma,struct i915_gem_ww_ctx *ww)@@ -149,6 +158,7 @@ i915_gem_evict_something(struct i915_address_space *vm,struct drm_mm_node *node;enum drm_mm_insert_mode mode;struct i915_vma *active; +struct intel_gt *gt;int ret;lockdep_assert_held (&vm->mutex);@@ -174,7 +184,14 @@ i915_gem_evict_something(struct i915_address_space *vm, min_size, alignment, color, start, end, mode); -intel_gt_retire_requests (vm->gt); +if (i915_is_ggtt (vm)) { +struct i915_ggtt *ggtt =i915_vm_to_ggtt (vm); + +list_for_each_entry_rcu (gt, &ggtt->gt_list, ggtt_link) +intel_gt_retire_requests (gt); + }else { +intel_gt_retire_requests (vm->gt); + } search_again: active =NULL ;@@ -246,7 +263,7 @@ i915_gem_evict_something(struct i915_address_space *vm,if (I915_SELFTEST_ONLY (igt_evict_ctl.fail_if_busy))return -EBUSY ; - ret =ggtt_flush (vm->gt); + ret =ggtt_flush (vm);if (ret)return ret;@@ -332,7 +349,15 @@ int i915_gem_evict_for_node(struct i915_address_space *vm,* a stray pin (preventing eviction) that can only be resolved by * retiring. */ -intel_gt_retire_requests (vm->gt); +if (i915_is_ggtt (vm)) { +struct i915_ggtt *ggtt =i915_vm_to_ggtt (vm); +struct intel_gt *gt; + +list_for_each_entry (gt, &ggtt->gt_list, ggtt_link) +intel_gt_retire_requests (gt); + }else { +intel_gt_retire_requests (vm->gt); + }if (i915_vm_has_cache_coloring (vm)) {/* Expand search to cover neighbouring guard pages (or lack!) */ @@ -438,7 +463,7 @@ int i915_gem_evict_vm(struct i915_address_space *vm, struct i915_gem_ww_ctx *ww)* switch otherwise is ineffective. */ if (i915_is_ggtt (vm)) { - ret =ggtt_flush (vm->gt); + ret =ggtt_flush (vm);if (ret)return ret; }drivers/gpu/drm/i915/i915_vma.c +4
-1@@ -1542,6 +1542,8 @@ static int __i915_ggtt_pin(struct i915_vma *vma, struct i915_gem_ww_ctx *ww, u32 align, unsigned int flags) {struct i915_address_space *vm = vma->vm; +struct intel_gt *gt; +struct i915_ggtt *ggtt =i915_vm_to_ggtt (vm);int err; do {@@ -1557,7 +1559,8 @@ static int __i915_ggtt_pin(struct i915_vma *vma, struct i915_gem_ww_ctx *ww, }/* Unlike i915_vma_pin, we don't take no for an answer! */ -flush_idle_contexts (vm->gt); +list_for_each_entry_rcu (gt, &ggtt->gt_list, ggtt_link) +flush_idle_contexts (gt);if (mutex_lock_interruptible (&vm->mutex) ==0 ) {/* * We pass NULL ww here, as we don't want to unbind drivers/gpu/drm/i915/selftests/i915_gem.c +2
-0@@ -127,6 +127,8 @@ static void igt_pm_resume(struct drm_i915_private *i915)*/ with_intel_runtime_pm(&i915->runtime_pm, wakeref) {i915_ggtt_resume (to_gt (i915)->ggtt); +if (GRAPHICS_VER (i915) >=8 ) +setup_private_pat (to_gt (i915));i915_gem_resume (i915); } }
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
Patchwork
CI[Intel-gfx] ✗ Fi.CI.BAT: failure for drm/i915/mtl: Media GT and Render GT share common GGTT (rev3)
In reply to Aravind Iddamsetty== Series Details ==
== Series Details ==
Series: drm/i915/mtl: Media GT and Render GT share common GGTT (rev3)
URL : https://patchwork.freedesktop.org/series/110321/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_12363 -> Patchwork_110321v3
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_110321v3 absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_110321v3, 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_110321v3/index.html
Participating hosts (40 -> 41)
------------------------------
Additional (3): bat-dg1-7 fi-rkl-11600 bat-adls-5
Missing (2): fi-ctg-p8600 fi-bdw-samus
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_110321v3:
### IGT changes ###
#### Possible regressions ####
* igt@i915_module_load@load:
- bat-dg1-6: [PASS][1] -> [FAIL][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12363/bat-dg1-6/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110321v3/bat-dg1-6/igt@[email protected]
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses. They do not affect the overall result.
* igt@gem_exec_parallel@engines@fds:
- {bat-dg2-9}: [PASS][3] -> [FAIL][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12363/bat-dg2-9/igt@gem_exec_parallel@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110321v3/bat-dg2-9/igt@gem_exec_parallel@[email protected]
* igt@i915_module_load@load:
- {bat-dg1-7}: NOTRUN -> [FAIL][5]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110321v3/bat-dg1-7/igt@[email protected]
* igt@i915_selftest@live@gt_timelines:
- {bat-dg2-9}: [PASS][6] -> [INCOMPLETE][7]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12363/bat-dg2-9/igt@i915_selftest@live@gt_timelines.html
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110321v3/bat-dg2-9/igt@i915_selftest@live@gt_timelines.html
- {bat-dg2-8}: [PASS][8] -> [INCOMPLETE][9]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12363/bat-dg2-8/igt@i915_selftest@live@gt_timelines.html
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110321v3/bat-dg2-8/igt@i915_selftest@live@gt_timelines.html
- {bat-dg2-11}: [PASS][10] -> [INCOMPLETE][11]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12363/bat-dg2-11/igt@i915_selftest@live@gt_timelines.html
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110321v3/bat-dg2-11/igt@i915_selftest@live@gt_timelines.html
* igt@i915_selftest@live@workarounds:
- {bat-dg2-11}: [PASS][12] -> [DMESG-FAIL][13]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12363/bat-dg2-11/igt@i915_selftest@[email protected]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110321v3/bat-dg2-11/igt@i915_selftest@[email protected]
- {bat-dg2-9}: [PASS][14] -> [DMESG-FAIL][15]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12363/bat-dg2-9/igt@i915_selftest@[email protected]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110321v3/bat-dg2-9/igt@i915_selftest@[email protected]
- {bat-dg2-8}: [PASS][16] -> [DMESG-FAIL][17]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12363/bat-dg2-8/igt@i915_selftest@[email protected]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110321v3/bat-dg2-8/igt@i915_selftest@[email protected]
Known issues
------------
Here are the changes found in Patchwork_110321v3 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_huc_copy@huc-copy:
- fi-rkl-11600: NOTRUN -> [SKIP][18] ([i915#2190])
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110321v3/fi-rkl-11600/igt@[email protected]
* igt@gem_lmem_swapping@parallel-random-engines:
- fi-rkl-11600: NOTRUN -> [SKIP][19] ([i915#4613]) +3 similar issues
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110321v3/fi-rkl-11600/igt@[email protected]
* igt@gem_tiled_pread_basic:
- fi-rkl-11600: NOTRUN -> [SKIP][20] ([i915#3282])
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110321v3/fi-rkl-11600/igt@gem_tiled_pread_basic.html
* igt@i915_pm_backlight@basic-brightness:
- fi-rkl-11600: NOTRUN -> [SKIP][21] ([i915#3012])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110321v3/fi-rkl-11600/igt@[email protected]
* igt@i915_suspend@basic-s3-without-i915:
- fi-rkl-11600: NOTRUN -> [INCOMPLETE][22] ([i915#4817])
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110321v3/fi-rkl-11600/igt@[email protected]
* igt@kms_chamelium@common-hpd-after-suspend:
- fi-hsw-4770: NOTRUN -> [SKIP][23] ([fdo#109271] / [fdo#111827])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110321v3/fi-hsw-4770/igt@[email protected]
- fi-apl-guc: NOTRUN -> [SKIP][24] ([fdo#109271] / [fdo#111827])
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110321v3/fi-apl-guc/igt@[email protected]
* igt@kms_chamelium@hdmi-hpd-fast:
- fi-rkl-11600: NOTRUN -> [SKIP][25] ([fdo#111827]) +7 similar issues
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110321v3/fi-rkl-11600/igt@[email protected]
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor:
- fi-rkl-11600: NOTRUN -> [SKIP][26] ([i915#4103])
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110321v3/fi-rkl-11600/igt@[email protected]
* igt@kms_force_connector_basic@force-load-detect:
- fi-rkl-11600: NOTRUN -> [SKIP][27] ([fdo#109285] / [i915#4098])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110321v3/fi-rkl-11600/igt@[email protected]
* igt@kms_psr@sprite_plane_onoff:
- fi-rkl-11600: NOTRUN -> [SKIP][28] ([i915#1072]) +3 similar issues
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110321v3/fi-rkl-11600/igt@kms_psr@sprite_plane_onoff.html
* igt@kms_setmode@basic-clone-single-crtc:
- fi-rkl-11600: NOTRUN -> [SKIP][29] ([i915#3555] / [i915#4098])
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110321v3/fi-rkl-11600/igt@[email protected]
* igt@prime_vgem@basic-read:
- fi-rkl-11600: NOTRUN -> [SKIP][30] ([fdo#109295] / [i915#3291] / [i915#3708]) +2 similar issues
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110321v3/fi-rkl-11600/igt@[email protected]
* igt@prime_vgem@basic-userptr:
- fi-rkl-11600: NOTRUN -> [SKIP][31] ([fdo#109295] / [i915#3301] / [i915#3708])
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110321v3/fi-rkl-11600/igt@[email protected]
* igt@runner@aborted:
- bat-adlp-4: NOTRUN -> [FAIL][32] ([i915#4312])
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110321v3/bat-adlp-4/igt@[email protected]
- fi-rkl-guc: NOTRUN -> [FAIL][33] ([i915#4312])
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110321v3/fi-rkl-guc/igt@[email protected]
- bat-dg1-6: NOTRUN -> [FAIL][34] ([i915#4312])
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110321v3/bat-dg1-6/igt@[email protected]
#### Possible fixes ####
* igt@i915_selftest@live@gt_timelines:
- fi-apl-guc: [INCOMPLETE][35] -> [PASS][36]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12363/fi-apl-guc/igt@i915_selftest@live@gt_timelines.html
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110321v3/fi-apl-guc/igt@i915_selftest@live@gt_timelines.html
* igt@i915_selftest@live@hangcheck:
- fi-hsw-4770: [INCOMPLETE][37] ([i915#4785]) -> [PASS][38]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12363/fi-hsw-4770/igt@i915_selftest@[email protected]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110321v3/fi-hsw-4770/igt@i915_selftest@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[fdo#109295]: https://bugs.freedesktop.org/show_bug.cgi?id=109295
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#3012]: https://gitlab.freedesktop.org/drm/intel/issues/3012
[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#3708]: https://gitlab.freedesktop.org/drm/intel/issues/3708
[i915#4098]: https://gitlab.freedesktop.org/drm/intel/issues/4098
[i915#4103]: https://gitlab.freedesktop.org/drm/intel/issues/4103
[i915#4312]: https://gitlab.freedesktop.org/drm/intel/issues/4312
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#4785]: https://gitlab.freedesktop.org/drm/intel/issues/4785
[i915#4817]: https://gitlab.freedesktop.org/drm/intel/issues/4817
[i915#5354]: https://gitlab.freedesktop.org/drm/intel/issues/5354
[i915#7029]: https://gitlab.freedesktop.org/drm/intel/issues/7029
[i915#7456]: https://gitlab.freedesktop.org/drm/intel/issues/7456
Build changes
-------------
* Linux: CI_DRM_12363 -> Patchwork_110321v3
CI-20190529: 20190529
CI_DRM_12363: 28f3fbf3ad9cc809521c7a308e29dfc27c445730 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7049: 790ed4ea5e08969979cfe5b25e428e4a0ba148c2 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_110321v3: 28f3fbf3ad9cc809521c7a308e29dfc27c445730 @ git://anongit.freedesktop.org/gfx-ci/linux
### Linux commits
e8b5af8e3cac drm/i915/mtl: Media GT and Render GT share common GGTT
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110321v3/index.html