ac765b7018
In the case of failed suspend flow or cases where the kernel does not go
into full suspend but goes from suspend_prepare back to resume_complete,
we get called for a pm_complete but without runtime_pm guaranteed.
Thus, ensure we take the runtime_pm when calling intel_pxp_init_hw
from within intel_pxp_resume_complete.
v2: resume_complete and runtime_resume should abstract a common
helper with different wakeref requirements. (Daniele)
Signed-off-by: Alan Previn <alan.previn.teres.alexis@intel.com>
Reviewed-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230802190611.1639371-1-alan.previn.teres.alexis@intel.com
80 lines
1.6 KiB
C
80 lines
1.6 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;
|
|
}
|
|
}
|
|
|
|
static void _pxp_resume(struct intel_pxp *pxp, bool take_wakeref)
|
|
{
|
|
intel_wakeref_t wakeref;
|
|
|
|
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.
|
|
* NOTE: GSC-CS backend doesn't rely on components.
|
|
*/
|
|
if (!HAS_ENGINE(pxp->ctrl_gt, GSC0) && !pxp->pxp_component)
|
|
return;
|
|
|
|
if (take_wakeref)
|
|
wakeref = intel_runtime_pm_get(&pxp->ctrl_gt->i915->runtime_pm);
|
|
intel_pxp_init_hw(pxp);
|
|
if (take_wakeref)
|
|
intel_runtime_pm_put(&pxp->ctrl_gt->i915->runtime_pm, wakeref);
|
|
}
|
|
|
|
void intel_pxp_resume_complete(struct intel_pxp *pxp)
|
|
{
|
|
_pxp_resume(pxp, true);
|
|
}
|
|
|
|
void intel_pxp_runtime_resume(struct intel_pxp *pxp)
|
|
{
|
|
_pxp_resume(pxp, false);
|
|
}
|
|
|
|
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;
|
|
}
|