drm/i915: Create a bind context for GGTT updates
Subsystems (2)
PATCH 1/3 drm/i915: Create a bind context for GGTT updates
From: Nirmoy Das <[email protected]>
Create a separate blitter context if a platform requires GGTT updates using MI_UPDATE_GTT blitter command.
Subsequent patch will introduce methods to update GGTT using this blitter context and MI_UPDATE_GTT blitter command.
v2: Fix a typo in comment. (Oak)
v3: s/blitter_context/bind_context/g (Chris)
--- drivers/gpu/drm/i915/gt/intel_engine.h | 4 ++ drivers/gpu/drm/i915/gt/intel_engine_cs.c | 44 +++++++++++++++++++- drivers/gpu/drm/i915/gt/intel_engine_types.h | 3 ++ drivers/gpu/drm/i915/gt/intel_gtt.c | 4 ++ drivers/gpu/drm/i915/gt/intel_gtt.h | 2 + 5 files changed, 56 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/gt/intel_engine.h +4 -0
@@ -170,6 +170,8 @@ intel_write_status_page(struct intel_engine_cs *engine, int reg, u32 value)#define I915_GEM_HWS_SEQNO 0x40#define I915_GEM_HWS_SEQNO_ADDR (I915_GEM_HWS_SEQNO * sizeof(u32))#define I915_GEM_HWS_MIGRATE (0x42 * sizeof(u32)) +#define I915_GEM_HWS_GGTT_BLIT 0x46 +#define I915_GEM_HWS_GGTT_BLIT_ADDR (I915_GEM_HWS_GGTT_BLIT * sizeof(u32))#define I915_GEM_HWS_PXP 0x60#define I915_GEM_HWS_PXP_ADDR (I915_GEM_HWS_PXP * sizeof(u32))#define I915_GEM_HWS_GSC 0x62
@@ -356,4 +358,6 @@ u64 intel_clamp_preempt_timeout_ms(struct intel_engine_cs *engine, u64 value);u64 intel_clamp_stop_timeout_ms (struct intel_engine_cs *engine,u64 value);u64 intel_clamp_timeslice_duration_ms (struct intel_engine_cs *engine,u64 value); +void intel_engine_bind_context_set_ready (struct intel_gt *gt,bool ready); +bool intel_engine_bind_context_ready (struct intel_gt *gt);#endif /* _INTEL_RINGBUFFER_H_ */
drivers/gpu/drm/i915/gt/intel_engine_cs.c +43 -1
80 lines not on this page · raw message
drivers/gpu/drm/i915/gt/intel_engine_types.h +3 -0
@@ -415,6 +415,9 @@ struct intel_engine_cs {struct llist_head barrier_tasks;struct intel_context *kernel_context;/* pinned */ +struct intel_context *bind_context;/* pinned, only for BCS0 */ +/* mark the blitter engine's availability status */ +atomic_t bind_context_ready;/** * pinned_contexts_list: List of pinned contexts. This list is only
drivers/gpu/drm/i915/gt/intel_gtt.c +4 -0
@@ -21,6 +21,10 @@#include "intel_gt_regs.h" #include "intel_gtt.h" +bool i915_ggtt_require_blitter (struct drm_i915_private *i915) +{ +return IS_METEORLAKE (i915); +}static bool intel_ggtt_update_needs_vtd_wa (struct drm_i915_private *i915) {
drivers/gpu/drm/i915/gt/intel_gtt.h +2 -0
@@ -688,4 +688,6 @@ static inline struct sgt_dma { return (struct sgt_dma){ sg, addr, addr + sg_dma_len(sg) }; } +bool i915_ggtt_require_blitter (struct drm_i915_private *i915); +#endif
Signature · 1 line
2.26.3
PATCH 2/3 drm/i915: Implement GGTT update method with blitter
From: Nirmoy Das <[email protected]>
Implement GGTT update method with blitter command, MI_UPDATE_GTT and install those handlers if a platform requires that.
v2: Make sure we hold the GT wakeref and Blitter engine wakeref before we call mutex_lock/intel_context_enter below. When GT/engine are not awake, the intel_context_enter calls into some runtime pm function which can end up with kmalloc/fs_reclaim. But trigger fs_reclaim holding a mutex lock is not allowed because shrinker can also try to hold the same mutex lock. It is a circular lock. So hold the GT/blitter engine wakeref before calling mutex_lock, to fix the circular lock. (Oak) v3:
- Set sched attr priority to _BARRIER to avoid userspace deadlock
(Chris)
- Don't use drm_dbg (Chris)
- Use unconditional engine_pm_get (Chris)
- Rename blitter_context to bind_context (Chris)
- Handle err_rq correctly in _fixed_pte function (Chris)
- Move ggtt invalidate from _fixed_pte function to caller, more efficient (Piotr)
--- drivers/gpu/drm/i915/gt/intel_ggtt.c | 190 +++++++++++++++++++++++++++ 1 file changed, 190 insertions(+)
drivers/gpu/drm/i915/gt/intel_ggtt.c +190 -0
@@ -15,18 +15,23 @@#include "display/intel_display.h" #include "gem/i915_gem_lmem.h" +#include "intel_context.h" #include "intel_ggtt_gmch.h" +#include "intel_gpu_commands.h" #include "intel_gt.h" #include "intel_gt_regs.h" #include "intel_pci_config.h" +#include "intel_ring.h" #include "i915_drv.h" #include "i915_pci.h" +#include "i915_request.h" #include "i915_scatterlist.h" #include "i915_utils.h" #include "i915_vgpu.h" #include "intel_gtt.h" #include "gen8_ppgtt.h" +#include "intel_engine_pm.h" static void i915_ggtt_color_adjust(const struct drm_mm_node *node, unsigned long color,
@@ -252,6 +257,91 @@ u64 gen8_ggtt_pte_encode(dma_addr_t addr,return pte; } +static bool should_update_ggtt_with_blit (struct i915_ggtt *ggtt) +{ +struct intel_gt *gt = ggtt->vm.gt; + +return intel_engine_bind_context_ready (gt); +} + +static bool gen8_ggtt_blit_fixed_pte (struct i915_ggtt *ggtt,u32 offset, +u32 num_entries,const gen8_pte_t pte) +{ +struct intel_gt *gt = ggtt->vm.gt; +struct i915_sched_attr attr = {.priority =I915_PRIORITY_BARRIER }; +struct i915_request *rq; +struct intel_context *ce; +bool wakeref; +u32 *cs; + +if (!num_entries) +return true; + + ce = gt->engine[BCS0 ]->bind_context; +GEM_BUG_ON (!ce); + +/* +* If the GT is not awake already at this stage then fallback +* to pci based GGTT update otherwise __intel_wakeref_get_first() +* would conflict with fs_reclaim trying to allocate memory while +* doing rpm_resume(). +*/ + wakeref =intel_gt_pm_get_if_awake (gt); +if (!wakeref) { +GT_TRACE (gt,"GT is not awake, fallback to CPU GGTT update\n" ); +return false; + } + +intel_engine_pm_get (gt->engine[BCS0 ]); + +while (num_entries) { +/* MI_UPDATE_GTT can update 512 entries in a single command */ +u32 n_ptes =min_t (u32,512 , num_entries); + +mutex_lock (&ce->timeline->mutex); +intel_context_enter (ce); + rq =__i915_request_create (ce,GFP_NOWAIT |GFP_ATOMIC ); +intel_context_exit (ce); +if (IS_ERR (rq)) { + goto err_unlock; + } + + cs =intel_ring_begin (rq,2 * n_ptes +2 ); +if (IS_ERR (cs)) + goto err_rq; + + *cs++ =MI_UPDATE_GTT | (2 * n_ptes); + *cs++ = offset <<12 ; +memset64 ((u64 *)cs, pte, n_ptes); + cs += n_ptes *2 ; +intel_ring_advance (rq, cs); + +i915_request_get (rq); +__i915_request_commit (rq); +__i915_request_queue (rq, &attr); + +mutex_unlock (&ce->timeline->mutex); +/* This will break if the request is complete or after engine reset */ +i915_request_wait (rq,0 ,MAX_SCHEDULE_TIMEOUT ); +i915_request_put (rq); + + num_entries -= n_ptes; + } + +intel_engine_pm_put (gt->engine[BCS0 ]); +intel_gt_pm_put (gt); +return true; + +err_rq: +i915_request_set_error_once (rq, -ENOSPC ); +i915_request_add (rq); +err_unlock: +mutex_unlock (&ce->timeline->mutex); +intel_engine_pm_put (gt->engine[BCS0 ]); +intel_gt_pm_put (gt); +return false; +} +static void gen8_set_pte (void __iomem *addr,gen8_pte_t pte) {writeq (pte, addr);
@@ -272,6 +362,24 @@ static void gen8_ggtt_insert_page(struct i915_address_space *vm, ggtt->invalidate (ggtt); } +static void gen8_ggtt_insert_page_blit (struct i915_address_space *vm, +dma_addr_t addr,u64 offset, +unsigned int pat_index,u32 flags) +{ +struct i915_ggtt *ggtt =i915_vm_to_ggtt (vm); +gen8_pte_t pte; + + pte = ggtt->vm.pte_encode (addr, pat_index, flags); +if (should_update_ggtt_with_blit (i915_vm_to_ggtt (vm)) && +gen8_ggtt_blit_fixed_pte (ggtt, offset,1 , pte)) { + ggtt->invalidate (ggtt); +return ; + } + +gen8_ggtt_insert_page (vm, addr, offset, pat_index, flags); + ggtt->invalidate (ggtt); +} + static void gen8_ggtt_insert_entries(struct i915_address_space *vm, struct i915_vma_resource *vma_res, unsigned int pat_index,
@@ -311,6 +419,52 @@ static void gen8_ggtt_insert_entries(struct i915_address_space *vm, ggtt->invalidate (ggtt); } +static void __gen8_ggtt_insert_entries_blit (struct i915_address_space *vm, +struct i915_vma_resource *vma_res, +unsigned int pat_index,u32 flags) +{ +gen8_pte_t pte_encode; +struct i915_ggtt *ggtt =i915_vm_to_ggtt (vm); +struct sgt_iter iter; +dma_addr_t addr; +u64 start, end; + + pte_encode = ggtt->vm.pte_encode (0 , pat_index, flags); + start = (vma_res->start - vma_res->guard) /I915_GTT_PAGE_SIZE ; + end = start + vma_res->guard /I915_GTT_PAGE_SIZE ; +if (!gen8_ggtt_blit_fixed_pte (ggtt, start, end - start, vm->scratch[0 ]->encode)) + goto err; + start = end; + + end += (vma_res->node_size + vma_res->guard) /I915_GTT_PAGE_SIZE ; +/* TODO: MI_UPDATE_GTT can update 511 entries in a single command. */ +for_each_sgt_daddr (addr, iter, vma_res->bi.pages) { +if (!gen8_ggtt_blit_fixed_pte (ggtt, start++,1 , pte_encode | addr)) + goto err; + } + +if (!gen8_ggtt_blit_fixed_pte (ggtt, start, end - start, vm->scratch[0 ]->encode)) + goto err; + + ggtt->invalidate (ggtt); +return ; + +err: +gen8_ggtt_insert_entries (vm, vma_res, pat_index, flags); +} + +static void gen8_ggtt_insert_entries_blit (struct i915_address_space *vm, +struct i915_vma_resource *vma_res, +unsigned int pat_index,u32 flags) +{ +if (!should_update_ggtt_with_blit (i915_vm_to_ggtt (vm))) { +gen8_ggtt_insert_entries (vm, vma_res, pat_index, flags); +return ; + } + +__gen8_ggtt_insert_entries_blit (vm, vma_res, pat_index, flags); +} +static void gen8_ggtt_clear_range (struct i915_address_space *vm,u64 start,u64 length) {
@@ -332,6 +486,36 @@ static void gen8_ggtt_clear_range(struct i915_address_space *vm,gen8_set_pte (>t_base[i], scratch_pte); } +static void gen8_ggtt_scratch_range_blit (struct i915_address_space *vm, +u64 start,u64 length) +{ +struct i915_ggtt *ggtt =i915_vm_to_ggtt (vm); +unsigned int first_entry = start /I915_GTT_PAGE_SIZE ; +unsigned int num_entries = length /I915_GTT_PAGE_SIZE ; +const gen8_pte_t scratch_pte = vm->scratch[0 ]->encode; +gen8_pte_t __iomem *gtt_base = + (gen8_pte_t __iomem *)ggtt->gsm + first_entry; +const int max_entries =ggtt_total_entries (ggtt) - first_entry; +int i; + +if (WARN (num_entries > max_entries, +"First entry = %d; Num entries = %d (max=%d)\n" , + first_entry, num_entries, max_entries)) + num_entries = max_entries; + +if (should_update_ggtt_with_blit (ggtt) && +gen8_ggtt_blit_fixed_pte (ggtt, first_entry, + num_entries, scratch_pte)) { + ggtt->invalidate (ggtt); +return ; + } + +for (i =0 ; i < num_entries; i++) +gen8_set_pte (>t_base[i], scratch_pte); + + ggtt->invalidate (ggtt); +} + static void gen6_ggtt_insert_page(struct i915_address_space *vm, dma_addr_t addr, u64 offset,
@@ -997,6 +1181,12 @@ static int gen8_gmch_probe(struct i915_ggtt *ggtt)I915_VMA_GLOBAL_BIND |I915_VMA_LOCAL_BIND ; } +if (i915_ggtt_require_blitter (i915)) { + ggtt->vm.scratch_range = gen8_ggtt_scratch_range_blit; + ggtt->vm.insert_page = gen8_ggtt_insert_page_blit; + ggtt->vm.insert_entries = gen8_ggtt_insert_entries_blit; + } +if (intel_uc_wants_guc (&ggtt->vm.gt->uc)) ggtt->invalidate = guc_ggtt_invalidate;else
Signature · 1 line
2.26.3
PATCH 3/3 drm/i915: Enable GGTT blitting in MTL
In reply to Oak ZengFrom: Nirmoy Das <[email protected]>
MTL can hang because of a HW bug while parallel reading/writing from/to LMEM/GTTMMADR BAR so try to reduce GGTT update related pci transactions with blitter command as recommended for Wa_13010847436 and Wa_14019519902.
To issue blitter commands, the driver must be primed to receive requests. Maintain blitter-based GGTT update disablement until driver probing completes. Moreover, implement a temporary disablement of blitter prior to entering suspend, followed by re-enablement post-resume. This is acceptable as those transition periods are mostly single threaded.
v2: Disable GGTT blitter prior to runtime suspend and re-enable after runtime resume. (Oak)
v3: s/blitter_context/bind_context/g (Chris)
--- drivers/gpu/drm/i915/i915_driver.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/gpu/drm/i915/i915_driver.c +8 -0
@@ -815,6 +815,7 @@ int i915_driver_probe(struct pci_dev *pdev, const struct pci_device_id *ent)i915_welcome_messages (i915); i915->do_release = true; +intel_engine_bind_context_set_ready (to_gt (i915), true);return 0 ;
@@ -855,6 +856,7 @@ void i915_driver_remove(struct drm_i915_private *i915) {intel_wakeref_t wakeref; +intel_engine_bind_context_set_ready (to_gt (i915), false); wakeref =intel_runtime_pm_get (&i915->runtime_pm);i915_driver_unregister (i915);
@@ -1077,6 +1079,8 @@ static int i915_drm_suspend(struct drm_device *dev)struct pci_dev *pdev =to_pci_dev (dev_priv->drm.dev);pci_power_t opregion_target_state; +intel_engine_bind_context_set_ready (to_gt (dev_priv), false); +disable_rpm_wakeref_asserts (&dev_priv->runtime_pm);/* We do a lot of poking in a lot of registers, make sure they work
@@ -1264,6 +1268,7 @@ static int i915_drm_resume(struct drm_device *dev)intel_gvt_resume (dev_priv);enable_rpm_wakeref_asserts (&dev_priv->runtime_pm); +intel_engine_bind_context_set_ready (to_gt (dev_priv), true);return 0 ; }
@@ -1515,6 +1520,7 @@ static int intel_runtime_suspend(struct device *kdev)if (drm_WARN_ON_ONCE (&dev_priv->drm, !HAS_RUNTIME_PM (dev_priv)))return -ENODEV ; +intel_engine_bind_context_set_ready (to_gt (dev_priv), false);drm_dbg (&dev_priv->drm,"Suspending device\n" );disable_rpm_wakeref_asserts (rpm);
@@ -1669,6 +1675,8 @@ static int intel_runtime_resume(struct device *kdev)else drm_dbg (&dev_priv->drm,"Device resumed\n" ); +intel_engine_bind_context_set_ready (to_gt (dev_priv), true); +return ret; }
Signature · 1 line
2.26.3
Patchwork
CI[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for series starting with [1/3] drm/i915: Create a bind context for GGTT updates
In reply to Oak Zeng== Series Details ==
== Series Details ==
Series: series starting with [1/3] drm/i915: Create a bind context for GGTT updates
URL : https://patchwork.freedesktop.org/series/122870/
State : warning
== Summary ==
Error: dim checkpatch failed/home/kbuild2/linux/maintainer-tools/dim: line 50: /home/kbuild2/.dimrc: No such file or directory
Patchwork
CI[Intel-gfx] ✗ Fi.CI.SPARSE: warning for series starting with [1/3] drm/i915: Create a bind context for GGTT updates
In reply to Oak Zeng== Series Details ==
== Series Details ==
Series: series starting with [1/3] drm/i915: Create a bind context for GGTT updates
URL : https://patchwork.freedesktop.org/series/122870/
State : warning
== Summary ==
Error: dim sparse failed/home/kbuild2/linux/maintainer-tools/dim: line 50: /home/kbuild2/.dimrc: No such file or directory
Patchwork
CI[Intel-gfx] ✗ Fi.CI.BAT: failure for series starting with [1/3] drm/i915: Create a bind context for GGTT updates
In reply to Oak Zeng== Series Details ==
== Series Details ==
Series: series starting with [1/3] drm/i915: Create a bind context for GGTT updates
URL : https://patchwork.freedesktop.org/series/122870/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_13562 -> Patchwork_122870v1
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_122870v1 absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_122870v1, 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_122870v1/index.html
Participating hosts (41 -> 39)
------------------------------
Missing (2): bat-dg2-9 fi-snb-2520m
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_122870v1:
### IGT changes ###
#### Possible regressions ####
* igt@i915_selftest@live@gem_contexts:
- bat-mtlp-8: NOTRUN -> [TIMEOUT][1]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_122870v1/bat-mtlp-8/igt@i915_selftest@live@gem_contexts.html
Known issues
------------
Here are the changes found in Patchwork_122870v1 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@i915_pm_rpm@basic-pci-d3-state:
- bat-mtlp-6: [PASS][2] -> [ABORT][3] ([i915#7977] / [i915#8668])
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13562/bat-mtlp-6/igt@[email protected]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_122870v1/bat-mtlp-6/igt@[email protected]
* igt@i915_suspend@basic-s2idle-without-i915:
- bat-mtlp-8: NOTRUN -> [WARN][4] ([i915#8747])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_122870v1/bat-mtlp-8/igt@[email protected]
* igt@i915_suspend@basic-s3-without-i915:
- bat-adlm-1: NOTRUN -> [INCOMPLETE][5] ([i915#7443])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_122870v1/bat-adlm-1/igt@[email protected]
* igt@kms_psr@primary_mmap_gtt:
- bat-rplp-1: NOTRUN -> [SKIP][6] ([i915#1072]) +1 similar issue
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_122870v1/bat-rplp-1/igt@kms_psr@primary_mmap_gtt.html
* igt@kms_setmode@basic-clone-single-crtc:
- bat-rplp-1: NOTRUN -> [ABORT][7] ([i915#8260] / [i915#8668])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_122870v1/bat-rplp-1/igt@[email protected]
#### Possible fixes ####
* igt@i915_selftest@live@requests:
- bat-mtlp-8: [ABORT][8] ([i915#7982] / [i915#8865]) -> [PASS][9]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13562/bat-mtlp-8/igt@i915_selftest@[email protected]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_122870v1/bat-mtlp-8/igt@i915_selftest@[email protected]
* igt@i915_selftest@live@workarounds:
- bat-adlm-1: [INCOMPLETE][10] ([i915#4983] / [i915#7677]) -> [PASS][11]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13562/bat-adlm-1/igt@i915_selftest@[email protected]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_122870v1/bat-adlm-1/igt@i915_selftest@[email protected]
#### Warnings ####
* igt@kms_psr@cursor_plane_move:
- bat-rplp-1: [ABORT][12] ([i915#8469] / [i915#8668]) -> [SKIP][13] ([i915#1072])
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13562/bat-rplp-1/igt@kms_psr@cursor_plane_move.html
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_122870v1/bat-rplp-1/igt@kms_psr@cursor_plane_move.html
[i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072
[i915#4983]: https://gitlab.freedesktop.org/drm/intel/issues/4983
[i915#7443]: https://gitlab.freedesktop.org/drm/intel/issues/7443
[i915#7677]: https://gitlab.freedesktop.org/drm/intel/issues/7677
[i915#7977]: https://gitlab.freedesktop.org/drm/intel/issues/7977
[i915#7982]: https://gitlab.freedesktop.org/drm/intel/issues/7982
[i915#8260]: https://gitlab.freedesktop.org/drm/intel/issues/8260
[i915#8469]: https://gitlab.freedesktop.org/drm/intel/issues/8469
[i915#8668]: https://gitlab.freedesktop.org/drm/intel/issues/8668
[i915#8747]: https://gitlab.freedesktop.org/drm/intel/issues/8747
[i915#8865]: https://gitlab.freedesktop.org/drm/intel/issues/8865
Build changes
-------------
* Linux: CI_DRM_13562 -> Patchwork_122870v1
CI-20190529: 20190529
CI_DRM_13562: 6cd46255547ba72bb6cc6aab91c905b1dec95696 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7451: 5d48d1fb231f449fe2f80cda14ea7a1ecfda59fa @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_122870v1: 6cd46255547ba72bb6cc6aab91c905b1dec95696 @ git://anongit.freedesktop.org/gfx-ci/linux
### Linux commits
f7bb46d5a446 drm/i915: Enable GGTT blitting in MTL 1a9f531598e9 drm/i915: Implement GGTT update method with blitter b9a3d933eeba drm/i915: Create a bind context for GGTT updates
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_122870v1/index.html