iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/i915/pxp: On MTL, KCR enabling doesn't wait on tee component

Browse Source 
On legacy platforms, KCR HW enabling is done at the time the mei
component interface is bound. It's also disabled during unbind.
However, for MTL onwards, we don't depend on a tee component
to start sending GSC-CS firmware messages.

Thus, immediately enable (or disable) KCR HW on PXP's init,
fini and resume.

Signed-off-by: Alan Previn <alan.previn.teres.alexis@intel.com>
Reviewed-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230511231738.1077674-8-alan.previn.teres.alexis@intel.com
This commit is contained in:
Alan Previn 2023-05-11 16:17:37 -07:00 committed by Radhakrishna Sripada
parent d1da138f24
commit 9e134ed720
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/gpu/drm/i915/pxp/intel_pxp_gsccs.c
View File

@ -10,6 +10,7 @@
#include "gt/uc/intel_gsc_uc_heci_cmd_submit.h"
#include "i915_drv.h"
#include "intel_pxp.h"
#include "intel_pxp_cmd_interface_42.h"
#include "intel_pxp_cmd_interface_43.h"
#include "intel_pxp_gsccs.h"
@ -422,10 +423,22 @@ free_pkt:
void intel_pxp_gsccs_fini(struct intel_pxp *pxp)
{
intel_wakeref_t wakeref;
gsccs_destroy_execution_resource(pxp);
with_intel_runtime_pm(&pxp->ctrl_gt->i915->runtime_pm, wakeref)
intel_pxp_fini_hw(pxp);
}
int intel_pxp_gsccs_init(struct intel_pxp *pxp)
{
return gsccs_allocate_execution_resource(pxp);
int ret;
intel_wakeref_t wakeref;
ret = gsccs_allocate_execution_resource(pxp);
if (!ret) {
with_intel_runtime_pm(&pxp->ctrl_gt->i915->runtime_pm, wakeref)
intel_pxp_init_hw(pxp);
}
return ret;
}

3
drivers/gpu/drm/i915/pxp/intel_pxp_pm.c
View File

@ -43,8 +43,9 @@ void intel_pxp_resume_complete(struct intel_pxp *pxp)
* 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 (!pxp->pxp_component)
if (!HAS_ENGINE(pxp->ctrl_gt, GSC0) && !pxp->pxp_component)
return;
intel_pxp_init_hw(pxp);