Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-15 00:21:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

drm/xe/display: Improve s2idle handling.

Browse Source 
We accidentally always pass true as s2idle argument, instead of
calculating it in the same way as i915.

Suspend modes were removed to achieve compatibility with i915, but
accidentally left in the source code.

While at it, fix all other cases too, s2idle will go into a D1 state and
setting a lower power state should be handled by PCI core.

Maybe my laptop stops draining so much power during suspend now? I can
only hope..

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
This commit is contained in:
Maarten Lankhorst 2023-07-28 16:13:22 +02:00 committed by Rodrigo Vivi
parent 44e694958b
commit f6761c68c0
3 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/gpu/drm/xe/compat-i915-headers/intel_runtime_pm.h
View File

@ -5,12 +5,6 @@
#include "intel_wakeref.h"
enum i915_drm_suspend_mode {
I915_DRM_SUSPEND_IDLE,
I915_DRM_SUSPEND_MEM,
I915_DRM_SUSPEND_HIBERNATE,
};
#define intel_runtime_pm xe_runtime_pm
static inline void disable_rpm_wakeref_asserts(void *rpm)

6
drivers/gpu/drm/xe/xe_display.c
View File

@ -321,6 +321,7 @@ static void intel_suspend_encoders(struct xe_device *xe)
void xe_display_pm_suspend(struct xe_device *xe)
{
bool s2idle = acpi_target_system_state() < ACPI_STATE_S3;
if (!xe->info.enable_display)
return;
@ -340,7 +341,7 @@ void xe_display_pm_suspend(struct xe_device *xe)
intel_suspend_encoders(xe);
intel_opregion_suspend(xe, PCI_D3cold);
intel_opregion_suspend(xe, s2idle ? PCI_D1 : PCI_D3cold);
intel_fbdev_set_suspend(&xe->drm, FBINFO_STATE_SUSPENDED, true);
@ -349,10 +350,11 @@ void xe_display_pm_suspend(struct xe_device *xe)
void xe_display_pm_suspend_late(struct xe_device *xe)
{
bool s2idle = acpi_target_system_state() < ACPI_STATE_S3;
if (!xe->info.enable_display)
return;
intel_power_domains_suspend(xe, I915_DRM_SUSPEND_MEM);
intel_power_domains_suspend(xe, s2idle);
intel_display_power_suspend_late(xe);
}

6
drivers/gpu/drm/xe/xe_pci.c
View File

@ -795,10 +795,6 @@ static int xe_pci_suspend(struct device *dev)
pci_save_state(pdev);
pci_disable_device(pdev);
err = pci_set_power_state(pdev, PCI_D3hot);
if (err)
return err;
return 0;
}
@ -814,8 +810,6 @@ static int xe_pci_resume(struct device *dev)
if (err)
return err;
pci_restore_state(pdev);
err = pci_enable_device(pdev);
if (err)
return err;