On Mon, 02 Oct 2023, Jonathan Cavitt <[email protected]> wrote:
> Consider multi-gt support when cancelling all tlb invalidations on
> suspend, and when submitting tlb invalidations on resume.
>
> Suggested-by: Tvrtko Ursulin <[email protected]>
> Signed-off-by: Fei Yang <[email protected]>
> Signed-off-by: Jonathan Cavitt <[email protected]>
> CC: John Harrison <[email protected]>

I guess I'm wondering why the top level suspend hook needs to iterate
gts instead of some lower level thing. We should aim to reduce
gem/gt/display details from the top level.

BR,
Jani.

> ---
>  drivers/gpu/drm/i915/i915_driver.c | 13 +++++++++----
>  1 file changed, 9 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_driver.c 
> b/drivers/gpu/drm/i915/i915_driver.c
> index f5175103ea900..d7655a7b60eda 100644
> --- a/drivers/gpu/drm/i915/i915_driver.c
> +++ b/drivers/gpu/drm/i915/i915_driver.c
> @@ -1077,6 +1077,8 @@ static int i915_drm_suspend(struct drm_device *dev)
>       struct drm_i915_private *dev_priv = to_i915(dev);
>       struct pci_dev *pdev = to_pci_dev(dev_priv->drm.dev);
>       pci_power_t opregion_target_state;
> +     struct intel_gt *gt;
> +     int i;
>  
>       disable_rpm_wakeref_asserts(&dev_priv->runtime_pm);
>  
> @@ -1094,7 +1096,8 @@ static int i915_drm_suspend(struct drm_device *dev)
>  
>       intel_runtime_pm_disable_interrupts(dev_priv);
>  
> -     wake_up_all_tlb_invalidate(&to_gt(dev_priv)->uc.guc);
> +     for_each_gt(gt, dev_priv, i)
> +             wake_up_all_tlb_invalidate(&gt->uc.guc);
>  
>       intel_hpd_cancel_work(dev_priv);
>  
> @@ -1267,9 +1270,11 @@ static int i915_drm_resume(struct drm_device *dev)
>  
>       intel_gvt_resume(dev_priv);
>  
> -     if (INTEL_GUC_SUPPORTS_TLB_INVALIDATION(&to_gt(dev_priv)->uc.guc)) {
> -             intel_guc_invalidate_tlb_full(&to_gt(dev_priv)->uc.guc);
> -             intel_guc_invalidate_tlb(&to_gt(dev_priv)->uc.guc);
> +     for_each_gt(gt, dev_priv, i) {
> +             if (!INTEL_GUC_SUPPORTS_TLB_INVALIDATION(&gt->uc.guc))
> +                     continue;
> +             intel_guc_invalidate_tlb_full(&gt->uc.guc);
> +             intel_guc_invalidate_tlb(&gt->uc.guc);
>       }
>  
>       enable_rpm_wakeref_asserts(&dev_priv->runtime_pm);

-- 
Jani Nikula, Intel

Reply via email to