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

Commit 226485e9 authored by Jesse Barnes's avatar Jesse Barnes Committed by Linus Torvalds
Browse files

i915: suspend/resume interrupt state 



In the KMS case, enter/leavevt won't fix up the interrupt handler for
us, so we need to do it at suspend/resume time.  Make sure we don't fail
the resume if the chip is hung either.

Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6c0594a3

drivers/gpu/drm/i915/i915_drv.c

+7 −3
Original line number Diff line number Diff line
@@ -68,9 +68,11 @@ static int i915_suspend(struct drm_device *dev, pm_message_t state) 
	i915_save_state(dev);



	/* If KMS is active, we do the leavevt stuff here */

	if (drm_core_check_feature(dev, DRIVER_MODESET) && i915_gem_idle(dev)) {

		dev_err(&dev->pdev->dev, "GEM idle failed, aborting suspend\n");

		return -EBUSY;

	if (drm_core_check_feature(dev, DRIVER_MODESET)) {

		if (i915_gem_idle(dev))

			dev_err(&dev->pdev->dev,

				"GEM idle failed, resume may fail\n");

		drm_irq_uninstall(dev);

	}



	intel_opregion_free(dev);
@@ -108,6 +110,8 @@ static int i915_resume(struct drm_device *dev) 
		if (ret != 0)

			ret = -1;

		mutex_unlock(&dev->struct_mutex);



		drm_irq_install(dev);

	}



	return ret;