Skip to content

Commit

Permalink
drm/xe: Prepare display for D3Cold
Browse files Browse the repository at this point in the history 
Prepare power-well and DC handling for a full power
lost during D3Cold, then sanitize it upon D3->D0.
Otherwise we get a bunch of state mismatch.

Ideally we could leave DC9 enabled and wouldn't need
to move DC9->DC0 on every runtime resume, however,
the disable_DC is part of the power-well checks and
intrinsic to the dc_off power well. In the future that
can be detangled so we can have even bigger power savings.
But for now, let's focus on getting a D3Cold, which saves
much more power by itself.

v2: create new functions to avoid full-suspend-resume path,
which would result in a deadlock between xe_gem_fault and the
modeset-ioctl.

v3: Only avoid the full modeset to avoid the race, for a more
robust suspend-resume.

Cc: Anshuman Gupta <[email protected]>
Cc: Uma Shankar <[email protected]>
Tested-by: Francois Dugast <[email protected]>
Reviewed-by: Anshuman Gupta <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
Signed-off-by: Rodrigo Vivi <[email protected]>
  • Loading branch information
@rodrigovivi
rodrigovivi committed May 23, 2024
1 parent 73ba282 commit e7b180b
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 11 deletions.
10 changes: 6 additions & 4 deletions drivers/gpu/drm/xe/display/xe_display.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ static bool suspend_to_idle(void)
return false;
}

void xe_display_pm_suspend(struct xe_device *xe)
void xe_display_pm_suspend(struct xe_device *xe, bool runtime)
{
bool s2idle = suspend_to_idle();
if (!xe->info.enable_display)
Expand All @@ -322,7 +322,8 @@ void xe_display_pm_suspend(struct xe_device *xe)
if (has_display(xe))
drm_kms_helper_poll_disable(&xe->drm);

intel_display_driver_suspend(xe);
if (!runtime)
intel_display_driver_suspend(xe);

intel_dp_mst_suspend(xe);

Expand Down Expand Up @@ -358,7 +359,7 @@ void xe_display_pm_resume_early(struct xe_device *xe)
intel_power_domains_resume(xe);
}

void xe_display_pm_resume(struct xe_device *xe)
void xe_display_pm_resume(struct xe_device *xe, bool runtime)
{
if (!xe->info.enable_display)
return;
Expand All @@ -373,7 +374,8 @@ void xe_display_pm_resume(struct xe_device *xe)

/* MST sideband requires HPD interrupts enabled */
intel_dp_mst_resume(xe);
intel_display_driver_resume(xe);
if (!runtime)
intel_display_driver_resume(xe);

intel_hpd_poll_disable(xe);
if (has_display(xe))
Expand Down
8 changes: 4 additions & 4 deletions drivers/gpu/drm/xe/display/xe_display.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ void xe_display_irq_enable(struct xe_device *xe, u32 gu_misc_iir);
void xe_display_irq_reset(struct xe_device *xe);
void xe_display_irq_postinstall(struct xe_device *xe, struct xe_gt *gt);

void xe_display_pm_suspend(struct xe_device *xe);
void xe_display_pm_suspend(struct xe_device *xe, bool runtime);
void xe_display_pm_suspend_late(struct xe_device *xe);
void xe_display_pm_resume_early(struct xe_device *xe);
void xe_display_pm_resume(struct xe_device *xe);
void xe_display_pm_resume(struct xe_device *xe, bool runtime);

#else

Expand All @@ -63,10 +63,10 @@ static inline void xe_display_irq_enable(struct xe_device *xe, u32 gu_misc_iir)
static inline void xe_display_irq_reset(struct xe_device *xe) {}
static inline void xe_display_irq_postinstall(struct xe_device *xe, struct xe_gt *gt) {}

static inline void xe_display_pm_suspend(struct xe_device *xe) {}
static inline void xe_display_pm_suspend(struct xe_device *xe, bool runtime) {}
static inline void xe_display_pm_suspend_late(struct xe_device *xe) {}
static inline void xe_display_pm_resume_early(struct xe_device *xe) {}
static inline void xe_display_pm_resume(struct xe_device *xe) {}
static inline void xe_display_pm_resume(struct xe_device *xe, bool runtime) {}

#endif /* CONFIG_DRM_XE_DISPLAY */
#endif /* _XE_DISPLAY_H_ */
15 changes: 12 additions & 3 deletions drivers/gpu/drm/xe/xe_pm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,12 +96,12 @@ int xe_pm_suspend(struct xe_device *xe)
if (err)
goto err;

xe_display_pm_suspend(xe);
xe_display_pm_suspend(xe, false);

for_each_gt(gt, xe, id) {
err = xe_gt_suspend(gt);
if (err) {
xe_display_pm_resume(xe);
xe_display_pm_resume(xe, false);
goto err;
}
}
Expand Down Expand Up @@ -151,7 +151,7 @@ int xe_pm_resume(struct xe_device *xe)

xe_irq_resume(xe);

xe_display_pm_resume(xe);
xe_display_pm_resume(xe, false);

for_each_gt(gt, xe, id)
xe_gt_resume(gt);
Expand Down Expand Up @@ -366,6 +366,7 @@ int xe_pm_runtime_suspend(struct xe_device *xe)
err = xe_bo_evict_all(xe);
if (err)
goto out;
xe_display_pm_suspend(xe, true);
}

for_each_gt(gt, xe, id) {
Expand All @@ -375,7 +376,12 @@ int xe_pm_runtime_suspend(struct xe_device *xe)
}

xe_irq_suspend(xe);

if (xe->d3cold.allowed)
xe_display_pm_suspend_late(xe);
out:
if (err)
xe_display_pm_resume(xe, true);
lock_map_release(&xe_pm_runtime_lockdep_map);
xe_pm_write_callback_task(xe, NULL);
return err;
Expand Down Expand Up @@ -411,6 +417,8 @@ int xe_pm_runtime_resume(struct xe_device *xe)
if (err)
goto out;

xe_display_pm_resume_early(xe);

/*
* This only restores pinned memory which is the memory
* required for the GT(s) to resume.
Expand All @@ -426,6 +434,7 @@ int xe_pm_runtime_resume(struct xe_device *xe)
xe_gt_resume(gt);

if (xe->d3cold.allowed && xe->d3cold.power_lost) {
xe_display_pm_resume(xe, true);
err = xe_bo_restore_user(xe);
if (err)
goto out;
Expand Down

0 comments on commit e7b180b

Please sign in to comment.