On Fri, 28 Feb 2025, Jani Nikula <jani.nikula@xxxxxxxxx> wrote:
> It's undesirable to have to figure out the pxp pointer in display
> code. For one thing, its type is different for i915 and xe.
>
> Since we can figure the pxp pointer out in the pxp code from the gem
> object, offload it there.
>
> v2: Rebase
>
> Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@xxxxxxxxx>
> Cc: Alan Previn <alan.previn.teres.alexis@xxxxxxxxx>
> Reviewed-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@xxxxxxxxx>
> Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx>
>
> ---
>
> Couldn't merge this before getting i915 and xe branches synced. Rebase
> and resend.
Pushed to din, thanks for the review.
BR,
Jani.
> ---
> drivers/gpu/drm/i915/display/skl_universal_plane.c | 3 +--
> drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 2 +-
> drivers/gpu/drm/i915/pxp/intel_pxp.c | 6 +++---
> drivers/gpu/drm/i915/pxp/intel_pxp.h | 4 +---
> drivers/gpu/drm/xe/compat-i915-headers/pxp/intel_pxp.h | 7 ++-----
> drivers/gpu/drm/xe/xe_pxp.c | 9 ++++++---
> drivers/gpu/drm/xe/xe_pxp.h | 2 +-
> 7 files changed, 15 insertions(+), 18 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c b/drivers/gpu/drm/i915/display/skl_universal_plane.c
> index 3488c7ae6d8a..87d003498722 100644
> --- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
> +++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
> @@ -2258,14 +2258,13 @@ static bool skl_fb_scalable(const struct drm_framebuffer *fb)
> static void check_protection(struct intel_plane_state *plane_state)
> {
> struct intel_display *display = to_intel_display(plane_state);
> - struct drm_i915_private *i915 = to_i915(display->drm);
> const struct drm_framebuffer *fb = plane_state->hw.fb;
> struct drm_gem_object *obj = intel_fb_bo(fb);
>
> if (DISPLAY_VER(display) < 11)
> return;
>
> - plane_state->decrypt = intel_pxp_key_check(i915->pxp, obj, false) == 0;
> + plane_state->decrypt = intel_pxp_key_check(obj, false) == 0;
> plane_state->force_black = intel_bo_is_protected(obj) &&
> !plane_state->decrypt;
> }
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
> index c8107502190d..7796c4119ef5 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
> @@ -915,7 +915,7 @@ static struct i915_vma *eb_lookup_vma(struct i915_execbuffer *eb, u32 handle)
> */
> if (i915_gem_context_uses_protected_content(eb->gem_context) &&
> i915_gem_object_is_protected(obj)) {
> - err = intel_pxp_key_check(eb->i915->pxp, intel_bo_to_drm_bo(obj), true);
> + err = intel_pxp_key_check(intel_bo_to_drm_bo(obj), true);
> if (err) {
> i915_gem_object_put(obj);
> return ERR_PTR(err);
> diff --git a/drivers/gpu/drm/i915/pxp/intel_pxp.c b/drivers/gpu/drm/i915/pxp/intel_pxp.c
> index 9cf169665d7c..f8da693ad3ce 100644
> --- a/drivers/gpu/drm/i915/pxp/intel_pxp.c
> +++ b/drivers/gpu/drm/i915/pxp/intel_pxp.c
> @@ -460,11 +460,11 @@ void intel_pxp_fini_hw(struct intel_pxp *pxp)
> intel_pxp_irq_disable(pxp);
> }
>
> -int intel_pxp_key_check(struct intel_pxp *pxp,
> - struct drm_gem_object *_obj,
> - bool assign)
> +int intel_pxp_key_check(struct drm_gem_object *_obj, bool assign)
> {
> struct drm_i915_gem_object *obj = to_intel_bo(_obj);
> + struct drm_i915_private *i915 = to_i915(_obj->dev);
> + struct intel_pxp *pxp = i915->pxp;
>
> if (!intel_pxp_is_active(pxp))
> return -ENODEV;
> diff --git a/drivers/gpu/drm/i915/pxp/intel_pxp.h b/drivers/gpu/drm/i915/pxp/intel_pxp.h
> index 4ed97db5e7c6..7b19109845a3 100644
> --- a/drivers/gpu/drm/i915/pxp/intel_pxp.h
> +++ b/drivers/gpu/drm/i915/pxp/intel_pxp.h
> @@ -31,9 +31,7 @@ int intel_pxp_get_backend_timeout_ms(struct intel_pxp *pxp);
> int intel_pxp_start(struct intel_pxp *pxp);
> void intel_pxp_end(struct intel_pxp *pxp);
>
> -int intel_pxp_key_check(struct intel_pxp *pxp,
> - struct drm_gem_object *obj,
> - bool assign);
> +int intel_pxp_key_check(struct drm_gem_object *obj, bool assign);
>
> void intel_pxp_invalidate(struct intel_pxp *pxp);
>
> diff --git a/drivers/gpu/drm/xe/compat-i915-headers/pxp/intel_pxp.h b/drivers/gpu/drm/xe/compat-i915-headers/pxp/intel_pxp.h
> index d2eb8e1f6c4b..97fd0ddf0b3a 100644
> --- a/drivers/gpu/drm/xe/compat-i915-headers/pxp/intel_pxp.h
> +++ b/drivers/gpu/drm/xe/compat-i915-headers/pxp/intel_pxp.h
> @@ -12,11 +12,8 @@
> #include "xe_pxp.h"
>
> struct drm_gem_object;
> -struct xe_pxp;
>
> -static inline int intel_pxp_key_check(struct xe_pxp *pxp,
> - struct drm_gem_object *obj,
> - bool assign)
> +static inline int intel_pxp_key_check(struct drm_gem_object *obj, bool assign)
> {
> /*
> * The assign variable is used in i915 to assign the key to the BO at
> @@ -26,7 +23,7 @@ static inline int intel_pxp_key_check(struct xe_pxp *pxp,
> if (assign)
> return -EINVAL;
>
> - return xe_pxp_obj_key_check(pxp, obj);
> + return xe_pxp_obj_key_check(obj);
> }
>
> #endif
> diff --git a/drivers/gpu/drm/xe/xe_pxp.c b/drivers/gpu/drm/xe/xe_pxp.c
> index 47499ca02693..454ea7dc08ac 100644
> --- a/drivers/gpu/drm/xe/xe_pxp.c
> +++ b/drivers/gpu/drm/xe/xe_pxp.c
> @@ -796,7 +796,6 @@ int xe_pxp_bo_key_check(struct xe_pxp *pxp, struct xe_bo *bo)
>
> /**
> * xe_pxp_obj_key_check - check if the key used by a drm_gem_obj is valid
> - * @pxp: the xe->pxp pointer (it will be NULL if PXP is disabled)
> * @obj: the drm_gem_obj we want to check
> *
> * Checks whether a drm_gem_obj was encrypted with the current key or an
> @@ -805,9 +804,13 @@ int xe_pxp_bo_key_check(struct xe_pxp *pxp, struct xe_bo *bo)
> * Returns: 0 if the key is valid, -ENODEV if PXP is disabled, -EINVAL if the
> * obj is not using PXP, -ENOEXEC if the key is not valid.
> */
> -int xe_pxp_obj_key_check(struct xe_pxp *pxp, struct drm_gem_object *obj)
> +int xe_pxp_obj_key_check(struct drm_gem_object *obj)
> {
> - return xe_pxp_bo_key_check(pxp, gem_to_xe_bo(obj));
> + struct xe_bo *bo = gem_to_xe_bo(obj);
> + struct xe_device *xe = xe_bo_device(bo);
> + struct xe_pxp *pxp = xe->pxp;
> +
> + return xe_pxp_bo_key_check(pxp, bo);
> }
>
> /**
> diff --git a/drivers/gpu/drm/xe/xe_pxp.h b/drivers/gpu/drm/xe/xe_pxp.h
> index 546b156d63aa..71a23280b900 100644
> --- a/drivers/gpu/drm/xe/xe_pxp.h
> +++ b/drivers/gpu/drm/xe/xe_pxp.h
> @@ -30,6 +30,6 @@ void xe_pxp_exec_queue_remove(struct xe_pxp *pxp, struct xe_exec_queue *q);
>
> int xe_pxp_key_assign(struct xe_pxp *pxp, struct xe_bo *bo);
> int xe_pxp_bo_key_check(struct xe_pxp *pxp, struct xe_bo *bo);
> -int xe_pxp_obj_key_check(struct xe_pxp *pxp, struct drm_gem_object *obj);
> +int xe_pxp_obj_key_check(struct drm_gem_object *obj);
>
> #endif /* __XE_PXP_H__ */
--
Jani Nikula, Intel
