Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 09b64267 authored by Dave Airlie's avatar Dave Airlie
Browse files

drm/i915: don't suspend gt until after we disable irqs and display (v2) 



When I moved the irq disable down to after display disable,
I didn't realise the gt suspend also required irqs off, so move it
down as well.

Fixes WARNs seen at suspend/resume time.

v2: moved the rps flush down as well.

Tested-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 78660d5f

drivers/gpu/drm/i915/i915_drv.c

+5 −5
Original line number Diff line number Diff line
@@ -516,11 +516,6 @@ static int i915_drm_freeze(struct drm_device *dev) 
			return error;

		}



		flush_delayed_work(&dev_priv->rps.delayed_resume_work);





		intel_suspend_gt_powersave(dev);



		/*

		 * Disable CRTCs directly since we want to preserve sw state

		 * for _thaw.
@@ -532,8 +527,13 @@ static int i915_drm_freeze(struct drm_device *dev) 
		drm_modeset_unlock_all(dev);



		intel_dp_mst_suspend(dev);



		flush_delayed_work(&dev_priv->rps.delayed_resume_work);



		intel_runtime_pm_disable_interrupts(dev);



		intel_suspend_gt_powersave(dev);



		intel_modeset_suspend_hw(dev);

	}