Commit e0751556 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

PM: sleep: core: Rename DPM_FLAG_NEVER_SKIP 



Rename DPM_FLAG_NEVER_SKIP to DPM_FLAG_NO_DIRECT_COMPLETE which
matches its purpose more closely.

No functional impact.

Suggested-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Bjorn Helgaas <bhelgaas@google.com> # for PCI parts
Acked-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Acked-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent fa2bfead

Documentation/driver-api/pm/devices.rst

+3 −3
Original line number Diff line number Diff line
@@ -361,9 +361,9 @@ the phases are: ``prepare``, ``suspend``, ``suspend_late``, ``suspend_noirq``. 
	runtime PM disabled.



	This feature also can be controlled by device drivers by using the

	``DPM_FLAG_NEVER_SKIP`` and ``DPM_FLAG_SMART_PREPARE`` driver power

	management flags.  [Typically, they are set at the time the driver is

	probed against the device in question by passing them to the

	``DPM_FLAG_NO_DIRECT_COMPLETE`` and ``DPM_FLAG_SMART_PREPARE`` driver

	power management flags.  [Typically, they are set at the time the driver

	is probed against the device in question by passing them to the

	:c:func:`dev_pm_set_driver_flags` helper function.]  If the first of

	these flags is set, the PM core will not apply the direct-complete

	procedure described above to the given device and, consequenty, to any

Documentation/power/pci.rst

+5 −5
Original line number Diff line number Diff line
@@ -1004,11 +1004,11 @@ including the PCI bus type. The flags should be set once at the driver probe 
time with the help of the dev_pm_set_driver_flags() function and they should not

be updated directly afterwards.



The DPM_FLAG_NEVER_SKIP flag prevents the PM core from using the direct-complete

mechanism allowing device suspend/resume callbacks to be skipped if the device

is in runtime suspend when the system suspend starts.  That also affects all of

the ancestors of the device, so this flag should only be used if absolutely

necessary.

The DPM_FLAG_NO_DIRECT_COMPLETE flag prevents the PM core from using the

direct-complete mechanism allowing device suspend/resume callbacks to be skipped

if the device is in runtime suspend when the system suspend starts.  That also

affects all of the ancestors of the device, so this flag should only be used if

absolutely necessary.



The DPM_FLAG_SMART_PREPARE flag instructs the PCI bus type to only return a

positive value from pci_pm_prepare() if the ->prepare callback provided by the

drivers/base/power/main.c

+1 −1
Original line number Diff line number Diff line
@@ -1844,7 +1844,7 @@ unlock: 
	spin_lock_irq(&dev->power.lock);

	dev->power.direct_complete = state.event == PM_EVENT_SUSPEND &&

		(ret > 0 || dev->power.no_pm_callbacks) &&

		!dev_pm_test_driver_flags(dev, DPM_FLAG_NEVER_SKIP);

		!dev_pm_test_driver_flags(dev, DPM_FLAG_NO_DIRECT_COMPLETE);

	spin_unlock_irq(&dev->power.lock);

	return 0;

}

drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c

+1 −1
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ int amdgpu_driver_load_kms(struct drm_device *dev, unsigned long flags) 
	}



	if (adev->runpm) {

		dev_pm_set_driver_flags(dev->dev, DPM_FLAG_NEVER_SKIP);

		dev_pm_set_driver_flags(dev->dev, DPM_FLAG_NO_DIRECT_COMPLETE);

		pm_runtime_use_autosuspend(dev->dev);

		pm_runtime_set_autosuspend_delay(dev->dev, 5000);

		pm_runtime_set_active(dev->dev);

drivers/gpu/drm/i915/intel_runtime_pm.c

+1 −1
Original line number Diff line number Diff line
@@ -549,7 +549,7 @@ void intel_runtime_pm_enable(struct intel_runtime_pm *rpm) 
	 * becaue the HDA driver may require us to enable the audio power

	 * domain during system suspend.

	 */

	dev_pm_set_driver_flags(kdev, DPM_FLAG_NEVER_SKIP);

	dev_pm_set_driver_flags(kdev, DPM_FLAG_NO_DIRECT_COMPLETE);



	pm_runtime_set_autosuspend_delay(kdev, 10000); /* 10s */

	pm_runtime_mark_last_busy(kdev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE