| Message ID | 20240812040246.3311595-1-arun.r.murthy@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [PATCHv3] drm/xe/display: Change HPD to polling on runtime suspend | expand |
On Mon, 12 Aug 2024, Patchwork <patchwork@emeril.freedesktop.org> wrote: > == Series Details == > > Series: drm/xe/display: Change HPD to polling on runtime suspend (rev2) > URL : https://patchwork.freedesktop.org/series/137026/ > State : failure > > == Summary == > > Error: patch https://patchwork.freedesktop.org/api/1.0/series/137026/revisions/2/mbox/ not applied > Applying: drm/xe/display: Change HPD to polling on runtime suspend > Using index info to reconstruct a base tree... > M drivers/gpu/drm/xe/display/xe_display.c > Falling back to patching base and 3-way merge... > Auto-merging drivers/gpu/drm/xe/display/xe_display.c > CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/display/xe_display.c > error: Failed to merge in the changes. > hint: Use 'git am --show-current-patch=diff' to see the failed patch > Patch failed at 0001 drm/xe/display: Change HPD to polling on runtime suspend > When you have resolved this problem, run "git am --continue". > If you prefer to skip this patch, run "git am --skip" instead. > To restore the original branch and stop patching, run "git am --abort". > Build failed, no error log produced Please rebase, the last one already failed to apply. BR, Jani.
diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c index 78cccbe28947..426b3f73c104 100644 --- a/drivers/gpu/drm/xe/display/xe_display.c +++ b/drivers/gpu/drm/xe/display/xe_display.c @@ -315,6 +315,9 @@ void xe_display_pm_suspend(struct xe_device *xe, bool runtime) intel_hpd_cancel_work(xe); + if (runtime) + intel_hpd_poll_enable(xe); + intel_suspend_encoders(xe); intel_opregion_suspend(xe, s2idle ? PCI_D1 : PCI_D3cold);
HPD is interrupt based and on runtime suspend change it to polling as HPD is not a wakeup event. A worker thread is scheduled for doing this polling and it keeps polling for HPD live status on an internval of 10s. On runtime resume disable polling and fallback to interrupt mechanism. v2: move poll_enable() to xe_display(Imre) v3: removed un-wanted comments (Jani) Signed-off-by: Arun R Murthy <arun.r.murthy@intel.com> --- drivers/gpu/drm/xe/display/xe_display.c | 3 +++ 1 file changed, 3 insertions(+)