[igt-dev] [PATCH i-g-t v15 04/15] Add PXP attribute support in batchbuffer and buffer_ops libs
Alan Previn
alan.previn.teres.alexis at intel.com
Tue Oct 5 19:41:22 UTC 2021
Eventually when we get to testing PXP rendering capability,
we shall reuse lib's rendercopy feature. Rendercopy libraries
shall retrieve information about PXP-session-enablement and
which buffers are protected from these new flags.
Signed-off-by: Alan Previn <alan.previn.teres.alexis at intel.com>
Reviewed-by: Ashutosh Dixit <ashutosh.dixit at intel.com>
---
lib/intel_batchbuffer.c | 21 +++++++++++++++++++++
lib/intel_batchbuffer.h | 28 ++++++++++++++++++++++++++++
lib/intel_bufops.h | 15 +++++++++++++++
3 files changed, 64 insertions(+)
diff --git a/lib/intel_batchbuffer.c b/lib/intel_batchbuffer.c
index e3e649ca..291d706b 100644
--- a/lib/intel_batchbuffer.c
+++ b/lib/intel_batchbuffer.c
@@ -2347,6 +2347,27 @@ uint64_t intel_bb_offset_reloc_to_object(struct intel_bb *ibb,
delta, offset, presumed_offset);
}
+/*
+ * @intel_bb_set_pxp:
+ * @ibb: pointer to intel_bb
+ * @new_state: enable or disable pxp session
+ * @apptype: pxp session input identifies what type of session to enable
+ * @appid: pxp session input provides which appid to use
+ *
+ * This function merely stores the pxp state and session information to
+ * be retrieved and programmed later by supporting libraries such as
+ * gen12_render_copy that must program the HW within the same dispatch
+ */
+void intel_bb_set_pxp(struct intel_bb *ibb, bool new_state,
+ uint32_t apptype, uint32_t appid)
+{
+ igt_assert(ibb);
+
+ ibb->pxp.enabled = new_state;
+ ibb->pxp.apptype = new_state ? apptype : 0;
+ ibb->pxp.appid = new_state ? appid : 0;
+}
+
static void intel_bb_dump_execbuf(struct intel_bb *ibb,
struct drm_i915_gem_execbuffer2 *execbuf)
{
diff --git a/lib/intel_batchbuffer.h b/lib/intel_batchbuffer.h
index 0839d761..10fa66ee 100644
--- a/lib/intel_batchbuffer.h
+++ b/lib/intel_batchbuffer.h
@@ -446,6 +446,11 @@ typedef void (*igt_media_spinfunc_t)(int i915,
igt_media_spinfunc_t igt_get_media_spinfunc(int devid);
+struct igt_pxp {
+ bool enabled;
+ uint32_t apptype;
+ uint32_t appid;
+};
/*
* Batchbuffer without libdrm dependency
@@ -472,6 +477,7 @@ struct intel_bb {
bool supports_48b_address;
bool uses_full_ppgtt;
+ struct igt_pxp pxp;
uint32_t ctx;
uint32_t vm_id;
@@ -583,6 +589,27 @@ static inline void intel_bb_out(struct intel_bb *ibb, uint32_t dword)
igt_assert(intel_bb_offset(ibb) <= ibb->size);
}
+void intel_bb_set_pxp(struct intel_bb *ibb, bool new_state,
+ uint32_t apptype, uint32_t appid);
+
+static inline bool intel_bb_pxp_enabled(struct intel_bb *ibb)
+{
+ igt_assert(ibb);
+ return ibb->pxp.enabled;
+}
+
+static inline uint32_t intel_bb_pxp_apptype(struct intel_bb *ibb)
+{
+ igt_assert(ibb);
+ return ibb->pxp.apptype;
+}
+
+static inline uint32_t intel_bb_pxp_appid(struct intel_bb *ibb)
+{
+ igt_assert(ibb);
+ return ibb->pxp.appid;
+}
+
struct drm_i915_gem_exec_object2 *
intel_bb_add_object(struct intel_bb *ibb, uint32_t handle, uint64_t size,
uint64_t offset, uint64_t alignment, bool write);
@@ -697,3 +724,4 @@ typedef void (*igt_huc_copyfunc_t)(int fd, uint64_t ahnd,
igt_huc_copyfunc_t igt_get_huc_copyfunc(int devid);
#endif
+
diff --git a/lib/intel_bufops.h b/lib/intel_bufops.h
index 8148750f..25b43073 100644
--- a/lib/intel_bufops.h
+++ b/lib/intel_bufops.h
@@ -52,6 +52,9 @@ struct intel_buf {
uint32_t *ptr;
bool cpu_write;
+ /* Content Protection*/
+ bool is_protected;
+
/* For debugging purposes */
char name[INTEL_BUF_NAME_MAXSIZE + 1];
};
@@ -163,6 +166,18 @@ struct intel_buf *intel_buf_create_using_handle_and_size(struct buf_ops *bops,
int stride);
void intel_buf_destroy(struct intel_buf *buf);
+static inline void intel_buf_set_pxp(struct intel_buf *buf, bool new_pxp_state)
+{
+ igt_assert(buf);
+ buf->is_protected = new_pxp_state;
+}
+
+static inline bool intel_buf_pxp(const struct intel_buf *buf)
+{
+ igt_assert(buf);
+ return buf->is_protected;
+}
+
void *intel_buf_cpu_map(struct intel_buf *buf, bool write);
void *intel_buf_device_map(struct intel_buf *buf, bool write);
void intel_buf_unmap(struct intel_buf *buf);
--
2.25.1
More information about the igt-dev
mailing list