On Tue, 2022-11-29 at 18:02 -0800, Teres Alexis, Alan Previn wrote: Alan: [snip] > + newpxp->ctrl_gt = pxp_get_ctrl_gt(newpxp->i915); > + > + if (!newpxp->ctrl_gt) > + return -ENODEV; > > /* > * If HuC is loaded by GSC but PXP is disabled, we can skip the init of > * the full PXP session/object management and just init the tee channel. > */ > - if (HAS_PXP(gt->i915)) > - pxp_init_full(pxp); > - else if (intel_huc_is_loaded_by_gsc(>->uc.huc) && intel_uc_uses_huc(>->uc)) > - intel_pxp_tee_component_init(pxp); > + if (HAS_PXP(newpxp->i915)) > + pxp_init_full(newpxp); I realize with rev6 now having pxp as top-level and defining ctrl_gt properly in the header, its actually the correct time to switch HAS_PXP(i915) to HAS_PXP(pxp) so we can check the VDBOX mask on the ctrl_gt (instead of root gt as it is now). This assures HAS_PXP continues to be a global-macro as was it was originally intended. ...alan