drm/i915/pxp & drm/xe/pxp: Figure out pxp instance from the gem object

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@intel.com>
Cc: Alan Previn <alan.previn.teres.alexis@intel.com>
Reviewed-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250228114527.3091620-1-jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c b/drivers/gpu/drm/i915/display/skl_universal_plane.c
index 3488c7ae6d8ac167203421dc3ed00f52e3919fb6..87d0034987228f0f3376937c22d6629b077116e9 100644 (file)
--- 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 c8107502190d23eff88b1390fd1c4a4d852cfe99..7796c4119ef5e5d543bd1df8d207a21eee72568d 100644 (file)
--- 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 9cf169665d7ca835149b5afb44e1d09edbb5d637..f8da693ad3ce753a686e4335fb0d5cf408a061d8 100644 (file)
--- 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 4ed97db5e7c6f86e9d6b3098516c5581f6d23c8f..7b19109845a355746c3843a138c0811ad559f1c7 100644 (file)
--- 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 d2eb8e1f6c4b42a0786db869a7e17fa1d6060a9c..97fd0ddf0b3a7d356b901e0c615421fb97adb5f7 100644 (file)
--- 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 3cd3f83e86b008a1ae66c184c1a734cb94ff54ad..f98e7836e5e7532ca9d84fcdf732f885274c28ab 100644 (file)
--- a/drivers/gpu/drm/xe/xe_pxp.c
+++ b/drivers/gpu/drm/xe/xe_pxp.c
@@ -791,7 +791,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
@@ -800,9 +799,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 546b156d63aa56c353dbd54d190c0199c525ccd9..71a23280b900087e927072cfb0fa47fa96676a83 100644 (file)
--- 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__ */