6 files changed, 23 insertions, 3 deletions

diff --git a/drivers/gpu/drm/i915/gvt/cmd_parser.c b/drivers/gpu/drm/i915/gvt/cmd_parser.c
index 701a3c6f1669..85d4c57870fb 100644
--- a/drivers/gpu/drm/i915/gvt/cmd_parser.c
+++ b/drivers/gpu/drm/i915/gvt/cmd_parser.c
@@ -1628,7 +1628,7 @@ static int perform_bb_shadow(struct parser_exec_state *s)
         struct intel_shadow_bb_entry *entry_obj;
         struct intel_vgpu *vgpu = s->vgpu;
         unsigned long gma = 0;
-        uint32_t bb_size;
+        int bb_size;
         void *dst = NULL;
         int ret = 0;
 
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 3db5851756f0..7d9b07df32fa 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -1714,6 +1714,7 @@ static int i915_drm_resume(struct drm_device *dev)
         intel_guc_resume(dev_priv);
 
         intel_modeset_init_hw(dev);
+        intel_init_clock_gating(dev_priv);
 
         spin_lock_irq(&dev_priv->irq_lock);
         if (dev_priv->display.hpd_irq_setup)
@@ -2618,6 +2619,8 @@ static int intel_runtime_resume(struct device *kdev)
                 ret = vlv_resume_prepare(dev_priv, true);
         }
 
+        intel_uncore_runtime_resume(dev_priv);
+
         /*
          * No point of rolling back things in case of an error, as the best
          * we can do is to hope that things will still work (and disable RPM).
diff --git a/drivers/gpu/drm/i915/i915_gem_userptr.c b/drivers/gpu/drm/i915/i915_gem_userptr.c
index e26b23171b56..ccde12d9e5f5 100644
--- a/drivers/gpu/drm/i915/i915_gem_userptr.c
+++ b/drivers/gpu/drm/i915/i915_gem_userptr.c
@@ -172,7 +172,9 @@ i915_mmu_notifier_create(struct mm_struct *mm)
         spin_lock_init(&mn->lock);
         mn->mn.ops = &i915_gem_userptr_notifier;
         mn->objects = RB_ROOT_CACHED;
-        mn->wq = alloc_workqueue("i915-userptr-release", WQ_UNBOUND, 0);
+        mn->wq = alloc_workqueue("i915-userptr-release",
+                                 WQ_UNBOUND | WQ_MEM_RECLAIM,
+                                 0);
         if (mn->wq == NULL) {
                 kfree(mn);
                 return ERR_PTR(-ENOMEM);
@@ -827,7 +829,7 @@ int i915_gem_init_userptr(struct drm_i915_private *dev_priv)
 
         dev_priv->mm.userptr_wq =
                 alloc_workqueue("i915-userptr-acquire",
-                                WQ_HIGHPRI | WQ_MEM_RECLAIM,
+                                WQ_HIGHPRI | WQ_UNBOUND,
                                 0);
         if (!dev_priv->mm.userptr_wq)
                 return -ENOMEM;
diff --git a/drivers/gpu/drm/i915/intel_breadcrumbs.c b/drivers/gpu/drm/i915/intel_breadcrumbs.c
index 48e1ba01ccf8..5f8b9f1f40f1 100644
--- a/drivers/gpu/drm/i915/intel_breadcrumbs.c
+++ b/drivers/gpu/drm/i915/intel_breadcrumbs.c
@@ -517,6 +517,7 @@ static void __intel_engine_remove_wait(struct intel_engine_cs *engine,
 
         GEM_BUG_ON(RB_EMPTY_NODE(&wait->node));
         rb_erase(&wait->node, &b->waiters);
+        RB_CLEAR_NODE(&wait->node);
 
 out:
         GEM_BUG_ON(b->irq_wait == wait);
diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c
index 20e3c65c0999..8c2ce81f01c2 100644
--- a/drivers/gpu/drm/i915/intel_uncore.c
+++ b/drivers/gpu/drm/i915/intel_uncore.c
@@ -434,6 +434,12 @@ void intel_uncore_resume_early(struct drm_i915_private *dev_priv)
         i915_check_and_clear_faults(dev_priv);
 }
 
+void intel_uncore_runtime_resume(struct drm_i915_private *dev_priv)
+{
+        iosf_mbi_register_pmic_bus_access_notifier(
+                &dev_priv->uncore.pmic_bus_access_nb);
+}
+
 void intel_uncore_sanitize(struct drm_i915_private *dev_priv)
 {
         i915_modparams.enable_rc6 =
@@ -1240,8 +1246,15 @@ static int i915_pmic_bus_access_notifier(struct notifier_block *nb,
                  * bus, which will be busy after this notification, leading to:
                  * "render: timed out waiting for forcewake ack request."
                  * errors.
+                 *
+                 * The notifier is unregistered during intel_runtime_suspend(),
+                 * so it's ok to access the HW here without holding a RPM
+                 * wake reference -> disable wakeref asserts for the time of
+                 * the access.
                  */
+                disable_rpm_wakeref_asserts(dev_priv);
                 intel_uncore_forcewake_get(dev_priv, FORCEWAKE_ALL);
+                enable_rpm_wakeref_asserts(dev_priv);
                 break;
         case MBI_PMIC_BUS_ACCESS_END:
                 intel_uncore_forcewake_put(dev_priv, FORCEWAKE_ALL);
diff --git a/drivers/gpu/drm/i915/intel_uncore.h b/drivers/gpu/drm/i915/intel_uncore.h
index 582771251b57..9ce079b5dd0d 100644
--- a/drivers/gpu/drm/i915/intel_uncore.h
+++ b/drivers/gpu/drm/i915/intel_uncore.h
@@ -134,6 +134,7 @@ bool intel_uncore_arm_unclaimed_mmio_detection(struct drm_i915_private *dev_priv
 void intel_uncore_fini(struct drm_i915_private *dev_priv);
 void intel_uncore_suspend(struct drm_i915_private *dev_priv);
 void intel_uncore_resume_early(struct drm_i915_private *dev_priv);
+void intel_uncore_runtime_resume(struct drm_i915_private *dev_priv);
 
 u64 intel_uncore_edram_size(struct drm_i915_private *dev_priv);
 void assert_forcewakes_inactive(struct drm_i915_private *dev_priv);