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

Commit d37ae19a authored by Paulo Zanoni's avatar Paulo Zanoni Committed by Daniel Vetter
Browse files

drm/i915/skl: send opregion_nofify_adapter(PCI_D1) instead of PCI_D3 



I was told that the "repurposed D1 definition" is still valid for SKL.
It is BDW that is special due to its hotplug bug, so let's
special-case BDW instead of HSW.

Cc: Kristen Carlson Accardi <kristen@linux.intel.com>
Signed-off-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent dcddab3a

drivers/gpu/drm/i915/i915_drv.c

+9 −11
Original line number Diff line number Diff line
@@ -1489,7 +1489,15 @@ static int intel_runtime_suspend(struct device *device) 
	 * FIXME: We really should find a document that references the arguments

	 * used below!

	 */

	if (IS_HASWELL(dev)) {

	if (IS_BROADWELL(dev)) {

		/*

		 * On Broadwell, if we use PCI_D1 the PCH DDI ports will stop

		 * being detected, and the call we do at intel_runtime_resume()

		 * won't be able to restore them. Since PCI_D3hot matches the

		 * actual specification and appears to be working, use it.

		 */

		intel_opregion_notify_adapter(dev, PCI_D3hot);

	} else {

		/*

		 * current versions of firmware which depend on this opregion

		 * notification have repurposed the D1 definition to mean
@@ -1498,16 +1506,6 @@ static int intel_runtime_suspend(struct device *device) 
		 * the suspend path.

		 */

		intel_opregion_notify_adapter(dev, PCI_D1);

	} else {

		/*

		 * On Broadwell, if we use PCI_D1 the PCH DDI ports will stop

		 * being detected, and the call we do at intel_runtime_resume()

		 * won't be able to restore them. Since PCI_D3hot matches the

		 * actual specification and appears to be working, use it. Let's

		 * assume the other non-Haswell platforms will stay the same as

		 * Broadwell.

		 */

		intel_opregion_notify_adapter(dev, PCI_D3hot);

	}



	assert_forcewakes_inactive(dev_priv);