All of lore.kernel.org
 help / color / mirror / Atom feed
From: Alan Previn <alan.previn.teres.alexis@intel.com>
To: igt-dev@lists.freedesktop.org
Cc: Alan Previn <alan.previn.teres.alexis@intel.com>,
	Ashutosh Dixit <ashutosh.dixit@intel.com>
Subject: [igt-dev] [PATCH i-g-t v13 05/16] Add PXP attribute support in batchbuffer and buffer_ops libs
Date: Tue,  5 Oct 2021 08:10:11 -0700	[thread overview]
Message-ID: <20211005151022.2161424-6-alan.previn.teres.alexis@intel.com> (raw)
In-Reply-To: <20211005151022.2161424-1-alan.previn.teres.alexis@intel.com>

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@intel.com>
Reviewed-by: Ashutosh Dixit <ashutosh.dixit@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 54f2ce45..8b718ba7 100644
--- a/lib/intel_bufops.h
+++ b/lib/intel_bufops.h
@@ -50,6 +50,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];
 };
@@ -160,6 +163,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

  parent reply	other threads:[~2021-10-05 15:14 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-05 15:10 [PATCH i-g-t v13 00/16] Introduce PXP Test Alan Previn
2021-10-05 15:10 ` [igt-dev] " Alan Previn
2021-10-05 15:10 ` [igt-dev] [PATCH i-g-t v13 01/16] i915_drm.h sync PXP default session Alan Previn
2021-10-05 19:14   ` Rodrigo Vivi
2021-10-05 19:31     ` Teres Alexis, Alan Previn
2021-10-05 19:34       ` Vivi, Rodrigo
2021-10-06 11:51         ` Petri Latvala
2021-10-05 15:10 ` [igt-dev] [PATCH i-g-t v13 02/16] i915_drm.h sync PXP object creation Alan Previn
2021-10-05 15:10 ` [igt-dev] [PATCH i-g-t v13 03/16] Add basic PXP testing of buffer and context alloc Alan Previn
2021-10-05 15:10 ` [igt-dev] [PATCH i-g-t v13 04/16] Perform a regular 3d copy as a control checkpoint Alan Previn
2021-10-05 15:10 ` Alan Previn [this message]
2021-10-05 15:10 ` [igt-dev] [PATCH i-g-t v13 06/16] Add MI_SET_APPID instruction definition Alan Previn
2021-10-05 15:10 ` [igt-dev] [PATCH i-g-t v13 07/16] Enable protected session cmd in gen12_render_copyfunc Alan Previn
2021-10-05 15:10 ` [igt-dev] [PATCH i-g-t v13 08/16] Add subtest to copy raw source to protected dest Alan Previn
2021-10-05 15:10 ` [igt-dev] [PATCH i-g-t v13 09/16] Add test where both src and dest are protected Alan Previn
2021-10-05 15:10 ` [igt-dev] [PATCH i-g-t v13 10/16] Verify PXP teardown occurred through suspend-resume Alan Previn
2021-10-05 15:10 ` [igt-dev] [PATCH i-g-t v13 11/16] Verify execbuf fails with stale PXP context after teardown Alan Previn
2021-10-05 15:10 ` [igt-dev] [PATCH i-g-t v13 12/16] Verify execbuf fails with stale PXP buffer " Alan Previn
2021-10-05 15:10 ` [igt-dev] [PATCH i-g-t v13 13/16] Verify execbuf ok with stale PXP buf in opt-out use Alan Previn
2021-10-05 15:10 ` [igt-dev] [PATCH i-g-t v13 14/16] Verify execution behavior with stale PXP assets through suspend-resume Alan Previn
2021-10-05 15:10 ` [igt-dev] [PATCH i-g-t v13 15/16] Verify protected surfaces are dma buffer sharable Alan Previn
2021-10-05 15:10 ` [igt-dev] [PATCH i-g-t v13 16/16] tests/i915_pxp: CRC validation for display tests Alan Previn
2021-10-05 16:11 ` [igt-dev] ✗ Fi.CI.BAT: failure for Introduce PXP Test (rev13) Patchwork
2021-10-05 17:22   ` Teres Alexis, Alan Previn
2021-10-06  7:32     ` Gupta, Anshuman
2021-10-06  9:50       ` Gupta, Anshuman
2021-10-05 19:59 ` [igt-dev] ✓ Fi.CI.BAT: success for Introduce PXP Test (rev14) Patchwork
2021-10-05 23:57 ` [igt-dev] ✗ Fi.CI.IGT: failure " Patchwork

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211005151022.2161424-6-alan.previn.teres.alexis@intel.com \
    --to=alan.previn.teres.alexis@intel.com \
    --cc=ashutosh.dixit@intel.com \
    --cc=igt-dev@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.