UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Paulo Zanoni 2015-07-30 18:20:29 -03:00 committed by Daniel Vetter
parent dcddab3aa0
commit d37ae19a6c
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/gpu/drm/i915/i915_drv.c
View File

@ -1489,7 +1489,15 @@ static int intel_runtime_suspend(struct device *device)
* FIXME: We really should find a document that references the arguments * FIXME: We really should find a document that references the arguments
* used below! * 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 * current versions of firmware which depend on this opregion
* notification have repurposed the D1 definition to mean * notification have repurposed the D1 definition to mean
@ -1498,16 +1506,6 @@ static int intel_runtime_suspend(struct device *device)
* the suspend path. * the suspend path.
*/ */
intel_opregion_notify_adapter(dev, PCI_D1); 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); assert_forcewakes_inactive(dev_priv);