Merge airlied/drm-next into drm-misc-next

Backmerge the main pull request to sync up with all the newly landed
drivers. Otherwise we'll have chaos even before 4.12 started in
earnest.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

1 files changed, 6 insertions, 5 deletions

diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c
index 872eac4cb1df..a14fac6a01d3 100644
--- a/drivers/base/power/runtime.c
+++ b/drivers/base/power/runtime.c
@@ -966,13 +966,13 @@ int __pm_runtime_idle(struct device *dev, int rpmflags)
         unsigned long flags;
         int retval;
 
-        might_sleep_if(!(rpmflags & RPM_ASYNC) && !dev->power.irq_safe);
-
         if (rpmflags & RPM_GET_PUT) {
                 if (!atomic_dec_and_test(&dev->power.usage_count))
                         return 0;
         }
 
+        might_sleep_if(!(rpmflags & RPM_ASYNC) && !dev->power.irq_safe);
+
         spin_lock_irqsave(&dev->power.lock, flags);
         retval = rpm_idle(dev, rpmflags);
         spin_unlock_irqrestore(&dev->power.lock, flags);
@@ -998,13 +998,13 @@ int __pm_runtime_suspend(struct device *dev, int rpmflags)
         unsigned long flags;
         int retval;
 
-        might_sleep_if(!(rpmflags & RPM_ASYNC) && !dev->power.irq_safe);
-
         if (rpmflags & RPM_GET_PUT) {
                 if (!atomic_dec_and_test(&dev->power.usage_count))
                         return 0;
         }
 
+        might_sleep_if(!(rpmflags & RPM_ASYNC) && !dev->power.irq_safe);
+
         spin_lock_irqsave(&dev->power.lock, flags);
         retval = rpm_suspend(dev, rpmflags);
         spin_unlock_irqrestore(&dev->power.lock, flags);
@@ -1029,7 +1029,8 @@ int __pm_runtime_resume(struct device *dev, int rpmflags)
         unsigned long flags;
         int retval;
 
-        might_sleep_if(!(rpmflags & RPM_ASYNC) && !dev->power.irq_safe);
+        might_sleep_if(!(rpmflags & RPM_ASYNC) && !dev->power.irq_safe &&
+                        dev->power.runtime_status != RPM_ACTIVE);
 
         if (rpmflags & RPM_GET_PUT)
                 atomic_inc(&dev->power.usage_count);