Attachment 96038 Details for Bug 76152 – move the i915 resume handling before audio resume

[patch] move the i915 resume handling before audio resume

0001-drm-i915-move-power-domain-init-earlier-during-syste.patch (text/plain), 5.22 KB, created by Imre Deak on 2014-03-19 12:25:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Imre Deak

Created: 2014-03-19 12:25:47 UTC

Size: 5.22 KB

patch

obsolete

>From 50add818715495fc4831aa7a52c64b1b4c34743e Mon Sep 17 00:00:00 2001
>From: Imre Deak <imre.deak@intel.com>
>Date: Tue, 18 Mar 2014 22:44:23 +0200
>Subject: [PATCH] drm/i915: move power domain init earlier during system resume
>
>The intel hda audio driver depends on the audio power domain
>reinitialized properly during resume. Since the order of calling the
>resume handler of the i915 and audio driver is not guaranteed, move the
>power domain re-initialization step to the resume_early handler. This
>is guaranteed to run before any of the resume handlers.
>
>Accordingly disabling of the i915 pci device should happen after the
>audio suspend handler ran. So move the disabling later from the i915
>resume handler to the resume_late handler.
>
>The power domain initialization requires us to enable the i915 pci
>device first, so move that part earlier too.
>
>Signed-off-by: Imre Deak <imre.deak@intel.com>
>---
> drivers/gpu/drm/i915/i915_drv.c | 68 ++++++++++++++++++++++++++++++++++-------
> 1 file changed, 57 insertions(+), 11 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
>index 5a0d34c..5a037fc 100644
>--- a/drivers/gpu/drm/i915/i915_drv.c
>+++ b/drivers/gpu/drm/i915/i915_drv.c
>@@ -538,6 +538,15 @@ static void intel_resume_hotplug(struct drm_device *dev)
> 	drm_helper_hpd_irq_event(dev);
> }
> 
>+static int i915_drm_thaw_early(struct drm_device *dev)
>+{
>+	struct drm_i915_private *dev_priv = dev->dev_private;
>+
>+	intel_power_domains_init_hw(dev_priv);
>+
>+	return 0;
>+}
>+
> static int __i915_drm_thaw(struct drm_device *dev, bool restore_gtt_mappings)
> {
> 	struct drm_i915_private *dev_priv = dev->dev_private;
>@@ -554,8 +563,6 @@ static int __i915_drm_thaw(struct drm_device *dev, bool restore_gtt_mappings)
> 		mutex_unlock(&dev->struct_mutex);
> 	}
> 
>-	intel_power_domains_init_hw(dev_priv);
>-
> 	i915_restore_state(dev);
> 	intel_opregion_setup(dev);
> 
>@@ -624,11 +631,8 @@ static int i915_drm_thaw(struct drm_device *dev)
> 	return __i915_drm_thaw(dev, true);
> }
> 
>-int i915_resume(struct drm_device *dev)
>+static int i915_resume_early(struct drm_device *dev)
> {
>-	struct drm_i915_private *dev_priv = dev->dev_private;
>-	int ret;
>-
> 	if (dev->switch_power_state == DRM_SWITCH_POWER_OFF)
> 		return 0;
> 
>@@ -637,6 +641,14 @@ int i915_resume(struct drm_device *dev)
> 
> 	pci_set_master(dev->pdev);
> 
>+	return i915_drm_thaw_early(dev);
>+}
>+
>+int i915_resume(struct drm_device *dev)
>+{
>+	struct drm_i915_private *dev_priv = dev->dev_private;
>+	int ret;
>+
> 	/*
> 	 * Platforms with opregion should have sane BIOS, older ones (gen3 and
> 	 * earlier) need to restore the GTT mappings since the BIOS might clear
>@@ -650,6 +662,14 @@ int i915_resume(struct drm_device *dev)
> 	return 0;
> }
> 
>+int i915_resume_legacy(struct drm_device *dev)
>+{
>+	i915_resume_early(dev);
>+	i915_resume(dev);
>+
>+	return 0;
>+}
>+
> /**
>  * i915_reset - reset chip after a hang
>  * @dev: drm device to reset
>@@ -781,7 +801,6 @@ static int i915_pm_suspend(struct device *dev)
> {
> 	struct pci_dev *pdev = to_pci_dev(dev);
> 	struct drm_device *drm_dev = pci_get_drvdata(pdev);
>-	int error;
> 
> 	if (!drm_dev || !drm_dev->dev_private) {
> 		dev_err(dev, "DRM not initialized, aborting suspend.\n");
>@@ -791,9 +810,16 @@ static int i915_pm_suspend(struct device *dev)
> 	if (drm_dev->switch_power_state == DRM_SWITCH_POWER_OFF)
> 		return 0;
> 
>-	error = i915_drm_freeze(drm_dev);
>-	if (error)
>-		return error;
>+	return i915_drm_freeze(drm_dev);
>+}
>+
>+static int i915_pm_suspend_late(struct device *dev)
>+{
>+	struct pci_dev *pdev = to_pci_dev(dev);
>+	struct drm_device *drm_dev = pci_get_drvdata(pdev);
>+
>+	if (drm_dev->switch_power_state == DRM_SWITCH_POWER_OFF)
>+		return 0;
> 
> 	pci_disable_device(pdev);
> 	pci_set_power_state(pdev, PCI_D3hot);
>@@ -801,6 +827,14 @@ static int i915_pm_suspend(struct device *dev)
> 	return 0;
> }
> 
>+static int i915_pm_resume_early(struct device *dev)
>+{
>+	struct pci_dev *pdev = to_pci_dev(dev);
>+	struct drm_device *drm_dev = pci_get_drvdata(pdev);
>+
>+	return i915_resume_early(drm_dev);
>+}
>+
> static int i915_pm_resume(struct device *dev)
> {
> 	struct pci_dev *pdev = to_pci_dev(dev);
>@@ -822,6 +856,14 @@ static int i915_pm_freeze(struct device *dev)
> 	return i915_drm_freeze(drm_dev);
> }
> 
>+static int i915_pm_thaw_early(struct device *dev)
>+{
>+	struct pci_dev *pdev = to_pci_dev(dev);
>+	struct drm_device *drm_dev = pci_get_drvdata(pdev);
>+
>+	return i915_drm_thaw_early(drm_dev);
>+}
>+
> static int i915_pm_thaw(struct device *dev)
> {
> 	struct pci_dev *pdev = to_pci_dev(dev);
>@@ -884,10 +926,14 @@ static int i915_runtime_resume(struct device *device)
> 
> static const struct dev_pm_ops i915_pm_ops = {
> 	.suspend = i915_pm_suspend,
>+	.suspend_late = i915_pm_suspend_late,
>+	.resume_early = i915_pm_resume_early,
> 	.resume = i915_pm_resume,
> 	.freeze = i915_pm_freeze,
>+	.thaw_early = i915_pm_thaw_early,
> 	.thaw = i915_pm_thaw,
> 	.poweroff = i915_pm_poweroff,
>+	.restore_early = i915_pm_resume_early,
> 	.restore = i915_pm_resume,
> 	.runtime_suspend = i915_runtime_suspend,
> 	.runtime_resume = i915_runtime_resume,
>@@ -930,7 +976,7 @@ static struct drm_driver driver = {
> 
> 	/* Used in place of i915_pm_ops for non-DRIVER_MODESET */
> 	.suspend = i915_suspend,
>-	.resume = i915_resume,
>+	.resume = i915_resume_legacy,
> 
> 	.device_is_agp = i915_driver_device_is_agp,
> 	.master_create = i915_master_create,
>-- 
>1.8.4
>

Actions: View | Splinter Review

Attachments on bug 76152: 95769 | 95803 | 95912 | 96038 | 96133 | 96439

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.