Re: [Intel-gfx] [PATCH v3 5/6] drm/i915/pxp: Make intel_pxp_start implicitly sort PXP-owning-GT

[Ceraolo Spurio, Daniele]

On 10/21/2022 10:39 AM, Alan Previn wrote:

Make intel_pxp_is_start implicitly find the PXP-owning-GT.
Callers of this function shall now pass in i915 since PXP
is a global GPU feature. Make intel_pxp_start implicitly
find the right gt to start PXP arb session so
it's transparent to the callers.

Signed-off-by: Alan Previn <alan.previn.teres.ale...@intel.com>

Reviewed-by: Daniele Ceraolo Spurio <daniele.ceraolospu...@intel.com>

Daniele

---
  drivers/gpu/drm/i915/gem/i915_gem_context.c | 2 +-
  drivers/gpu/drm/i915/pxp/intel_pxp.c        | 9 ++++++++-
  drivers/gpu/drm/i915/pxp/intel_pxp.h        | 2 +-
  3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_context.c 
b/drivers/gpu/drm/i915/gem/i915_gem_context.c
index 798e77398acc..af60f6494947 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_context.c
@@ -272,7 +272,7 @@ static int proto_context_set_protected(struct 
drm_i915_private *i915,
                pc->pxp_wakeref = intel_runtime_pm_get(&i915->runtime_pm);

if (!intel_pxp_is_active(i915))

-                       ret = intel_pxp_start(&to_gt(i915)->pxp);
+                       ret = intel_pxp_start(i915);
        }

return ret;

diff --git a/drivers/gpu/drm/i915/pxp/intel_pxp.c 
b/drivers/gpu/drm/i915/pxp/intel_pxp.c
index 2c835c38c527..c87f812ba13a 100644
--- a/drivers/gpu/drm/i915/pxp/intel_pxp.c
+++ b/drivers/gpu/drm/i915/pxp/intel_pxp.c
@@ -259,10 +259,17 @@ static bool pxp_component_bound(struct intel_pxp *pxp)
   * the arb session is restarted from the irq work when we receive the
   * termination completion interrupt
   */
-int intel_pxp_start(struct intel_pxp *pxp)
+int intel_pxp_start(struct drm_i915_private *i915)
  {
+       struct intel_gt *gt = intel_pxp_get_owning_gt(i915);
+       struct intel_pxp *pxp;
        int ret = 0;

+ if (!gt)

+               return -ENODEV;
+
+       pxp = &gt->pxp;
+
        if (!intel_gtpxp_is_enabled(pxp))
                return -ENODEV;

diff --git a/drivers/gpu/drm/i915/pxp/intel_pxp.h b/drivers/gpu/drm/i915/pxp/intel_pxp.h

index 7d93055cdd6b..c45949bb1f7b 100644
--- a/drivers/gpu/drm/i915/pxp/intel_pxp.h
+++ b/drivers/gpu/drm/i915/pxp/intel_pxp.h
@@ -31,7 +31,7 @@ void intel_pxp_fini_hw(struct intel_pxp *pxp);

void intel_pxp_mark_termination_in_progress(struct intel_pxp *pxp); -int intel_pxp_start(struct intel_pxp *pxp);

+int intel_pxp_start(struct drm_i915_private *i915);

int intel_pxp_key_check(struct intel_pxp *pxp,

                        struct drm_i915_gem_object *obj,