24efe424f0
During suspend flow, i915 currently achors' on the pm_suspend_prepare callback as the location where we quiesce the entire GPU and perform all necessary cleanup in order to go into suspend. PXP is also called during this time to perform the arbitration session teardown (with the assurance no additional GEM IOCTLs will come after that could restart the session). However, if other devices or drivers fail their suspend_prepare, the system will not go into suspend and i915 will be expected to resume operation. In this case, we need to re-initialize the PXP hardware and this really should be done within the pm_resume_complete callback which is the correct opposing function in the resume sequence to match pm_suspend_prepare of the suspend sequence. Because this callback is the last thing at the end of resuming we expect little to no impact to the rest of the i915 resume sequence with this change. Signed-off-by: Alan Previn <alan.previn.teres.alexis@intel.com> Reviewed-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20230125082637.118970-7-alan.previn.teres.alexis@intel.com
63 lines
1.2 KiB
C
63 lines
1.2 KiB
C
// SPDX-License-Identifier: MIT
|
|
/*
|
|
* Copyright(c) 2020 Intel Corporation.
|
|
*/
|
|
|
|
#include "i915_drv.h"
|
|
|
|
#include "intel_pxp.h"
|
|
#include "intel_pxp_irq.h"
|
|
#include "intel_pxp_pm.h"
|
|
#include "intel_pxp_session.h"
|
|
#include "intel_pxp_types.h"
|
|
|
|
void intel_pxp_suspend_prepare(struct intel_pxp *pxp)
|
|
{
|
|
if (!intel_pxp_is_enabled(pxp))
|
|
return;
|
|
|
|
intel_pxp_end(pxp);
|
|
|
|
intel_pxp_invalidate(pxp);
|
|
}
|
|
|
|
void intel_pxp_suspend(struct intel_pxp *pxp)
|
|
{
|
|
intel_wakeref_t wakeref;
|
|
|
|
if (!intel_pxp_is_enabled(pxp))
|
|
return;
|
|
|
|
with_intel_runtime_pm(&pxp->ctrl_gt->i915->runtime_pm, wakeref) {
|
|
intel_pxp_fini_hw(pxp);
|
|
pxp->hw_state_invalidated = false;
|
|
}
|
|
}
|
|
|
|
void intel_pxp_resume_complete(struct intel_pxp *pxp)
|
|
{
|
|
if (!intel_pxp_is_enabled(pxp))
|
|
return;
|
|
|
|
/*
|
|
* The PXP component gets automatically unbound when we go into S3 and
|
|
* re-bound after we come out, so in that scenario we can defer the
|
|
* hw init to the bind call.
|
|
*/
|
|
if (!pxp->pxp_component)
|
|
return;
|
|
|
|
intel_pxp_init_hw(pxp);
|
|
}
|
|
|
|
void intel_pxp_runtime_suspend(struct intel_pxp *pxp)
|
|
{
|
|
if (!intel_pxp_is_enabled(pxp))
|
|
return;
|
|
|
|
pxp->arb_is_valid = false;
|
|
|
|
intel_pxp_fini_hw(pxp);
|
|
|
|
pxp->hw_state_invalidated = false;
|
|
}
|