1 files changed, 9 insertions, 2 deletions

diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
index 75647e7f012b..10574a0c3a55 100644
--- a/drivers/gpu/drm/drm_irq.c
+++ b/drivers/gpu/drm/drm_irq.c
@@ -185,8 +185,15 @@ static void vblank_disable_and_save(struct drm_device *dev, int crtc)
                 return;
         }
 
-        dev->driver->disable_vblank(dev, crtc);
-        vblank->enabled = false;
+        /*
+         * Only disable vblank interrupts if they're enabled. This avoids
+         * calling the ->disable_vblank() operation in atomic context with the
+         * hardware potentially runtime suspended.
+         */
+        if (vblank->enabled) {
+                dev->driver->disable_vblank(dev, crtc);
+                vblank->enabled = false;
+        }
 
         /* No further vblank irq's will be processed after
          * this point. Get current hardware vblank count and