Skip to contentSkip to conversation

Introduce Intel PXP component - Mesa single session

RFC Superseded Huang, Sean Z 4 participants 21 messages Jan 18, 2021 – Jan 19, 2021

Subsystems (6)

v21 of 23 Superseded Latest is v23 →

lore
Share & tools
lore
#0 lore raw

v21 cover Introduce Intel PXP component - Mesa single session

PXP (Protected Xe Path) is an i915 component, available on GEN12+ that helps to establish the hardware protected session and manage the status of the alive software session, as well as its life cycle.

This patch series is to allow the kernel space to create and manage a single hardware session (a.k.a. default session or arbitrary session). So user can allocate the protected buffer, which is encrypted with the leverage of the arbitrary hardware session.

rev21:
#01
- Remove the term "Mesa" from the help description of Kconfig
- Remove unnecessary "select INTEL_MEI_TXE" from DRM_I915_PXP in Kconfig

#02
- Remove "#define KCR_INIT_MASK_SHIFT (16)", but still keep the macro in this .c file
- Write KCR_INIT reg inly for gen12 during boot, not required for gen13+

#03
- Remove debug print_hex_dump() from intel_pxp_tee_io_message()
- In struct i915_pxp_component_ops, change "receive" to "recv"

#04:
- Rename SESSION_TYPE_TYPE0, SESSION_TYPE_TYPE1 as SESSION_TYPE_HWDRM,
SESSION_TYPE_NONHWDRM to have better meaning.
- Remove enum pxp_session_types and enum pxp_protection_modes from
single session patch series.

#05
In intel_pxp_cmd.c:
- Remove the debug print as well as print_hex_dump()
- Should call i915_gem_object_flush_map() before unpin map
- Using "goto label" instead of bool such as is_engine_pm_get
- We should always return the error if any, instead of skip with i915_request_set_error_once()

#06
- Fix bug, access i915 pointer before assigning the value at intel_pxp_irq_handler()
- Writing register GEN11_CRYPTO_RSVD_INTR_ENABLE to enable the PXP irq
- Remove the unnecessary comment for GEN11_CRYPTO_RSVD_INTR_MASK

#07
- Bug fixing, we need to set the PXP_GLOBAL_TERMINATE 0x320f8 register after arb session termination
- Remove enum pxp_session_types and enum pxp_protection_modes from
single session patch series.

#11
- Fix "Fi.CI.CHECKPATCH" warnings

#12
- Only allow set I915_CONTEXT_PARAM_PROTECTED_CONTENT during context
creation (i915_gem_context_create_ioctl), but not allow during context set param (i915_gem_context_setparam_ioctl)

Anshuman Gupta (1):
drm/i915/pxp: Add plane decryption support

Bommu Krishnaiah (2):
drm/i915/uapi: introduce drm_i915_gem_create_ext drm/i915/pxp: User interface for Protected buffer

Huang, Sean Z (9):
drm/i915/pxp: Introduce Intel PXP component drm/i915/pxp: set KCR reg init during the boot time drm/i915/pxp: Implement funcs to create the TEE channel drm/i915/pxp: Create the arbitrary session after boot drm/i915/pxp: Func to send hardware session termination drm/i915/pxp: Enable PXP irq worker and callback stub drm/i915/pxp: Destroy arb session upon teardown drm/i915/pxp: Enable PXP power management drm/i915/pxp: Expose session state for display protection flip

Vitaly Lubart (1):
mei: pxp: export pavp client to me client bus

 drivers/gpu/drm/i915/Kconfig                  |  21 ++
 drivers/gpu/drm/i915/Makefile                 |   9 +
 drivers/gpu/drm/i915/display/intel_sprite.c   |  21 +-
 drivers/gpu/drm/i915/gem/i915_gem_context.c   |  15 +-
 drivers/gpu/drm/i915/gem/i915_gem_context.h   |   5 +
 .../gpu/drm/i915/gem/i915_gem_context_types.h |   1 +
 drivers/gpu/drm/i915/gem/i915_gem_create.c    |  68 +++++-
 .../gpu/drm/i915/gem/i915_gem_object_types.h  |   5 +
 drivers/gpu/drm/i915/gt/intel_gt.c            |   5 +
 drivers/gpu/drm/i915/gt/intel_gt_irq.c        |  14 ++
 drivers/gpu/drm/i915/gt/intel_gt_pm.c         |   4 +
 drivers/gpu/drm/i915/gt/intel_gt_types.h      |   3 +
 drivers/gpu/drm/i915/i915_drv.c               |   7 +-
 drivers/gpu/drm/i915/i915_drv.h               |   6 +
 drivers/gpu/drm/i915/i915_reg.h               |   2 +
 drivers/gpu/drm/i915/pxp/intel_pxp.c          | 185 ++++++++++++++
 drivers/gpu/drm/i915/pxp/intel_pxp.h          |  64 +++++
 drivers/gpu/drm/i915/pxp/intel_pxp_arb.c      | 208 ++++++++++++++++
 drivers/gpu/drm/i915/pxp/intel_pxp_arb.h      |  17 ++
 drivers/gpu/drm/i915/pxp/intel_pxp_cmd.c      | 223 +++++++++++++++++
 drivers/gpu/drm/i915/pxp/intel_pxp_cmd.h      |  19 ++
 drivers/gpu/drm/i915/pxp/intel_pxp_context.c  |  28 +++
 drivers/gpu/drm/i915/pxp/intel_pxp_context.h  |  15 ++
 drivers/gpu/drm/i915/pxp/intel_pxp_pm.c       |  65 +++++
 drivers/gpu/drm/i915/pxp/intel_pxp_pm.h       |  31 +++
 drivers/gpu/drm/i915/pxp/intel_pxp_tee.c      | 202 +++++++++++++++
 drivers/gpu/drm/i915/pxp/intel_pxp_tee.h      |  17 ++
 drivers/gpu/drm/i915/pxp/intel_pxp_types.h    |  38 +++
 drivers/misc/mei/Kconfig                      |   2 +
 drivers/misc/mei/Makefile                     |   1 +
 drivers/misc/mei/pxp/Kconfig                  |  13 +
 drivers/misc/mei/pxp/Makefile                 |   7 +
 drivers/misc/mei/pxp/mei_pxp.c                | 230 ++++++++++++++++++
 drivers/misc/mei/pxp/mei_pxp.h                |  18 ++
 include/drm/i915_component.h                  |   1 +
 include/drm/i915_pxp_tee_interface.h          |  45 ++++
 include/uapi/drm/i915_drm.h                   |  66 +++++
 37 files changed, 1671 insertions(+), 10 deletions(-)
 create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp.c
 create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp.h
 create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_arb.c
 create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_arb.h
 create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_cmd.c
 create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_cmd.h
 create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_context.c
 create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_context.h
 create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_pm.c
 create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_pm.h
 create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_tee.c
 create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_tee.h
 create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_types.h
 create mode 100644 drivers/misc/mei/pxp/Kconfig
 create mode 100644 drivers/misc/mei/pxp/Makefile
 create mode 100644 drivers/misc/mei/pxp/mei_pxp.c
 create mode 100644 drivers/misc/mei/pxp/mei_pxp.h
 create mode 100644 include/drm/i915_pxp_tee_interface.h
Signature · 6 lines
2.17.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

RFC v21 1/13 drm/i915/pxp: Introduce Intel PXP component

PXP (Protected Xe Path) is an i915 componment, available on GEN12+, that helps to establish the hardware protected session and manage the status of the alive software session, as well as its life cycle.

This patch series is to allow the kernel space to create and manage a single hardware session (a.k.a default session or arbitrary session). So Mesa can allocate the protected buffer, which is encrypted with the leverage of the arbitrary hardware session.

rev21:
- Remove the term "Mesa" from the help description of Kconfig
- Remove unnecessary "select INTEL_MEI_TXE" from DRM_I915_PXP in Kconfig

---
 drivers/gpu/drm/i915/Kconfig                 | 21 ++++++++++++++
 drivers/gpu/drm/i915/Makefile                |  5 ++++
 drivers/gpu/drm/i915/gt/intel_gt.c           |  5 ++++
 drivers/gpu/drm/i915/gt/intel_gt_types.h     |  3 ++
 drivers/gpu/drm/i915/pxp/intel_pxp.c         | 29 ++++++++++++++++++++
 drivers/gpu/drm/i915/pxp/intel_pxp.h         | 25 +++++++++++++++++
 drivers/gpu/drm/i915/pxp/intel_pxp_context.c | 25 +++++++++++++++++
 drivers/gpu/drm/i915/pxp/intel_pxp_context.h | 15 ++++++++++
 drivers/gpu/drm/i915/pxp/intel_pxp_types.h   | 23 ++++++++++++++++
 9 files changed, 151 insertions(+)
 create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp.c
 create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp.h
 create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_context.c
 create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_context.h
 create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_types.h
drivers/gpu/drm/i915/Kconfig +21 -0
index 1e1cb245fca7..f0a8c46126d8 100644
@@ -130,6 +130,27 @@ config DRM_I915_GVT_KVMGT
 	  Choose this option if you want to enable KVMGT support for
 	  Intel GVT-g.
 
+config DRM_I915_PXP
+	bool "Enable Intel PXP support for Intel Gen12+ platform"
+	depends on DRM_I915
+	select INTEL_MEI
+	select INTEL_MEI_ME
+	select INTEL_MEI_PXP
+	default y
+	help
+	  This option selects INTEL_MEI_ME if it isn't already selected to
+	  enabled full PXP Services on Intel platforms.
+
+	  PXP (Protected Xe Path) is an i915 componment, available on GEN12+,
+	  that helps to establish the hardware protected session and manage
+	  the status of the alive software session, as well as its life cycle.
+
+	  This patch series is to allow the kernel space to create and
+	  manage a single hardware session (a.k.a default session or
+	  arbitrary session). So user space can allocate the protected buffer,
+	  which is encrypted with the leverage of the arbitrary hardware
+	  session.
+
 menu "drm/i915 Debugging"
 depends on DRM_I915
 depends on EXPERT
drivers/gpu/drm/i915/Makefile +5 -0
index 006dec54408d..9d27e2d8decc 100644
@@ -265,6 +265,11 @@ i915-y += \
 
 i915-y += i915_perf.o
 
+# Protected execution platform (PXP) support
+i915-$(CONFIG_DRM_I915_PXP) += \
+	pxp/intel_pxp.o \
+	pxp/intel_pxp_context.o
+
 # Post-mortem debug and GPU hang state capture
 i915-$(CONFIG_DRM_I915_CAPTURE_ERROR) += i915_gpu_error.o
 i915-$(CONFIG_DRM_I915_SELFTEST) += \
drivers/gpu/drm/i915/gt/intel_gt.c +5 -0
index d8e1ab412634..336ad7deae06 100644
@@ -18,6 +18,7 @@
 #include "intel_uncore.h"
 #include "intel_pm.h"
 #include "shmem_utils.h"
+#include "pxp/intel_pxp.h"
 
 void intel_gt_init_early(struct intel_gt *gt, struct drm_i915_private *i915)
 {
@@ -584,6 +585,8 @@ int intel_gt_init(struct intel_gt *gt)
 	if (err)
 		goto err_gt;
 
+	intel_pxp_init(&gt->pxp);
+
 	goto out_fw;
 err_gt:
 	__intel_gt_disable(gt);
@@ -607,6 +610,8 @@ void intel_gt_driver_remove(struct intel_gt *gt)
 {
 	__intel_gt_disable(gt);
 
+	intel_pxp_fini(&gt->pxp);
+
 	intel_uc_driver_remove(&gt->uc);
 
 	intel_engines_release(gt);
drivers/gpu/drm/i915/gt/intel_gt_types.h +3 -0
index a83d3e18254d..c4760e2722fd 100644
@@ -23,6 +23,7 @@
 #include "intel_rc6_types.h"
 #include "intel_rps_types.h"
 #include "intel_wakeref.h"
+#include "pxp/intel_pxp_types.h"
 
 struct drm_i915_private;
 struct i915_ggtt;
@@ -145,6 +146,8 @@ struct intel_gt {
 		/* Slice/subslice/EU info */
 		struct sseu_dev_info sseu;
 	} info;
+
+	struct intel_pxp pxp;
 };
 
 enum intel_gt_scratch_field {
drivers/gpu/drm/i915/pxp/intel_pxp.c new file +29 -0
new file mode 100644
index 000000000000..9bc3c7e30654
@@ -0,0 +1,29 @@
+// SPDX-License-Identifier: MIT
+/*
+ * Copyright(c) 2020 Intel Corporation.
+ */
+#include "i915_drv.h"
+#include "intel_pxp.h"
+#include "intel_pxp_context.h"
+
+void intel_pxp_init(struct intel_pxp *pxp)
+{
+	struct intel_gt *gt = container_of(pxp, struct intel_gt, pxp);
+
+	if (INTEL_GEN(gt->i915) < 12)
+		return;
+
+	intel_pxp_ctx_init(&pxp->ctx);
+
+	drm_info(&gt->i915->drm, "Protected Xe Path (PXP) protected content support initialized\n");
+}
+
+void intel_pxp_fini(struct intel_pxp *pxp)
+{
+	struct intel_gt *gt = container_of(pxp, struct intel_gt, pxp);
+
+	if (INTEL_GEN(gt->i915) < 12)
+		return;
+
+	intel_pxp_ctx_fini(&pxp->ctx);
+}
drivers/gpu/drm/i915/pxp/intel_pxp.h new file +25 -0
new file mode 100644
index 000000000000..f47bc6bea34f
@@ -0,0 +1,25 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright(c) 2020, Intel Corporation. All rights reserved.
+ */
+
+#ifndef __INTEL_PXP_H__
+#define __INTEL_PXP_H__
+
+#include "intel_pxp_types.h"
+
+#ifdef CONFIG_DRM_I915_PXP
+void intel_pxp_init(struct intel_pxp *pxp);
+void intel_pxp_fini(struct intel_pxp *pxp);
+#else
+static inline void intel_pxp_init(struct intel_pxp *pxp)
+{
+	return 0;
+}
+
+static inline void intel_pxp_fini(struct intel_pxp *pxp)
+{
+}
+#endif
+
+#endif /* __INTEL_PXP_H__ */
drivers/gpu/drm/i915/pxp/intel_pxp_context.c new file +25 -0
new file mode 100644
index 000000000000..2be6bf2f0d0f
@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: MIT
+/*
+ * Copyright(c) 2020, Intel Corporation. All rights reserved.
+ */
+
+#include "intel_pxp_context.h"
+
+/**
+ * intel_pxp_ctx_init - To init a pxp context.
+ * @ctx: pointer to ctx structure.
+ */
+void intel_pxp_ctx_init(struct pxp_context *ctx)
+{
+	mutex_init(&ctx->mutex);
+	ctx->inited = true;
+}
+
+/**
+ * intel_pxp_ctx_fini - To finish the pxp context.
+ * @ctx: pointer to ctx structure.
+ */
+void intel_pxp_ctx_fini(struct pxp_context *ctx)
+{
+	ctx->inited = false;
+}
drivers/gpu/drm/i915/pxp/intel_pxp_context.h new file +15 -0
new file mode 100644
index 000000000000..f51021c33d45
@@ -0,0 +1,15 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright(c) 2020, Intel Corporation. All rights reserved.
+ */
+
+#ifndef __INTEL_PXP_CONTEXT_H__
+#define __INTEL_PXP_CONTEXT_H__
+
+#include <linux/mutex.h>
+#include "intel_pxp_types.h"
+
+void intel_pxp_ctx_init(struct pxp_context *ctx);
+void intel_pxp_ctx_fini(struct pxp_context *ctx);
+
+#endif /* __INTEL_PXP_CONTEXT_H__ */
drivers/gpu/drm/i915/pxp/intel_pxp_types.h new file +23 -0
new file mode 100644
index 000000000000..f9b40ea98b1b
@@ -0,0 +1,23 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright(c) 2020, Intel Corporation. All rights reserved.
+ */
+
+#ifndef __INTEL_PXP_TYPES_H__
+#define __INTEL_PXP_TYPES_H__
+
+#include <linux/mutex.h>
+
+/* struct pxp_context - Represents combined view of driver and logical HW states. */
+struct pxp_context {
+	/** @mutex: mutex to protect the pxp context */
+	struct mutex mutex;
+
+	bool inited;
+};
+
+struct intel_pxp {
+	struct pxp_context ctx;
+};
+
+#endif /* __INTEL_PXP_TYPES_H__ */
Signature · 6 lines
2.17.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#2 lore raw

RFC v21 13/13 drm/i915/pxp: Add plane decryption support

Add support to enable/disable PLANE_SURF Decryption Request bit. It requires only to enable plane decryption support when following condition met.
1. pxp session is enabled.
2. Buffer object is protected.

v2:
- Rebased to libva_cp-drm-tip_tgl_cp tree.
- Used gen fb obj user_flags instead gem_object_metadata. [Krishna]

v3:
- intel_pxp_gem_object_status() API changes.

Cc Bommu Krishnaiah <[email protected]>
Cc Huang Sean Z <[email protected]>
Cc Gaurav Kumar <[email protected]>
---
 drivers/gpu/drm/i915/display/intel_sprite.c | 21 ++++++++++++++++++---
 drivers/gpu/drm/i915/i915_reg.h             |  1 +
 2 files changed, 19 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/display/intel_sprite.c +18 -3
index cf3589fd0ddb..39f8c922ce66 100644
@@ -39,6 +39,8 @@
 #include <drm/drm_plane_helper.h>
 #include <drm/drm_rect.h>
 
+#include "pxp/intel_pxp.h"
+
 #include "i915_drv.h"
 #include "i915_trace.h"
 #include "i915_vgpu.h"
@@ -768,6 +770,11 @@ icl_program_input_csc(struct intel_plane *plane,
 			  PLANE_INPUT_CSC_POSTOFF(pipe, plane_id, 2), 0x0);
 }
 
+static bool intel_fb_obj_protected(const struct drm_i915_gem_object *obj)
+{
+	return obj->user_flags & I915_BO_PROTECTED ? true : false;
+}
+
 static void
 skl_plane_async_flip(struct intel_plane *plane,
 		     const struct intel_crtc_state *crtc_state,
@@ -804,6 +811,7 @@ skl_program_plane(struct intel_plane *plane,
 	u32 surf_addr = plane_state->color_plane[color_plane].offset;
 	u32 stride = skl_plane_stride(plane_state, color_plane);
 	const struct drm_framebuffer *fb = plane_state->hw.fb;
+	const struct drm_i915_gem_object *obj = intel_fb_obj(fb);
 	int aux_plane = intel_main_to_aux_plane(fb, color_plane);
 	int crtc_x = plane_state->uapi.dst.x1;
 	int crtc_y = plane_state->uapi.dst.y1;
@@ -814,7 +822,7 @@ skl_program_plane(struct intel_plane *plane,
 	u8 alpha = plane_state->hw.alpha >> 8;
 	u32 plane_color_ctl = 0, aux_dist = 0;
 	unsigned long irqflags;
-	u32 keymsk, keymax;
+	u32 keymsk, keymax, plane_surf;
 	u32 plane_ctl = plane_state->ctl;
 
 	plane_ctl |= skl_plane_ctl_crtc(crtc_state);
@@ -890,8 +898,15 @@ skl_program_plane(struct intel_plane *plane,
 	 * the control register just before the surface register.
 	 */
 	intel_de_write_fw(dev_priv, PLANE_CTL(pipe, plane_id), plane_ctl);
-	intel_de_write_fw(dev_priv, PLANE_SURF(pipe, plane_id),
-			  intel_plane_ggtt_offset(plane_state) + surf_addr);
+	plane_surf = intel_plane_ggtt_offset(plane_state) + surf_addr;
+
+	if (intel_pxp_gem_object_status(dev_priv) &&
+	    intel_fb_obj_protected(obj))
+		plane_surf |= PLANE_SURF_DECRYPTION_ENABLED;
+	else
+		plane_surf &= ~PLANE_SURF_DECRYPTION_ENABLED;
+
+	intel_de_write_fw(dev_priv, PLANE_SURF(pipe, plane_id), plane_surf);
 
 	if (plane_state->scaler_id >= 0)
 		skl_program_scaler(plane, crtc_state, plane_state);
drivers/gpu/drm/i915/i915_reg.h +1 -0
index 97bcecada87f..7a4817054bc8 100644
@@ -7208,6 +7208,7 @@ enum {
 #define _PLANE_SURF_3(pipe)	_PIPE(pipe, _PLANE_SURF_3_A, _PLANE_SURF_3_B)
 #define PLANE_SURF(pipe, plane)	\
 	_MMIO_PLANE(plane, _PLANE_SURF_1(pipe), _PLANE_SURF_2(pipe))
+#define   PLANE_SURF_DECRYPTION_ENABLED		REG_BIT(2)
 
 #define _PLANE_OFFSET_1_B			0x711a4
 #define _PLANE_OFFSET_2_B			0x712a4
Signature · 6 lines
2.26.2

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#3 lore raw

RFC v21 2/13 drm/i915/pxp: set KCR reg init during the boot time

In reply to Huang, Sean Z

Set the KCR init during the boot time, which is
required by hardware, to allow us doing further
protection operation such as sending commands to
GPU or TEE.

rev21:
- Remove "#define KCR_INIT_MASK_SHIFT (16)", but still keep the macro in this .c file
- Write KCR_INIT reg inly for gen12 during boot, not required for gen13+

---
 drivers/gpu/drm/i915/pxp/intel_pxp.c | 9 +++++++++
 1 file changed, 9 insertions(+)
drivers/gpu/drm/i915/pxp/intel_pxp.c +9 -0
index 9bc3c7e30654..4e9cee7df4f2 100644
@@ -6,6 +6,12 @@
 #include "intel_pxp.h"
 #include "intel_pxp_context.h"
 
+/* KCR register definitions */
+#define KCR_INIT            _MMIO(0x320f0)
+
+/* Setting KCR Init bit is required after system boot */
+#define KCR_INIT_ALLOW_DISPLAY_ME_WRITES (BIT(14) | (BIT(14) << 16))
+
 void intel_pxp_init(struct intel_pxp *pxp)
 {
 	struct intel_gt *gt = container_of(pxp, struct intel_gt, pxp);
@@ -15,6 +21,9 @@ void intel_pxp_init(struct intel_pxp *pxp)
 
 	intel_pxp_ctx_init(&pxp->ctx);
 
+	if (INTEL_GEN(gt->i915) == 12)
+		intel_uncore_write(gt->uncore, KCR_INIT, KCR_INIT_ALLOW_DISPLAY_ME_WRITES);
+
 	drm_info(&gt->i915->drm, "Protected Xe Path (PXP) protected content support initialized\n");
 }
 
Signature · 6 lines
2.17.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#4 lore raw

RFC v21 3/13 drm/i915/pxp: Implement funcs to create the TEE channel

In reply to Huang, Sean Z

Implement the funcs to create the TEE channel, so kernel can send the TEE commands directly to TEE for creating the arbitrary (default) session.

rev21:
- Remove debug print_hex_dump() from intel_pxp_tee_io_message()
- In struct i915_pxp_component_ops, change "receive" to "recv"

---
 drivers/gpu/drm/i915/Makefile            |   3 +-
 drivers/gpu/drm/i915/i915_drv.c          |   1 +
 drivers/gpu/drm/i915/i915_drv.h          |   6 ++
 drivers/gpu/drm/i915/pxp/intel_pxp.c     |   5 +
 drivers/gpu/drm/i915/pxp/intel_pxp_tee.c | 129 +++++++++++++++++++++++
 drivers/gpu/drm/i915/pxp/intel_pxp_tee.h |  14 +++
 include/drm/i915_component.h             |   1 +
 include/drm/i915_pxp_tee_interface.h     |  45 ++++++++
 8 files changed, 203 insertions(+), 1 deletion(-)
 create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_tee.c
 create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_tee.h
 create mode 100644 include/drm/i915_pxp_tee_interface.h
drivers/gpu/drm/i915/Makefile +2 -1
index 9d27e2d8decc..07bb0400e016 100644
@@ -268,7 +268,8 @@ i915-y += i915_perf.o
 # Protected execution platform (PXP) support
 i915-$(CONFIG_DRM_I915_PXP) += \
 	pxp/intel_pxp.o \
-	pxp/intel_pxp_context.o
+	pxp/intel_pxp_context.o \
+	pxp/intel_pxp_tee.o
 
 # Post-mortem debug and GPU hang state capture
 i915-$(CONFIG_DRM_I915_CAPTURE_ERROR) += i915_gpu_error.o
drivers/gpu/drm/i915/i915_drv.c +1 -0
index f5666b44ea9d..e9cb8e9ca172 100644
@@ -322,6 +322,7 @@ static int i915_driver_early_probe(struct drm_i915_private *dev_priv)
 	mutex_init(&dev_priv->wm.wm_mutex);
 	mutex_init(&dev_priv->pps_mutex);
 	mutex_init(&dev_priv->hdcp_comp_mutex);
+	mutex_init(&dev_priv->pxp_tee_comp_mutex);
 
 	i915_memcpy_init_early(dev_priv);
 	intel_runtime_pm_init_early(&dev_priv->runtime_pm);
drivers/gpu/drm/i915/i915_drv.h +6 -0
index 8376cff5ba86..d2ae5874c516 100644
@@ -1209,6 +1209,12 @@ struct drm_i915_private {
 	/* Mutex to protect the above hdcp component related values. */
 	struct mutex hdcp_comp_mutex;
 
+	struct i915_pxp_comp_master *pxp_tee_master;
+	bool pxp_tee_comp_added;
+
+	/* Mutex to protect the above pxp_tee component related values. */
+	struct mutex pxp_tee_comp_mutex;
+
 	I915_SELFTEST_DECLARE(struct i915_selftest_stash selftest;)
 
 	/*
drivers/gpu/drm/i915/pxp/intel_pxp.c +5 -0
index 4e9cee7df4f2..81cf845d1b94 100644
@@ -5,6 +5,7 @@
 #include "i915_drv.h"
 #include "intel_pxp.h"
 #include "intel_pxp_context.h"
+#include "intel_pxp_tee.h"
 
 /* KCR register definitions */
 #define KCR_INIT            _MMIO(0x320f0)
@@ -24,6 +25,8 @@ void intel_pxp_init(struct intel_pxp *pxp)
 	if (INTEL_GEN(gt->i915) == 12)
 		intel_uncore_write(gt->uncore, KCR_INIT, KCR_INIT_ALLOW_DISPLAY_ME_WRITES);
 
+	intel_pxp_tee_component_init(pxp);
+
 	drm_info(&gt->i915->drm, "Protected Xe Path (PXP) protected content support initialized\n");
 }
 
@@ -34,5 +37,7 @@ void intel_pxp_fini(struct intel_pxp *pxp)
 	if (INTEL_GEN(gt->i915) < 12)
 		return;
 
+	intel_pxp_tee_component_fini(pxp);
+
 	intel_pxp_ctx_fini(&pxp->ctx);
 }
drivers/gpu/drm/i915/pxp/intel_pxp_tee.c new file +129 -0

129 lines not on this page · raw message

drivers/gpu/drm/i915/pxp/intel_pxp_tee.h new file +14 -0
new file mode 100644
index 000000000000..4b5e3edb1d9b
@@ -0,0 +1,14 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright(c) 2020, Intel Corporation. All rights reserved.
+ */
+
+#ifndef __INTEL_PXP_TEE_H__
+#define __INTEL_PXP_TEE_H__
+
+#include "intel_pxp.h"
+
+void intel_pxp_tee_component_init(struct intel_pxp *pxp);
+void intel_pxp_tee_component_fini(struct intel_pxp *pxp);
+
+#endif /* __INTEL_PXP_TEE_H__ */
include/drm/i915_component.h +1 -0
index 55c3b123581b..c1e2a43d2d1e 100644
@@ -29,6 +29,7 @@
 enum i915_component_type {
 	I915_COMPONENT_AUDIO = 1,
 	I915_COMPONENT_HDCP,
+	I915_COMPONENT_PXP
 };
 
 /* MAX_PORT is the number of port
include/drm/i915_pxp_tee_interface.h new file +45 -0

45 lines not on this page · raw message

Signature · 6 lines
2.17.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#5 lore raw

RFC v21 4/13 drm/i915/pxp: Create the arbitrary session after boot

In reply to Huang, Sean Z

Create the arbitrary session, with the fixed session id 0xf, after system boot, for the case that application allocates the protected buffer without establishing any protection session. Because the hardware requires at least one alive session for protected buffer creation. This arbitrary session needs to be re-created after teardown or power event because hardware encryption key won't be valid after such cases.

rev21:
- Rename SESSION_TYPE_TYPE0, SESSION_TYPE_TYPE1 as SESSION_TYPE_HWDRM, SESSION_TYPE_NONHWDRM to have better meaning.
- Remove enum pxp_session_types and enum pxp_protection_modes from single session patch series.

---
 drivers/gpu/drm/i915/Makefile                |   1 +
 drivers/gpu/drm/i915/pxp/intel_pxp.c         |   1 +
 drivers/gpu/drm/i915/pxp/intel_pxp_arb.c     | 122 +++++++++++++++++++
 drivers/gpu/drm/i915/pxp/intel_pxp_arb.h     |  16 +++
 drivers/gpu/drm/i915/pxp/intel_pxp_context.h |   1 +
 drivers/gpu/drm/i915/pxp/intel_pxp_tee.c     |  73 +++++++++++
 drivers/gpu/drm/i915/pxp/intel_pxp_tee.h     |   3 +
 drivers/gpu/drm/i915/pxp/intel_pxp_types.h   |   4 +
 8 files changed, 221 insertions(+)
 create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_arb.c
 create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_arb.h
drivers/gpu/drm/i915/Makefile +1 -0
index 07bb0400e016..e3b7f6b5dadb 100644
@@ -268,6 +268,7 @@ i915-y += i915_perf.o
 # Protected execution platform (PXP) support
 i915-$(CONFIG_DRM_I915_PXP) += \
 	pxp/intel_pxp.o \
+	pxp/intel_pxp_arb.o \
 	pxp/intel_pxp_context.o \
 	pxp/intel_pxp_tee.o
 
drivers/gpu/drm/i915/pxp/intel_pxp.c +1 -0
index 81cf845d1b94..4f033907564a 100644
@@ -6,6 +6,7 @@
 #include "intel_pxp.h"
 #include "intel_pxp_context.h"
 #include "intel_pxp_tee.h"
+#include "intel_pxp_arb.h"
 
 /* KCR register definitions */
 #define KCR_INIT            _MMIO(0x320f0)
drivers/gpu/drm/i915/pxp/intel_pxp_arb.c new file +122 -0

122 lines not on this page · raw message

drivers/gpu/drm/i915/pxp/intel_pxp_arb.h new file +16 -0
new file mode 100644
index 000000000000..2196153dd879
@@ -0,0 +1,16 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright(c) 2020, Intel Corporation. All rights reserved.
+ */
+
+#ifndef __INTEL_PXP_ARB_H__
+#define __INTEL_PXP_ARB_H__
+
+#include <linux/types.h>
+
+struct intel_pxp;
+
+int intel_pxp_arb_create_session(struct intel_pxp *pxp);
+bool intel_pxp_arb_session_is_in_play(struct intel_pxp *pxp);
+
+#endif /* __INTEL_PXP_ARB_H__ */
drivers/gpu/drm/i915/pxp/intel_pxp_context.h +1 -0
index f51021c33d45..bf2feb4aaf6d 100644
@@ -8,6 +8,7 @@
 
 #include <linux/mutex.h>
 #include "intel_pxp_types.h"
+#include "intel_pxp_arb.h"
 
 void intel_pxp_ctx_init(struct pxp_context *ctx);
 void intel_pxp_ctx_fini(struct pxp_context *ctx);
drivers/gpu/drm/i915/pxp/intel_pxp_tee.c +73 -0

95 lines not on this page · raw message

drivers/gpu/drm/i915/pxp/intel_pxp_tee.h +3 -0
index 4b5e3edb1d9b..c46f9033f709 100644
@@ -11,4 +11,7 @@
 void intel_pxp_tee_component_init(struct intel_pxp *pxp);
 void intel_pxp_tee_component_fini(struct intel_pxp *pxp);
 
+int intel_pxp_tee_cmd_create_arb_session(struct intel_pxp *pxp,
+					 int arb_session_id);
+
 #endif /* __INTEL_PXP_TEE_H__ */
drivers/gpu/drm/i915/pxp/intel_pxp_types.h +4 -0
index f9b40ea98b1b..e2bd320302c2 100644
@@ -14,6 +14,10 @@ struct pxp_context {
 	struct mutex mutex;
 
 	bool inited;
+
+	bool arb_is_in_play;
+
+	bool flag_display_hm_surface_keys;
 };
 
 struct intel_pxp {
Signature · 6 lines
2.17.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#6 lore raw

RFC v21 5/13 drm/i915/pxp: Func to send hardware session termination

In reply to Huang, Sean Z

Implement the functions to allow PXP to send a GPU command, in order to terminate the hardware session, so hardware can recycle this session slot for the next usage.

rev21:
In intel_pxp_cmd.c:
- Remove the debug print as well as print_hex_dump()
- Should call i915_gem_object_flush_map() before unpin map
- Using "goto label" instead of bool such as is_engine_pm_get
- We should always return the error if any, instead of skip with i915_request_set_error_once()

---
 drivers/gpu/drm/i915/Makefile              |   1 +
 drivers/gpu/drm/i915/pxp/intel_pxp.c       |  13 +++
 drivers/gpu/drm/i915/pxp/intel_pxp_cmd.c   | 124 +++++++++++++++++++++
 drivers/gpu/drm/i915/pxp/intel_pxp_cmd.h   |  18 +++
 drivers/gpu/drm/i915/pxp/intel_pxp_types.h |   4 +
 5 files changed, 160 insertions(+)
 create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_cmd.c
 create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_cmd.h
drivers/gpu/drm/i915/Makefile +1 -0
index e3b7f6b5dadb..c931ef5e8a85 100644
@@ -269,6 +269,7 @@ i915-y += i915_perf.o
 i915-$(CONFIG_DRM_I915_PXP) += \
 	pxp/intel_pxp.o \
 	pxp/intel_pxp_arb.o \
+	pxp/intel_pxp_cmd.o \
 	pxp/intel_pxp_context.o \
 	pxp/intel_pxp_tee.o
 
drivers/gpu/drm/i915/pxp/intel_pxp.c +13 -0
index 4f033907564a..f71677a84405 100644
@@ -17,10 +17,23 @@
 void intel_pxp_init(struct intel_pxp *pxp)
 {
 	struct intel_gt *gt = container_of(pxp, struct intel_gt, pxp);
+	int i;
 
 	if (INTEL_GEN(gt->i915) < 12)
 		return;
 
+	/* Find the first VCS engine present */
+	for (i = 0; i < I915_MAX_VCS; i++) {
+		if (HAS_ENGINE(gt, _VCS(i))) {
+			pxp->vcs_engine = gt->engine[_VCS(i)];
+			break;
+		}
+	}
+	if (!pxp->vcs_engine) {
+		drm_err(&gt->i915->drm, "Could not find a VCS engine\n");
+		return;
+	}
+
 	intel_pxp_ctx_init(&pxp->ctx);
 
 	if (INTEL_GEN(gt->i915) == 12)
drivers/gpu/drm/i915/pxp/intel_pxp_cmd.c new file +124 -0

124 lines not on this page · raw message

drivers/gpu/drm/i915/pxp/intel_pxp_cmd.h new file +18 -0
new file mode 100644
index 000000000000..d04463962421
@@ -0,0 +1,18 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright(c) 2020, Intel Corporation. All rights reserved.
+ */
+
+#ifndef __INTEL_PXP_CMD_H__
+#define __INTEL_PXP_CMD_H__
+
+#include "gt/intel_gt_buffer_pool.h"
+#include "intel_pxp.h"
+
+struct i915_vma *intel_pxp_cmd_get_batch(struct intel_pxp *pxp,
+					 struct intel_context *ce,
+					 struct intel_gt_buffer_pool_node *pool,
+					 u32 *cmd_buf, int cmd_size_in_dw);
+
+int intel_pxp_cmd_submit(struct intel_pxp *pxp, u32 *cmd, int cmd_size_in_dw);
+#endif /* __INTEL_PXP_SM_H__ */
drivers/gpu/drm/i915/pxp/intel_pxp_types.h +4 -0
index e2bd320302c2..19d43b43e483 100644
@@ -8,6 +8,8 @@
 
 #include <linux/mutex.h>
 
+struct intel_engine_cs;
+
 /* struct pxp_context - Represents combined view of driver and logical HW states. */
 struct pxp_context {
 	/** @mutex: mutex to protect the pxp context */
@@ -22,6 +24,8 @@ struct pxp_context {
 
 struct intel_pxp {
 	struct pxp_context ctx;
+
+	struct intel_engine_cs *vcs_engine;
 };
 
 #endif /* __INTEL_PXP_TYPES_H__ */
Signature · 6 lines
2.17.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#7 lore raw

RFC v21 6/13 drm/i915/pxp: Enable PXP irq worker and callback stub

In reply to Huang, Sean Z

Create the irq worker that serves as callback handler, those callback stubs should be called while the hardware key teardown occurs.

rev21:
- Fix bug, access i915 pointer before assigning the value at intel_pxp_irq_handler()
- Writing register GEN11_CRYPTO_RSVD_INTR_ENABLE to enable the PXP irq
- Remove the unnecessary comment for GEN11_CRYPTO_RSVD_INTR_MASK

---
 drivers/gpu/drm/i915/gt/intel_gt_irq.c       | 14 +++
 drivers/gpu/drm/i915/i915_reg.h              |  1 +
 drivers/gpu/drm/i915/pxp/intel_pxp.c         | 99 ++++++++++++++++++++
 drivers/gpu/drm/i915/pxp/intel_pxp.h         | 23 ++++-
 drivers/gpu/drm/i915/pxp/intel_pxp_context.c |  3 +
 drivers/gpu/drm/i915/pxp/intel_pxp_context.h |  1 -
 drivers/gpu/drm/i915/pxp/intel_pxp_types.h   |  6 ++
 7 files changed, 145 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/gt/intel_gt_irq.c +14 -0
index 9830342aa6f4..2241e9abfa3a 100644
@@ -14,6 +14,7 @@
 #include "intel_lrc_reg.h"
 #include "intel_uncore.h"
 #include "intel_rps.h"
+#include "pxp/intel_pxp.h"
 
 static void guc_irq_handler(struct intel_guc *guc, u16 iir)
 {
@@ -107,6 +108,9 @@ gen11_other_irq_handler(struct intel_gt *gt, const u8 instance,
 	if (instance == OTHER_GTPM_INSTANCE)
 		return gen11_rps_irq_handler(&gt->rps, iir);
 
+	if (instance == OTHER_KCR_INSTANCE)
+		return intel_pxp_irq_handler(&gt->pxp, iir);
+
 	WARN_ONCE(1, "unhandled other interrupt instance=0x%x, iir=0x%x\n",
 		  instance, iir);
 }
@@ -233,6 +237,9 @@ void gen11_gt_irq_reset(struct intel_gt *gt)
 	intel_uncore_write(uncore, GEN11_GPM_WGBOXPERF_INTR_MASK,  ~0);
 	intel_uncore_write(uncore, GEN11_GUC_SG_INTR_ENABLE, 0);
 	intel_uncore_write(uncore, GEN11_GUC_SG_INTR_MASK,  ~0);
+
+	intel_uncore_write(uncore, GEN11_CRYPTO_RSVD_INTR_ENABLE, 0);
+	intel_uncore_write(uncore, GEN11_CRYPTO_RSVD_INTR_MASK,  ~0);
 }
 
 void gen11_gt_irq_postinstall(struct intel_gt *gt)
@@ -245,6 +252,10 @@ void gen11_gt_irq_postinstall(struct intel_gt *gt)
 	struct intel_uncore *uncore = gt->uncore;
 	const u32 dmask = irqs << 16 | irqs;
 	const u32 smask = irqs << 16;
+	const u32 smask_pxp =
+		(PXP_IRQ_VECTOR_DISPLAY_PXP_STATE_TERMINATED |
+		 PXP_IRQ_VECTOR_DISPLAY_APP_TERM_PER_FW_REQ |
+		 PXP_IRQ_VECTOR_PXP_DISP_STATE_RESET_COMPLETE) << 16;
 
 	BUILD_BUG_ON(irqs & 0xffff0000);
 
@@ -271,6 +282,9 @@ void gen11_gt_irq_postinstall(struct intel_gt *gt)
 	/* Same thing for GuC interrupts */
 	intel_uncore_write(uncore, GEN11_GUC_SG_INTR_ENABLE, 0);
 	intel_uncore_write(uncore, GEN11_GUC_SG_INTR_MASK,  ~0);
+
+	intel_uncore_write(uncore, GEN11_CRYPTO_RSVD_INTR_ENABLE, smask_pxp);
+	intel_uncore_write(uncore, GEN11_CRYPTO_RSVD_INTR_MASK,  ~smask_pxp);
 }
 
 void gen5_gt_irq_handler(struct intel_gt *gt, u32 gt_iir)
drivers/gpu/drm/i915/i915_reg.h +1 -0
index 249a81575b9d..97bcecada87f 100644
@@ -7943,6 +7943,7 @@ enum {
 /* irq instances for OTHER_CLASS */
 #define OTHER_GUC_INSTANCE	0
 #define OTHER_GTPM_INSTANCE	1
+#define OTHER_KCR_INSTANCE	4
 
 #define GEN11_INTR_IDENTITY_REG(x)	_MMIO(0x190060 + ((x) * 4))
 
drivers/gpu/drm/i915/pxp/intel_pxp.c +99 -0

120 lines not on this page · raw message

drivers/gpu/drm/i915/pxp/intel_pxp.h +22 -1
index f47bc6bea34f..420da2790624 100644
@@ -8,15 +8,36 @@
 
 #include "intel_pxp_types.h"
 
+#define PXP_IRQ_VECTOR_DISPLAY_PXP_STATE_TERMINATED BIT(1)
+#define PXP_IRQ_VECTOR_DISPLAY_APP_TERM_PER_FW_REQ BIT(2)
+#define PXP_IRQ_VECTOR_PXP_DISP_STATE_RESET_COMPLETE BIT(3)
+
 #ifdef CONFIG_DRM_I915_PXP
+void intel_pxp_irq_handler(struct intel_pxp *pxp, u16 iir);
+int i915_pxp_teardown_required_callback(struct intel_pxp *pxp);
+int i915_pxp_global_terminate_complete_callback(struct intel_pxp *pxp);
+
 void intel_pxp_init(struct intel_pxp *pxp);
 void intel_pxp_fini(struct intel_pxp *pxp);
 #else
-static inline void intel_pxp_init(struct intel_pxp *pxp)
+static inline void intel_pxp_irq_handler(struct intel_pxp *pxp, u16 iir)
+{
+}
+
+static inline int i915_pxp_teardown_required_callback(struct intel_pxp *pxp)
+{
+	return 0;
+}
+
+static inline int i915_pxp_global_terminate_complete_callback(struct intel_pxp *pxp)
 {
 	return 0;
 }
 
+static inline void intel_pxp_init(struct intel_pxp *pxp)
+{
+}
+
 static inline void intel_pxp_fini(struct intel_pxp *pxp)
 {
 }
drivers/gpu/drm/i915/pxp/intel_pxp_context.c +3 -0
index 2be6bf2f0d0f..4e820258b7ae 100644
@@ -11,7 +11,10 @@
  */
 void intel_pxp_ctx_init(struct pxp_context *ctx)
 {
+	ctx->global_state_attacked = false;
+
 	mutex_init(&ctx->mutex);
+
 	ctx->inited = true;
 }
 
drivers/gpu/drm/i915/pxp/intel_pxp_context.h +0 -1
index bf2feb4aaf6d..f51021c33d45 100644
@@ -8,7 +8,6 @@
 
 #include <linux/mutex.h>
 #include "intel_pxp_types.h"
-#include "intel_pxp_arb.h"
 
 void intel_pxp_ctx_init(struct pxp_context *ctx);
 void intel_pxp_ctx_fini(struct pxp_context *ctx);
drivers/gpu/drm/i915/pxp/intel_pxp_types.h +6 -0
index 19d43b43e483..dd7445ff2cb8 100644
@@ -7,6 +7,7 @@
 #define __INTEL_PXP_TYPES_H__
 
 #include <linux/mutex.h>
+#include <linux/workqueue.h>
 
 struct intel_engine_cs;
 
@@ -20,9 +21,14 @@ struct pxp_context {
 	bool arb_is_in_play;
 
 	bool flag_display_hm_surface_keys;
+	bool global_state_attacked;
 };
 
 struct intel_pxp {
+	struct work_struct irq_work;
+	u32 handled_irr;
+	u32 current_events;
+
 	struct pxp_context ctx;
 
 	struct intel_engine_cs *vcs_engine;
Signature · 6 lines
2.17.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#8 lore raw

RFC v21 7/13 drm/i915/pxp: Destroy arb session upon teardown

In reply to Huang, Sean Z

Teardown is triggered when the display topology changes and no long meets the secure playback requirement, and hardware trashes all the encryption keys for display. So as a result, PXP should handle such case and terminate the type0 sessions, which including arb session

rev21:
- Bug fixing, we need to set the PXP_GLOBAL_TERMINATE 0x320f8 register after arb session termination
- Remove enum pxp_session_types and enum pxp_protection_modes from single session patch series.

---
 drivers/gpu/drm/i915/pxp/intel_pxp.c     |   3 +
 drivers/gpu/drm/i915/pxp/intel_pxp_arb.c |  86 ++++++++++++++++++
 drivers/gpu/drm/i915/pxp/intel_pxp_arb.h |   1 +
 drivers/gpu/drm/i915/pxp/intel_pxp_cmd.c | 109 +++++++++++++++++++++--
 drivers/gpu/drm/i915/pxp/intel_pxp_cmd.h |  11 +--
 5 files changed, 200 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/pxp/intel_pxp.c +3 -0
index 99cd93e12455..e6dd57ec73f5 100644
@@ -29,6 +29,9 @@ static int intel_pxp_teardown_required_callback(struct intel_pxp *pxp)
 	mutex_lock(&pxp->ctx.mutex);
 
 	pxp->ctx.global_state_attacked = true;
+	pxp->ctx.flag_display_hm_surface_keys = false;
+
+	ret = intel_pxp_arb_terminate_session_with_global_terminate(pxp);
 
 	mutex_unlock(&pxp->ctx.mutex);
 
drivers/gpu/drm/i915/pxp/intel_pxp_arb.c +86 -0

98 lines not on this page · raw message

drivers/gpu/drm/i915/pxp/intel_pxp_arb.h +1 -0
index 2196153dd879..6b0622e8ba93 100644
@@ -11,6 +11,7 @@
 struct intel_pxp;
 
 int intel_pxp_arb_create_session(struct intel_pxp *pxp);
+int intel_pxp_arb_terminate_session_with_global_terminate(struct intel_pxp *pxp);
 bool intel_pxp_arb_session_is_in_play(struct intel_pxp *pxp);
 
 #endif /* __INTEL_PXP_ARB_H__ */
drivers/gpu/drm/i915/pxp/intel_pxp_cmd.c +104 -5

127 lines not on this page · raw message

drivers/gpu/drm/i915/pxp/intel_pxp_cmd.h +6 -5
index d04463962421..efd26e4987a4 100644
@@ -9,10 +9,11 @@
 #include "gt/intel_gt_buffer_pool.h"
 #include "intel_pxp.h"
 
-struct i915_vma *intel_pxp_cmd_get_batch(struct intel_pxp *pxp,
-					 struct intel_context *ce,
-					 struct intel_gt_buffer_pool_node *pool,
-					 u32 *cmd_buf, int cmd_size_in_dw);
+int intel_pxp_cmd_submit(struct intel_pxp *pxp, u32 *cmd,
+			 int cmd_size_in_dw);
+int intel_pxp_cmd_add_prolog(struct intel_pxp *pxp, u32 *cmd,
+			     int session_index);
+int intel_pxp_cmd_add_epilog(u32 *cmd);
+int intel_pxp_cmd_add_inline_termination(u32 *cmd);
 
-int intel_pxp_cmd_submit(struct intel_pxp *pxp, u32 *cmd, int cmd_size_in_dw);
 #endif /* __INTEL_PXP_SM_H__ */
Signature · 6 lines
2.17.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#9 lore raw

RFC v21 8/13 drm/i915/pxp: Enable PXP power management

In reply to Huang, Sean Z

During the power event S3+ sleep/resume, hardware will lose all the encryption keys for every hardware session, even though the software session state was marked as alive after resume. So to handle such case, PXP should terminate all the hardware sessions and cleanup all the software states after the power cycle.

---
 drivers/gpu/drm/i915/Makefile              |  1 +
 drivers/gpu/drm/i915/gt/intel_gt_pm.c      |  4 ++
 drivers/gpu/drm/i915/i915_drv.c            |  4 ++
 drivers/gpu/drm/i915/pxp/intel_pxp_pm.c    | 65 ++++++++++++++++++++++
 drivers/gpu/drm/i915/pxp/intel_pxp_pm.h    | 31 +++++++++++
 drivers/gpu/drm/i915/pxp/intel_pxp_types.h |  1 +
 6 files changed, 106 insertions(+)
 create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_pm.c
 create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_pm.h
drivers/gpu/drm/i915/Makefile +1 -0
index c931ef5e8a85..eba360ed84d8 100644
@@ -271,6 +271,7 @@ i915-$(CONFIG_DRM_I915_PXP) += \
 	pxp/intel_pxp_arb.o \
 	pxp/intel_pxp_cmd.o \
 	pxp/intel_pxp_context.o \
+	pxp/intel_pxp_pm.o \
 	pxp/intel_pxp_tee.o
 
 # Post-mortem debug and GPU hang state capture
drivers/gpu/drm/i915/gt/intel_gt_pm.c +4 -0
index c94e8ac884eb..ae0387e419a2 100644
@@ -20,6 +20,7 @@
 #include "intel_rc6.h"
 #include "intel_rps.h"
 #include "intel_wakeref.h"
+#include "pxp/intel_pxp_pm.h"
 
 static void user_forcewake(struct intel_gt *gt, bool suspend)
 {
@@ -266,6 +267,8 @@ int intel_gt_resume(struct intel_gt *gt)
 
 	intel_uc_resume(&gt->uc);
 
+	intel_pxp_pm_resume(&gt->pxp);
+
 	user_forcewake(gt, false);
 
 out_fw:
@@ -300,6 +303,7 @@ void intel_gt_suspend_prepare(struct intel_gt *gt)
 	user_forcewake(gt, true);
 	wait_for_suspend(gt);
 
+	intel_pxp_pm_prepare_suspend(&gt->pxp);
 	intel_uc_suspend(&gt->uc);
 }
 
drivers/gpu/drm/i915/i915_drv.c +4 -0
index e9cb8e9ca172..19db49206e0c 100644
@@ -68,6 +68,8 @@
 #include "gt/intel_gt_pm.h"
 #include "gt/intel_rc6.h"
 
+#include "pxp/intel_pxp_pm.h"
+
 #include "i915_debugfs.h"
 #include "i915_drv.h"
 #include "i915_ioc32.h"
@@ -1342,6 +1344,8 @@ static int i915_drm_resume_early(struct drm_device *dev)
 
 	intel_power_domains_resume(dev_priv);
 
+	intel_pxp_pm_resume_early(&dev_priv->gt.pxp);
+
 	enable_rpm_wakeref_asserts(&dev_priv->runtime_pm);
 
 	return ret;
drivers/gpu/drm/i915/pxp/intel_pxp_pm.c new file +65 -0

65 lines not on this page · raw message

drivers/gpu/drm/i915/pxp/intel_pxp_pm.h new file +31 -0
new file mode 100644
index 000000000000..135bfb59aaf7
@@ -0,0 +1,31 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright(c) 2020, Intel Corporation. All rights reserved.
+ */
+
+#ifndef __INTEL_PXP_PM_H__
+#define __INTEL_PXP_PM_H__
+
+#include "i915_drv.h"
+
+#ifdef CONFIG_DRM_I915_PXP
+void intel_pxp_pm_prepare_suspend(struct intel_pxp *pxp);
+
+void intel_pxp_pm_resume_early(struct intel_pxp *pxp);
+int intel_pxp_pm_resume(struct intel_pxp *pxp);
+#else
+static inline void intel_pxp_pm_prepare_suspend(struct intel_pxp *pxp)
+{
+}
+
+static inline void intel_pxp_pm_resume_early(struct intel_pxp *pxp)
+{
+}
+
+static inline int intel_pxp_pm_resume(struct intel_pxp *pxp)
+{
+	return 0;
+}
+#endif
+
+#endif /* __INTEL_PXP_PM_H__ */
drivers/gpu/drm/i915/pxp/intel_pxp_types.h +1 -0
index dd7445ff2cb8..e825553db46e 100644
@@ -22,6 +22,7 @@ struct pxp_context {
 
 	bool flag_display_hm_surface_keys;
 	bool global_state_attacked;
+	bool global_state_in_suspend;
 };
 
 struct intel_pxp {
Signature · 6 lines
2.17.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#10 lore raw

RFC v21 9/13 drm/i915/pxp: Expose session state for display protection flip

In reply to Huang, Sean Z

Implement the intel_pxp_gem_object_status() to allow i915 display querying the current PXP session state. In the design, display should not perform protection flip on the protected buffers if there is no PXP session alive. And Implement the funciton to set the protected flag for gem context.

---
 .../gpu/drm/i915/gem/i915_gem_context_types.h |  1 +
 drivers/gpu/drm/i915/pxp/intel_pxp.c          | 26 +++++++++++++++++++
 drivers/gpu/drm/i915/pxp/intel_pxp.h          | 18 +++++++++++++
 include/uapi/drm/i915_drm.h                   |  9 +++++++
 4 files changed, 54 insertions(+)
drivers/gpu/drm/i915/gem/i915_gem_context_types.h +1 -0
index 1449f54924e0..31137adca788 100644
@@ -134,6 +134,7 @@ struct i915_gem_context {
 #define UCONTEXT_BANNABLE		2
 #define UCONTEXT_RECOVERABLE		3
 #define UCONTEXT_PERSISTENCE		4
+#define UCONTEXT_PROTECTED		5
 
 	/**
 	 * @flags: small set of booleans
drivers/gpu/drm/i915/pxp/intel_pxp.c +26 -0
index e6dd57ec73f5..373d3e3f3536 100644
@@ -157,3 +157,29 @@ void intel_pxp_irq_handler(struct intel_pxp *pxp, u16 iir)
 	pxp->current_events |= events;
 	schedule_work(&pxp->irq_work);
 }
+
+bool intel_pxp_gem_object_status(struct drm_i915_private *i915)
+{
+	if (i915->gt.pxp.ctx.inited &&
+	    i915->gt.pxp.ctx.flag_display_hm_surface_keys)
+		return true;
+	else
+		return false;
+}
+
+int intel_pxp_gem_context_create_param(struct i915_gem_context *ctx,
+				       struct drm_i915_gem_context_param *args)
+{
+	if (!ctx || !args)
+		return -EINVAL;
+
+	if (args->param == I915_CONTEXT_PARAM_PROTECTED_CONTENT) {
+		if (!intel_pxp_arb_session_is_in_play(&ctx->i915->gt.pxp))
+			return -EINVAL;
+
+		if (args->value)
+			set_bit(UCONTEXT_PROTECTED, &ctx->user_flags);
+	}
+
+	return 0;
+}
drivers/gpu/drm/i915/pxp/intel_pxp.h +18 -0
index 420da2790624..6031f26968ec 100644
@@ -12,6 +12,10 @@
 #define PXP_IRQ_VECTOR_DISPLAY_APP_TERM_PER_FW_REQ BIT(2)
 #define PXP_IRQ_VECTOR_PXP_DISP_STATE_RESET_COMPLETE BIT(3)
 
+struct drm_i915_private;
+struct i915_gem_context;
+struct drm_i915_gem_context_param;
+
 #ifdef CONFIG_DRM_I915_PXP
 void intel_pxp_irq_handler(struct intel_pxp *pxp, u16 iir);
 int i915_pxp_teardown_required_callback(struct intel_pxp *pxp);
@@ -19,6 +23,9 @@ int i915_pxp_global_terminate_complete_callback(struct intel_pxp *pxp);
 
 void intel_pxp_init(struct intel_pxp *pxp);
 void intel_pxp_fini(struct intel_pxp *pxp);
+bool intel_pxp_gem_object_status(struct drm_i915_private *i915);
+int intel_pxp_gem_context_create_param(struct i915_gem_context *ctx,
+				       struct drm_i915_gem_context_param *args);
 #else
 static inline void intel_pxp_irq_handler(struct intel_pxp *pxp, u16 iir)
 {
@@ -41,6 +48,17 @@ static inline void intel_pxp_init(struct intel_pxp *pxp)
 static inline void intel_pxp_fini(struct intel_pxp *pxp)
 {
 }
+
+static inline bool intel_pxp_gem_object_status(struct drm_i915_private *i915)
+{
+	return false;
+}
+
+static inline int intel_pxp_gem_context_create_param(struct i915_gem_context *ctx,
+						     struct drm_i915_gem_context_param *args)
+{
+	return 0;
+}
 #endif
 
 #endif /* __INTEL_PXP_H__ */
include/uapi/drm/i915_drm.h +9 -0
index 1987e2ea79a3..00fd1c2bcbb3 100644
@@ -1694,6 +1694,15 @@ struct drm_i915_gem_context_param {
  * Default is 16 KiB.
  */
 #define I915_CONTEXT_PARAM_RINGSIZE	0xc
+
+/*
+ * I915_CONTEXT_PARAM_PROTECTED_CONTENT:
+ *
+ * If set to true (1) PAVP content protection is enabled.
+ * When enabled, the context is marked unrecoverable and may
+ * become invalid due to PAVP teardown event or other error.
+ */
+#define I915_CONTEXT_PARAM_PROTECTED_CONTENT    0xd
 /* Must be kept compact -- no holes and well documented */
 
 	__u64 value;
Signature · 6 lines
2.17.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#11 lore raw

RFC v21 10/13 mei: pxp: export pavp client to me client bus

In reply to Huang, Sean Z

From: Vitaly Lubart <[email protected]>

Export PAVP client to work with i915_cp driver,
for binding it uses kernel component framework.

---
 drivers/misc/mei/Kconfig       |   2 +
 drivers/misc/mei/Makefile      |   1 +
 drivers/misc/mei/pxp/Kconfig   |  13 ++
 drivers/misc/mei/pxp/Makefile  |   7 +
 drivers/misc/mei/pxp/mei_pxp.c | 230 +++++++++++++++++++++++++++++++++
 drivers/misc/mei/pxp/mei_pxp.h |  18 +++
 6 files changed, 271 insertions(+)
 create mode 100644 drivers/misc/mei/pxp/Kconfig
 create mode 100644 drivers/misc/mei/pxp/Makefile
 create mode 100644 drivers/misc/mei/pxp/mei_pxp.c
 create mode 100644 drivers/misc/mei/pxp/mei_pxp.h
drivers/misc/mei/Kconfig +2 -0
index f5fd5b786607..0e0bcd0da852 100644
@@ -47,3 +47,5 @@ config INTEL_MEI_TXE
 	  Intel Bay Trail
 
 source "drivers/misc/mei/hdcp/Kconfig"
+source "drivers/misc/mei/pxp/Kconfig"
+
drivers/misc/mei/Makefile +1 -0
index f1c76f7ee804..d8e5165917f2 100644
@@ -26,3 +26,4 @@ mei-$(CONFIG_EVENT_TRACING) += mei-trace.o
 CFLAGS_mei-trace.o = -I$(src)
 
 obj-$(CONFIG_INTEL_MEI_HDCP) += hdcp/
+obj-$(CONFIG_INTEL_MEI_PXP) += pxp/
drivers/misc/mei/pxp/Kconfig new file +13 -0
new file mode 100644
index 000000000000..4029b96afc04
@@ -0,0 +1,13 @@
+
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (c) 2020, Intel Corporation. All rights reserved.
+#
+config INTEL_MEI_PXP
+	tristate "Intel PXP services of ME Interface"
+	select INTEL_MEI_ME
+	depends on DRM_I915
+	help
+	  MEI Support for PXP Services on Intel platforms.
+
+	  Enables the ME FW services required for PXP support through
+	  I915 display driver of Intel.
drivers/misc/mei/pxp/Makefile new file +7 -0
new file mode 100644
index 000000000000..0329950d5794
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0
+#
+# Copyright (c) 2020, Intel Corporation. All rights reserved.
+#
+# Makefile - PXP client driver for Intel MEI Bus Driver.
+
+obj-$(CONFIG_INTEL_MEI_PXP) += mei_pxp.o
drivers/misc/mei/pxp/mei_pxp.c new file +230 -0

230 lines not on this page · raw message

drivers/misc/mei/pxp/mei_pxp.h new file +18 -0
new file mode 100644
index 000000000000..e7b15373fefd
@@ -0,0 +1,18 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Copyright © 2020 Intel Corporation
+ *
+ * Authors:
+ * Vitaly Lubart <[email protected]>
+ */
+
+#ifndef __MEI_PXP_H__
+#define __MEI_PXP_H__
+
+/* me_pxp_status: Enumeration of all PXP Status Codes */
+enum me_pxp_status {
+	ME_PXP_STATUS_SUCCESS			= 0x0000,
+
+};
+
+#endif /* __MEI_PXP_H__ */
Signature · 6 lines
2.17.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#12 lore raw

RFC v21 11/13 drm/i915/uapi: introduce drm_i915_gem_create_ext

In reply to Huang, Sean Z

From: Bommu Krishnaiah <[email protected]>

Same old gem_create but with now with extensions support. This is needed to support various upcoming usecases. For now we use the extensions mechanism to support PAVP.

rev21:
- Fix "Fi.CI.CHECKPATCH" warnings

Cc Joonas Lahtinen <[email protected]>
Cc Matthew Auld <[email protected]>
Cc Telukuntla Sreedhar <[email protected]>
---
 drivers/gpu/drm/i915/gem/i915_gem_create.c | 41 ++++++++++++++++++-
 drivers/gpu/drm/i915/i915_drv.c            |  2 +-
 include/uapi/drm/i915_drm.h                | 47 ++++++++++++++++++++++
 3 files changed, 88 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/gem/i915_gem_create.c +40 -1
index 45d60e3d98e3..3ad3413c459f 100644
@@ -7,6 +7,7 @@
 #include "gem/i915_gem_region.h"
 
 #include "i915_drv.h"
+#include "i915_user_extensions.h"
 
 static int
 i915_gem_create(struct drm_file *file,
@@ -91,6 +92,35 @@ i915_gem_dumb_create(struct drm_file *file,
 			       &args->size, &args->handle);
 }
 
+struct create_ext {
+	struct drm_i915_private *i915;
+};
+
+static int __create_setparam(struct drm_i915_gem_object_param *args,
+			     struct create_ext *ext_data)
+{
+	if (!(args->param & I915_OBJECT_PARAM)) {
+		DRM_DEBUG("Missing I915_OBJECT_PARAM namespace\n");
+		return -EINVAL;
+	}
+
+	return -EINVAL;
+}
+
+static int create_setparam(struct i915_user_extension __user *base, void *data)
+{
+	struct drm_i915_gem_create_ext_setparam ext;
+
+	if (copy_from_user(&ext, base, sizeof(ext)))
+		return -EFAULT;
+
+	return __create_setparam(&ext.param, data);
+}
+
+static const i915_user_extension_fn create_extensions[] = {
+	[I915_GEM_CREATE_EXT_SETPARAM] = create_setparam,
+};
+
 /**
  * Creates a new mm object and returns a handle to it.
  * @dev: drm device pointer
@@ -102,10 +132,19 @@ i915_gem_create_ioctl(struct drm_device *dev, void *data,
 		      struct drm_file *file)
 {
 	struct drm_i915_private *i915 = to_i915(dev);
-	struct drm_i915_gem_create *args = data;
+	struct create_ext ext_data = { .i915 = i915 };
+	struct drm_i915_gem_create_ext *args = data;
+	int ret;
 
 	i915_gem_flush_free_objects(i915);
 
+	ret = i915_user_extensions(u64_to_user_ptr(args->extensions),
+				   create_extensions,
+				   ARRAY_SIZE(create_extensions),
+				   &ext_data);
+	if (ret)
+		return ret;
+
 	return i915_gem_create(file,
 			       intel_memory_region_by_type(i915,
 							   INTEL_MEMORY_SYSTEM),
drivers/gpu/drm/i915/i915_drv.c +1 -1
index 19db49206e0c..0e3d04c50f53 100644
@@ -1731,7 +1731,7 @@ static const struct drm_ioctl_desc i915_ioctls[] = {
 	DRM_IOCTL_DEF_DRV(I915_GEM_THROTTLE, i915_gem_throttle_ioctl, DRM_RENDER_ALLOW),
 	DRM_IOCTL_DEF_DRV(I915_GEM_ENTERVT, drm_noop, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
 	DRM_IOCTL_DEF_DRV(I915_GEM_LEAVEVT, drm_noop, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
-	DRM_IOCTL_DEF_DRV(I915_GEM_CREATE, i915_gem_create_ioctl, DRM_RENDER_ALLOW),
+	DRM_IOCTL_DEF_DRV(I915_GEM_CREATE_EXT, i915_gem_create_ioctl, DRM_RENDER_ALLOW),
 	DRM_IOCTL_DEF_DRV(I915_GEM_PREAD, i915_gem_pread_ioctl, DRM_RENDER_ALLOW),
 	DRM_IOCTL_DEF_DRV(I915_GEM_PWRITE, i915_gem_pwrite_ioctl, DRM_RENDER_ALLOW),
 	DRM_IOCTL_DEF_DRV(I915_GEM_MMAP, i915_gem_mmap_ioctl, DRM_RENDER_ALLOW),
include/uapi/drm/i915_drm.h +47 -0

65 lines not on this page · raw message

Signature · 6 lines
2.17.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#13 lore raw

RFC v21 12/13 drm/i915/pxp: User interface for Protected buffer

In reply to Huang, Sean Z

From: Bommu Krishnaiah <[email protected]>

This api allow user mode to create Protected buffer and context creation.

rev21:
- Only allow set I915_CONTEXT_PARAM_PROTECTED_CONTENT during context creation (i915_gem_context_create_ioctl), but not allow during context set param (i915_gem_context_setparam_ioctl)

Cc Telukuntla Sreedhar <[email protected]>
Cc Kondapally Kalyan <[email protected]>
Cc Gupta Anshuman <[email protected]>
Cc Huang Sean Z <[email protected]>
---
 drivers/gpu/drm/i915/gem/i915_gem_context.c   | 15 +++++++++--
 drivers/gpu/drm/i915/gem/i915_gem_context.h   |  5 ++++
 drivers/gpu/drm/i915/gem/i915_gem_create.c    | 27 ++++++++++++++++---
 .../gpu/drm/i915/gem/i915_gem_object_types.h  |  5 ++++
 include/uapi/drm/i915_drm.h                   | 10 +++++++
 5 files changed, 57 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/gem/i915_gem_context.c +13 -2
index 4d2f40cf237b..0b8e1b3887f4 100644
@@ -81,6 +81,8 @@
 #include "i915_trace.h"
 #include "i915_user_extensions.h"
 
+#include "pxp/intel_pxp.h"
+
 #define ALL_L3_SLICES(dev) (1 << NUM_L3_SLICES(dev)) - 1
 
 static struct i915_global_gem_context {
@@ -2004,8 +2006,12 @@ static int ctx_setparam(struct drm_i915_file_private *fpriv,
 	case I915_CONTEXT_PARAM_RECOVERABLE:
 		if (args->size)
 			ret = -EINVAL;
-		else if (args->value)
-			i915_gem_context_set_recoverable(ctx);
+		else if (args->value) {
+			if (!i915_gem_context_is_protected(ctx))
+				i915_gem_context_set_recoverable(ctx);
+			else
+				ret = -EPERM;
+			}
 		else
 			i915_gem_context_clear_recoverable(ctx);
 		break;
@@ -2052,6 +2058,7 @@ static int create_setparam(struct i915_user_extension __user *ext, void *data)
 {
 	struct drm_i915_gem_context_create_ext_setparam local;
 	const struct create_ext *arg = data;
+	int ret;
 
 	if (copy_from_user(&local, ext, sizeof(local)))
 		return -EFAULT;
@@ -2059,6 +2066,10 @@ static int create_setparam(struct i915_user_extension __user *ext, void *data)
 	if (local.param.ctx_id)
 		return -EINVAL;
 
+	ret = intel_pxp_gem_context_create_param(arg->ctx, &local.param);
+	if (ret)
+		return ret;
+
 	return ctx_setparam(arg->fpriv, arg->ctx, &local.param);
 }
 
drivers/gpu/drm/i915/gem/i915_gem_context.h +5 -0
index b5c908f3f4f2..173154fdc311 100644
@@ -70,6 +70,11 @@ static inline void i915_gem_context_set_recoverable(struct i915_gem_context *ctx
 	set_bit(UCONTEXT_RECOVERABLE, &ctx->user_flags);
 }
 
+static inline bool i915_gem_context_is_protected(struct i915_gem_context *ctx)
+{
+	return test_bit(UCONTEXT_PROTECTED, &ctx->user_flags);
+}
+
 static inline void i915_gem_context_clear_recoverable(struct i915_gem_context *ctx)
 {
 	clear_bit(UCONTEXT_RECOVERABLE, &ctx->user_flags);
drivers/gpu/drm/i915/gem/i915_gem_create.c +24 -3
index 3ad3413c459f..c9b83217a6da 100644
@@ -5,6 +5,7 @@
 
 #include "gem/i915_gem_ioctls.h"
 #include "gem/i915_gem_region.h"
+#include "pxp/intel_pxp.h"
 
 #include "i915_drv.h"
 #include "i915_user_extensions.h"
@@ -13,7 +14,8 @@ static int
 i915_gem_create(struct drm_file *file,
 		struct intel_memory_region *mr,
 		u64 *size_p,
-		u32 *handle_p)
+		u32 *handle_p,
+		u64 user_flags)
 {
 	struct drm_i915_gem_object *obj;
 	u32 handle;
@@ -35,6 +37,8 @@ i915_gem_create(struct drm_file *file,
 
 	GEM_BUG_ON(size != obj->base.size);
 
+	obj->user_flags = user_flags;
+
 	ret = drm_gem_handle_create(file, &obj->base, &handle);
 	/* drop reference from allocate - handle holds it now */
 	i915_gem_object_put(obj);
@@ -89,11 +93,12 @@ i915_gem_dumb_create(struct drm_file *file,
 	return i915_gem_create(file,
 			       intel_memory_region_by_type(to_i915(dev),
 							   mem_type),
-			       &args->size, &args->handle);
+			       &args->size, &args->handle, 0);
 }
 
 struct create_ext {
 	struct drm_i915_private *i915;
+	unsigned long user_flags;
 };
 
 static int __create_setparam(struct drm_i915_gem_object_param *args,
@@ -104,6 +109,17 @@ static int __create_setparam(struct drm_i915_gem_object_param *args,
 		return -EINVAL;
 	}
 
+	switch (lower_32_bits(args->param)) {
+	case I915_PARAM_PROTECTED_CONTENT:
+		if (args->size) {
+			return -EINVAL;
+		} else if (args->data) {
+			ext_data->user_flags = args->data;
+			return 0;
+		}
+	break;
+	}
+
 	return -EINVAL;
 }
 
@@ -145,8 +161,13 @@ i915_gem_create_ioctl(struct drm_device *dev, void *data,
 	if (ret)
 		return ret;
 
+	if (ext_data.user_flags & I915_BO_PROTECTED) {
+		if (!intel_pxp_gem_object_status(i915))
+			return -EINVAL;
+	}
+
 	return i915_gem_create(file,
 			       intel_memory_region_by_type(i915,
 							   INTEL_MEMORY_SYSTEM),
-			       &args->size, &args->handle);
+			       &args->size, &args->handle, ext_data.user_flags);
 }
drivers/gpu/drm/i915/gem/i915_gem_object_types.h +5 -0
index e2d9b7e1e152..90ac955463f4 100644
@@ -161,6 +161,11 @@ struct drm_i915_gem_object {
 	} mmo;
 
 	I915_SELFTEST_DECLARE(struct list_head st_link);
+	/**
+	 * @user_flags: small set of booleans set by the user
+	 */
+	unsigned long user_flags;
+#define I915_BO_PROTECTED     BIT(0)
 
 	unsigned long flags;
 #define I915_BO_ALLOC_CONTIGUOUS BIT(0)
include/uapi/drm/i915_drm.h +10 -0
index aa232ded9951..17a6e3545570 100644
@@ -1744,6 +1744,16 @@ struct drm_i915_gem_object_param {
  */
 #define I915_OBJECT_PARAM  (1ull << 32)
 
+/*
+ * I915_PARAM_PROTECTED_CONTENT:
+ *
+ * If set to true (1) buffer contents is expected to be protected by
+ * PAVP encryption and requires decryption for scan out and processing.
+ * Protected buffers can only be used in PAVP protected contexts.
+ * A protected buffer may become invalid as a result of PAVP teardown.
+ */
+#define I915_PARAM_PROTECTED_CONTENT  0x1
+
 	__u64 param;
 
 	/* Data value or pointer */
Signature · 6 lines
2.17.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#14 lore raw

RFC v21 13/13 drm/i915/pxp: Add plane decryption support

In reply to Huang, Sean Z

From: Anshuman Gupta <[email protected]>

Add support to enable/disable PLANE_SURF Decryption Request bit. It requires only to enable plane decryption support when following condition met.
1. PAVP session is enabled.
2. Buffer object is protected.

v2:
- Rebased to libva_cp-drm-tip_tgl_cp tree.
- Used gen fb obj user_flags instead gem_object_metadata. [Krishna]

Cc Bommu Krishnaiah <[email protected]>
Cc Huang, Sean Z <[email protected]>
---
 drivers/gpu/drm/i915/display/intel_sprite.c | 21 ++++++++++++++++++---
 drivers/gpu/drm/i915/i915_reg.h             |  1 +
 2 files changed, 19 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/display/intel_sprite.c +18 -3
index cf3589fd0ddb..39f8c922ce66 100644
@@ -39,6 +39,8 @@
 #include <drm/drm_plane_helper.h>
 #include <drm/drm_rect.h>
 
+#include "pxp/intel_pxp.h"
+
 #include "i915_drv.h"
 #include "i915_trace.h"
 #include "i915_vgpu.h"
@@ -768,6 +770,11 @@ icl_program_input_csc(struct intel_plane *plane,
 			  PLANE_INPUT_CSC_POSTOFF(pipe, plane_id, 2), 0x0);
 }
 
+static bool intel_fb_obj_protected(const struct drm_i915_gem_object *obj)
+{
+	return obj->user_flags & I915_BO_PROTECTED ? true : false;
+}
+
 static void
 skl_plane_async_flip(struct intel_plane *plane,
 		     const struct intel_crtc_state *crtc_state,
@@ -804,6 +811,7 @@ skl_program_plane(struct intel_plane *plane,
 	u32 surf_addr = plane_state->color_plane[color_plane].offset;
 	u32 stride = skl_plane_stride(plane_state, color_plane);
 	const struct drm_framebuffer *fb = plane_state->hw.fb;
+	const struct drm_i915_gem_object *obj = intel_fb_obj(fb);
 	int aux_plane = intel_main_to_aux_plane(fb, color_plane);
 	int crtc_x = plane_state->uapi.dst.x1;
 	int crtc_y = plane_state->uapi.dst.y1;
@@ -814,7 +822,7 @@ skl_program_plane(struct intel_plane *plane,
 	u8 alpha = plane_state->hw.alpha >> 8;
 	u32 plane_color_ctl = 0, aux_dist = 0;
 	unsigned long irqflags;
-	u32 keymsk, keymax;
+	u32 keymsk, keymax, plane_surf;
 	u32 plane_ctl = plane_state->ctl;
 
 	plane_ctl |= skl_plane_ctl_crtc(crtc_state);
@@ -890,8 +898,15 @@ skl_program_plane(struct intel_plane *plane,
 	 * the control register just before the surface register.
 	 */
 	intel_de_write_fw(dev_priv, PLANE_CTL(pipe, plane_id), plane_ctl);
-	intel_de_write_fw(dev_priv, PLANE_SURF(pipe, plane_id),
-			  intel_plane_ggtt_offset(plane_state) + surf_addr);
+	plane_surf = intel_plane_ggtt_offset(plane_state) + surf_addr;
+
+	if (intel_pxp_gem_object_status(dev_priv) &&
+	    intel_fb_obj_protected(obj))
+		plane_surf |= PLANE_SURF_DECRYPTION_ENABLED;
+	else
+		plane_surf &= ~PLANE_SURF_DECRYPTION_ENABLED;
+
+	intel_de_write_fw(dev_priv, PLANE_SURF(pipe, plane_id), plane_surf);
 
 	if (plane_state->scaler_id >= 0)
 		skl_program_scaler(plane, crtc_state, plane_state);
drivers/gpu/drm/i915/i915_reg.h +1 -0
index 97bcecada87f..7a4817054bc8 100644
@@ -7208,6 +7208,7 @@ enum {
 #define _PLANE_SURF_3(pipe)	_PIPE(pipe, _PLANE_SURF_3_A, _PLANE_SURF_3_B)
 #define PLANE_SURF(pipe, plane)	\
 	_MMIO_PLANE(plane, _PLANE_SURF_1(pipe), _PLANE_SURF_2(pipe))
+#define   PLANE_SURF_DECRYPTION_ENABLED		REG_BIT(2)
 
 #define _PLANE_OFFSET_1_B			0x711a4
 #define _PLANE_OFFSET_2_B			0x712a4
Signature · 6 lines
2.17.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#15 lore raw

[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Introduce Intel PXP component - Mesa single session (rev21)

In reply to Huang, Sean Z
== Series Details ==

== Series Details ==

Series: Introduce Intel PXP component - Mesa single session (rev21)
URL : https://patchwork.freedesktop.org/series/84620/
State : warning

== Summary ==

$ dim checkpatch origin/drm-tip
4396cc471fa4 drm/i915/pxp: Introduce Intel PXP component
-:123: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating?
#123: 
new file mode 100644

total: 0 errors, 1 warnings, 0 checks, 193 lines checked
18eb5c1f3813 drm/i915/pxp: set KCR reg init during the boot time
d3d5b2b2f9ce drm/i915/pxp: Implement funcs to create the TEE channel
-:89: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating? #89:
new file mode 100644

total: 0 errors, 1 warnings, 0 checks, 245 lines checked
8fe0a04af720 drm/i915/pxp: Create the arbitrary session after boot
-:47: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating? #47:
new file mode 100644

total: 0 errors, 1 warnings, 0 checks, 271 lines checked
af0d329ae1de drm/i915/pxp: Func to send hardware session termination
-:61: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating? #61:
new file mode 100644

total: 0 errors, 1 warnings, 0 checks, 188 lines checked
f3091e967834 drm/i915/pxp: Enable PXP irq worker and callback stub
-:11: WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line) #11:
- Fix bug, access i915 pointer before assigning the value at intel_pxp_irq_handler()

total: 0 errors, 1 warnings, 0 checks, 246 lines checked
325e18a57b1d drm/i915/pxp: Destroy arb session upon teardown
78610e3d2545 drm/i915/pxp: Enable PXP power management
-:78: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating? #78:
new file mode 100644

total: 0 errors, 1 warnings, 0 checks, 148 lines checked
dff69f1a3083 drm/i915/pxp: Expose session state for display protection flip d68784e0dd80 mei: pxp: export pavp client to me client bus
-:32: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating? #32:
new file mode 100644

total: 0 errors, 1 warnings, 0 checks, 277 lines checked cb92589b1f0b drm/i915/uapi: introduce drm_i915_gem_create_ext -:109: WARNING:LONG_LINE: line length of 120 exceeds 100 columns #109: FILE: include/uapi/drm/i915_drm.h:395:
+#define DRM_IOCTL_I915_GEM_CREATE_EXT DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_CREATE, struct drm_i915_gem_create_ext)

total: 0 errors, 1 warnings, 0 checks, 135 lines checked f2d3dd1da350 drm/i915/pxp: User interface for Protected buffer c3f48d1b5a60 drm/i915/pxp: Add plane decryption support

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#16 lore raw

[Intel-gfx] ✓ Fi.CI.BAT: success for Introduce Intel PXP component - Mesa single session (rev21)

In reply to Huang, Sean Z
== Series Details ==

== Series Details ==

Series: Introduce Intel PXP component - Mesa single session (rev21)
URL : https://patchwork.freedesktop.org/series/84620/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_9629 -> Patchwork_19387
====================================================

Summary
-------

**SUCCESS**

No regressions found.

External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/index.html

Known issues
------------

Here are the changes found in Patchwork_19387 that come from known issues:

### IGT changes ###

#### Issues hit ####

* igt@amdgpu/amd_basic@cs-gfx:
- fi-kbl-soraka: NOTRUN -> [SKIP][1] ([fdo#109271]) +17 similar issues
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/fi-kbl-soraka/igt@amdgpu/[email protected]

* igt@amdgpu/amd_basic@memory-alloc:
- fi-cml-u2: NOTRUN -> [SKIP][2] ([fdo#109315]) +17 similar issues
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/fi-cml-u2/igt@amdgpu/[email protected]

* igt@gem_exec_fence@basic-busy@bcs0:
- fi-cml-u2: NOTRUN -> [SKIP][3] ([i915#1208]) +1 similar issue
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/fi-cml-u2/igt@gem_exec_fence@[email protected]

* igt@gem_huc_copy@huc-copy:
- fi-cml-u2: NOTRUN -> [SKIP][4] ([i915#2190])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/fi-cml-u2/igt@[email protected]

* igt@i915_getparams_basic@basic-subslice-total:
- fi-tgl-y: [PASS][5] -> [DMESG-WARN][6] ([i915#402]) +1 similar issue
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9629/fi-tgl-y/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/fi-tgl-y/igt@[email protected]

* igt@i915_selftest@live@sanitycheck:
- fi-kbl-7500u: [PASS][7] -> [DMESG-WARN][8] ([i915#2605])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9629/fi-kbl-7500u/igt@i915_selftest@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/fi-kbl-7500u/igt@i915_selftest@[email protected]

* igt@kms_addfb_basic@addfb25-y-tiled-small-legacy:
- fi-snb-2600: NOTRUN -> [SKIP][9] ([fdo#109271]) +30 similar issues
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/fi-snb-2600/igt@[email protected]

* igt@kms_chamelium@hdmi-crc-fast:
- fi-snb-2600: NOTRUN -> [SKIP][10] ([fdo#109271] / [fdo#111827]) +8 similar issues
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/fi-snb-2600/igt@[email protected]

* igt@kms_chamelium@hdmi-hpd-fast:
- fi-cml-u2: NOTRUN -> [SKIP][11] ([i915#1004]) +2 similar issues
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/fi-cml-u2/igt@[email protected]

* igt@kms_chamelium@vga-edid-read:
- fi-cml-u2: NOTRUN -> [SKIP][12] ([fdo#109309]) +1 similar issue
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/fi-cml-u2/igt@[email protected]

* igt@kms_force_connector_basic@force-load-detect:
- fi-cml-u2: NOTRUN -> [SKIP][13] ([fdo#109285])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/fi-cml-u2/igt@[email protected]

* igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-d:
- fi-cml-u2: NOTRUN -> [SKIP][14] ([fdo#109278] / [i915#533])
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/fi-cml-u2/igt@[email protected]

* igt@runner@aborted:
- fi-skl-6700k2: NOTRUN -> [FAIL][15] ([i915#1814] / [i915#2873])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/fi-skl-6700k2/igt@[email protected]

#### Possible fixes ####

* igt@gem_exec_suspend@basic-s0:
- fi-snb-2600: [DMESG-WARN][16] ([i915#2772]) -> [PASS][17]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9629/fi-snb-2600/igt@[email protected]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/fi-snb-2600/igt@[email protected]

* igt@gem_exec_suspend@basic-s3:
- fi-tgl-y: [DMESG-WARN][18] ([i915#2411] / [i915#402]) -> [PASS][19]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9629/fi-tgl-y/igt@[email protected]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/fi-tgl-y/igt@[email protected]

* igt@gem_flink_basic@bad-flink:
- fi-tgl-y: [DMESG-WARN][20] ([i915#402]) -> [PASS][21] +1 similar issue
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9629/fi-tgl-y/igt@[email protected]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/fi-tgl-y/igt@[email protected]

* igt@i915_selftest@live@active:
- fi-bsw-n3050: [DMESG-FAIL][22] ([i915#2675] / [i915#541]) -> [PASS][23]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9629/fi-bsw-n3050/igt@i915_selftest@[email protected]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/fi-bsw-n3050/igt@i915_selftest@[email protected]

* igt@i915_selftest@live@execlists:
- fi-kbl-soraka: [INCOMPLETE][24] ([i915#1037] / [i915#794]) -> [PASS][25]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9629/fi-kbl-soraka/igt@i915_selftest@[email protected]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/fi-kbl-soraka/igt@i915_selftest@[email protected]

#### Warnings ####

* igt@debugfs_test@read_all_entries:
- fi-tgl-y: [DMESG-WARN][26] ([i915#1982] / [i915#402]) -> [DMESG-WARN][27] ([i915#402])
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9629/fi-tgl-y/igt@debugfs_test@read_all_entries.html
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/fi-tgl-y/igt@debugfs_test@read_all_entries.html

{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).

[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
[fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[fdo#109309]: https://bugs.freedesktop.org/show_bug.cgi?id=109309
[fdo#109315]: https://bugs.freedesktop.org/show_bug.cgi?id=109315
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#1004]: https://gitlab.freedesktop.org/drm/intel/issues/1004
[i915#1037]: https://gitlab.freedesktop.org/drm/intel/issues/1037
[i915#1208]: https://gitlab.freedesktop.org/drm/intel/issues/1208
[i915#1814]: https://gitlab.freedesktop.org/drm/intel/issues/1814
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#2411]: https://gitlab.freedesktop.org/drm/intel/issues/2411
[i915#2605]: https://gitlab.freedesktop.org/drm/intel/issues/2605
[i915#2675]: https://gitlab.freedesktop.org/drm/intel/issues/2675
[i915#2772]: https://gitlab.freedesktop.org/drm/intel/issues/2772
[i915#2873]: https://gitlab.freedesktop.org/drm/intel/issues/2873
[i915#402]: https://gitlab.freedesktop.org/drm/intel/issues/402
[i915#533]: https://gitlab.freedesktop.org/drm/intel/issues/533
[i915#541]: https://gitlab.freedesktop.org/drm/intel/issues/541
[i915#794]: https://gitlab.freedesktop.org/drm/intel/issues/794

Participating hosts (39 -> 38)
------------------------------

Additional (2): fi-cml-u2 fi-skl-6700k2
Missing (3): fi-bsw-cyan fi-bdw-samus fi-hsw-4200u

Build changes
-------------

* Linux: CI_DRM_9629 -> Patchwork_19387

CI-20190529: 20190529
CI_DRM_9629: 4cb18d3b417428a4e3834bf93f5de18b57984570 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5960: ace82fcd5f3623f8dde7c220a825873dc53dfae4 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_19387: c3f48d1b5a609db0b0ca877d2b1440891ecc1e2f @ git://anongit.freedesktop.org/gfx-ci/linux

== Linux commits ==

c3f48d1b5a60 drm/i915/pxp: Add plane decryption support f2d3dd1da350 drm/i915/pxp: User interface for Protected buffer cb92589b1f0b drm/i915/uapi: introduce drm_i915_gem_create_ext d68784e0dd80 mei: pxp: export pavp client to me client bus dff69f1a3083 drm/i915/pxp: Expose session state for display protection flip 78610e3d2545 drm/i915/pxp: Enable PXP power management 325e18a57b1d drm/i915/pxp: Destroy arb session upon teardown f3091e967834 drm/i915/pxp: Enable PXP irq worker and callback stub af0d329ae1de drm/i915/pxp: Func to send hardware session termination 8fe0a04af720 drm/i915/pxp: Create the arbitrary session after boot d3d5b2b2f9ce drm/i915/pxp: Implement funcs to create the TEE channel 18eb5c1f3813 drm/i915/pxp: set KCR reg init during the boot time 4396cc471fa4 drm/i915/pxp: Introduce Intel PXP component

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/index.html

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#17 lore raw

[Intel-gfx] ✗ Fi.CI.BUILD: failure for Introduce Intel PXP component - Mesa single session (rev22)

In reply to Huang, Sean Z
== Series Details ==

== Series Details ==

Series: Introduce Intel PXP component - Mesa single session (rev22)
URL : https://patchwork.freedesktop.org/series/84620/
State : failure

== Summary ==

Applying: drm/i915/pxp: Add plane decryption support
Applying: drm/i915/pxp: set KCR reg init during the boot time
Using index info to reconstruct a base tree...
A drivers/gpu/drm/i915/pxp/intel_pxp.c
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): drivers/gpu/drm/i915/pxp/intel_pxp.c deleted in HEAD and modified in drm/i915/pxp: set KCR reg init during the boot time. Version drm/i915/pxp: set KCR reg init during the boot time of drivers/gpu/drm/i915/pxp/intel_pxp.c left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 drm/i915/pxp: set KCR reg init during the boot time
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#18 lore raw

[Intel-gfx] ✗ Fi.CI.IGT: failure for Introduce Intel PXP component - Mesa single session (rev21)

In reply to Huang, Sean Z
== Series Details ==

== Series Details ==

Series: Introduce Intel PXP component - Mesa single session (rev21)
URL : https://patchwork.freedesktop.org/series/84620/
State : failure

== Summary ==

CI Bug Log - changes from CI_DRM_9629_full -> Patchwork_19387_full
====================================================

Summary
-------

**FAILURE**

Serious unknown changes coming with Patchwork_19387_full absolutely need to be verified manually.

If you think the reported changes have nothing to do with the changes introduced in Patchwork_19387_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.

Possible new issues
-------------------

Here are the unknown changes that may have been introduced in Patchwork_19387_full:

### IGT changes ###

#### Possible regressions ####

* igt@gem_exec_suspend@basic-s4-devices:
- shard-tglb: [PASS][1] -> [DMESG-WARN][2] +2 similar issues
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9629/shard-tglb7/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-tglb3/igt@[email protected]

* igt@i915_selftest@mock@dmabuf:
- shard-iclb: [PASS][3] -> [SKIP][4] +10 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9629/shard-iclb2/igt@i915_selftest@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-iclb7/igt@i915_selftest@[email protected]

* igt@i915_selftest@mock@objects:
- shard-tglb: [PASS][5] -> [SKIP][6] +10 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9629/shard-tglb8/igt@i915_selftest@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-tglb3/igt@i915_selftest@[email protected]

* igt@i915_selftest@mock@timelines:
- shard-kbl: [PASS][7] -> [DMESG-FAIL][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9629/shard-kbl4/igt@i915_selftest@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-kbl4/igt@i915_selftest@[email protected]
- shard-iclb: [PASS][9] -> [DMESG-FAIL][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9629/shard-iclb2/igt@i915_selftest@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-iclb7/igt@i915_selftest@[email protected]
- shard-apl: [PASS][11] -> [DMESG-FAIL][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9629/shard-apl6/igt@i915_selftest@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-apl7/igt@i915_selftest@[email protected]
- shard-glk: [PASS][13] -> [DMESG-FAIL][14]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9629/shard-glk5/igt@i915_selftest@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-glk9/igt@i915_selftest@[email protected]
- shard-skl: [PASS][15] -> [DMESG-FAIL][16]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9629/shard-skl1/igt@i915_selftest@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-skl1/igt@i915_selftest@[email protected]
- shard-tglb: [PASS][17] -> [DMESG-FAIL][18]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9629/shard-tglb8/igt@i915_selftest@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-tglb3/igt@i915_selftest@[email protected]
- shard-snb: [PASS][19] -> [DMESG-FAIL][20]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9629/shard-snb7/igt@i915_selftest@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-snb5/igt@i915_selftest@[email protected]

Known issues
------------

Here are the changes found in Patchwork_19387_full that come from known issues:

### IGT changes ###

#### Issues hit ####

* igt@gem_exec_params@secure-non-root:
- shard-iclb: NOTRUN -> [SKIP][21] ([fdo#112283])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-iclb6/igt@[email protected]

* igt@gem_exec_whisper@basic-normal:
- shard-glk: [PASS][22] -> [DMESG-WARN][23] ([i915#118] / [i915#95])
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9629/shard-glk8/igt@[email protected]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-glk4/igt@[email protected]

* igt@gem_pread@exhaustion:
- shard-iclb: NOTRUN -> [WARN][24] ([i915#2658])
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-iclb6/igt@[email protected]

* igt@gem_render_copy@yf-tiled-to-vebox-y-tiled:
- shard-iclb: NOTRUN -> [SKIP][25] ([i915#768])
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-iclb6/igt@[email protected]

* igt@gem_userptr_blits@readonly-unsync:
- shard-iclb: NOTRUN -> [SKIP][26] ([fdo#110426] / [i915#1704])
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-iclb6/igt@[email protected]

* igt@i915_module_load@reload-with-fault-injection:
- shard-snb: [PASS][27] -> [INCOMPLETE][28] ([i915#2880])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9629/shard-snb4/igt@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-snb2/igt@[email protected]

* igt@i915_pm_dc@dc6-psr:
- shard-iclb: [PASS][29] -> [FAIL][30] ([i915#454])
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9629/shard-iclb1/igt@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-iclb8/igt@[email protected]

* igt@i915_pm_rpm@modeset-non-lpsp:
- shard-iclb: NOTRUN -> [SKIP][31] ([fdo#110892])
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-iclb6/igt@[email protected]

* igt@i915_pm_rpm@system-suspend-devices:
- shard-tglb: [PASS][32] -> [DMESG-WARN][33] ([i915#2411])
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9629/shard-tglb8/igt@[email protected]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-tglb5/igt@[email protected]

* igt@i915_selftest@mock@dmabuf:
- shard-apl: [PASS][34] -> [SKIP][35] ([fdo#109271]) +10 similar issues
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9629/shard-apl6/igt@i915_selftest@[email protected]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-apl7/igt@i915_selftest@[email protected]

* igt@i915_selftest@mock@hugepages:
- shard-glk: [PASS][36] -> [SKIP][37] ([fdo#109271]) +10 similar issues
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9629/shard-glk5/igt@i915_selftest@[email protected]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-glk9/igt@i915_selftest@[email protected]

* igt@i915_selftest@mock@objects:
- shard-skl: [PASS][38] -> [SKIP][39] ([fdo#109271]) +10 similar issues
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9629/shard-skl1/igt@i915_selftest@[email protected]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-skl1/igt@i915_selftest@[email protected]

* igt@i915_selftest@mock@requests:
- shard-kbl: [PASS][40] -> [SKIP][41] ([fdo#109271]) +10 similar issues
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9629/shard-kbl4/igt@i915_selftest@[email protected]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-kbl4/igt@i915_selftest@[email protected]

* igt@i915_selftest@mock@vma:
- shard-snb: [PASS][42] -> [SKIP][43] ([fdo#109271]) +10 similar issues
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9629/shard-snb7/igt@i915_selftest@[email protected]
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-snb5/igt@i915_selftest@[email protected]

* igt@kms_async_flips@test-time-stamp:
- shard-tglb: [PASS][44] -> [FAIL][45] ([i915#2597])
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9629/shard-tglb2/igt@[email protected]
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-tglb1/igt@[email protected]

* igt@kms_ccs@pipe-c-crc-primary-rotation-180:
- shard-skl: NOTRUN -> [SKIP][46] ([fdo#109271] / [fdo#111304])
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-skl2/igt@[email protected]

* igt@kms_color@pipe-b-ctm-0-75:
- shard-iclb: NOTRUN -> [FAIL][47] ([i915#1149] / [i915#315])
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-iclb6/igt@[email protected]

* igt@kms_color@pipe-d-ctm-green-to-red:
- shard-iclb: NOTRUN -> [SKIP][48] ([fdo#109278] / [i915#1149])
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-iclb6/igt@[email protected]

* igt@kms_color_chamelium@pipe-a-ctm-0-25:
- shard-skl: NOTRUN -> [SKIP][49] ([fdo#109271] / [fdo#111827]) +1 similar issue
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-skl2/igt@[email protected]

* igt@kms_color_chamelium@pipe-c-ctm-0-5:
- shard-iclb: NOTRUN -> [SKIP][50] ([fdo#109284] / [fdo#111827]) +1 similar issue
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-iclb6/igt@[email protected]

* igt@kms_content_protection@uevent:
- shard-iclb: NOTRUN -> [SKIP][51] ([fdo#109300] / [fdo#111066])
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-iclb6/igt@[email protected]

* igt@kms_cursor_crc@pipe-b-cursor-64x21-offscreen:
- shard-skl: [PASS][52] -> [FAIL][53] ([i915#54]) +7 similar issues
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9629/shard-skl2/igt@[email protected]
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-skl4/igt@[email protected]

* igt@kms_cursor_crc@pipe-b-cursor-64x21-sliding:
- shard-skl: NOTRUN -> [FAIL][54] ([i915#54])
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-skl2/igt@[email protected]

* igt@kms_cursor_crc@pipe-d-cursor-128x42-sliding:
- shard-iclb: NOTRUN -> [SKIP][55] ([fdo#109278]) +1 similar issue
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-iclb6/igt@[email protected]

* igt@kms_cursor_legacy@cursorb-vs-flipb-atomic-transitions:
- shard-iclb: NOTRUN -> [SKIP][56] ([fdo#109274] / [fdo#109278])
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-iclb6/igt@[email protected]

* igt@kms_cursor_legacy@flip-vs-cursor-atomic:
- shard-skl: [PASS][57] -> [FAIL][58] ([i915#2346])
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9629/shard-skl10/igt@[email protected]
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-skl9/igt@[email protected]

* igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size:
- shard-skl: [PASS][59] -> [FAIL][60] ([i915#2346] / [i915#533])
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9629/shard-skl1/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-skl1/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html

* igt@kms_flip@2x-plain-flip:
- shard-iclb: NOTRUN -> [SKIP][61] ([fdo#109274]) +1 similar issue
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-iclb6/igt@[email protected]

* igt@kms_flip@flip-vs-expired-vblank-interruptible@b-edp1:
- shard-skl: [PASS][62] -> [FAIL][63] ([i915#2122])
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9629/shard-skl9/igt@kms_flip@[email protected]
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-skl7/igt@kms_flip@[email protected]

* igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-32bpp-ytilegen12rcccs:
- shard-skl: NOTRUN -> [SKIP][64] ([fdo#109271] / [i915#2672])
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-skl2/igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-32bpp-ytilegen12rcccs.html

* igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-spr-indfb-draw-pwrite:
- shard-skl: NOTRUN -> [SKIP][65] ([fdo#109271]) +41 similar issues
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-skl6/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-spr-indfb-draw-pwrite.html

* igt@kms_frontbuffer_tracking@fbcpsr-2p-primscrn-spr-indfb-draw-pwrite:
- shard-iclb: NOTRUN -> [SKIP][66] ([fdo#109280]) +6 similar issues
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-iclb6/igt@kms_frontbuffer_tracking@fbcpsr-2p-primscrn-spr-indfb-draw-pwrite.html

* igt@kms_hdr@bpc-switch:
- shard-skl: [PASS][67] -> [FAIL][68] ([i915#1188])
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9629/shard-skl7/igt@[email protected]
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-skl3/igt@[email protected]

* igt@kms_hdr@static-toggle:
- shard-iclb: NOTRUN -> [SKIP][69] ([i915#1187])
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-iclb6/igt@[email protected]

* igt@kms_plane_alpha_blend@pipe-a-coverage-7efc:
- shard-skl: [PASS][70] -> [FAIL][71] ([fdo#108145] / [i915#265])
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9629/shard-skl4/igt@[email protected]
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-skl2/igt@[email protected]

* igt@kms_plane_alpha_blend@pipe-c-constant-alpha-max:
- shard-skl: NOTRUN -> [FAIL][72] ([fdo#108145] / [i915#265])
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-skl2/igt@[email protected]

* igt@kms_psr2_su@page_flip:
- shard-iclb: [PASS][73] -> [SKIP][74] ([fdo#109642] / [fdo#111068])
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9629/shard-iclb2/igt@kms_psr2_su@page_flip.html
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-iclb7/igt@kms_psr2_su@page_flip.html

* igt@nouveau_crc@pipe-c-source-rg:
- shard-iclb: NOTRUN -> [SKIP][75] ([i915#2530]) +1 similar issue
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-iclb6/igt@[email protected]

* igt@perf_pmu@module-unload:
- shard-skl: [PASS][76] -> [DMESG-WARN][77] ([i915#1982] / [i915#262])
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9629/shard-skl3/igt@[email protected]
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-skl9/igt@[email protected]

* igt@prime_nv_pcopy@test3_1:
- shard-iclb: NOTRUN -> [SKIP][78] ([fdo#109291])
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-iclb6/igt@prime_nv_pcopy@test3_1.html

* igt@runner@aborted:
- shard-snb: NOTRUN -> [FAIL][79] ([i915#2426])
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-snb5/igt@[email protected]

* igt@sysfs_heartbeat_interval@mixed@vcs0:
- shard-skl: [PASS][80] -> [FAIL][81] ([i915#1731])
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9629/shard-skl9/igt@sysfs_heartbeat_interval@[email protected]
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-skl5/igt@sysfs_heartbeat_interval@[email protected]

#### Possible fixes ####

* igt@gem_ctx_persistence@smoketest:
- shard-iclb: [FAIL][82] ([i915#2896]) -> [PASS][83]
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9629/shard-iclb4/igt@[email protected]
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-iclb7/igt@[email protected]

* igt@gem_exec_capture@pi@vecs0:
- shard-skl: [INCOMPLETE][84] ([i915#198] / [i915#2624]) -> [PASS][85]
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9629/shard-skl6/igt@gem_exec_capture@[email protected]
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-skl10/igt@gem_exec_capture@[email protected]

* {igt@gem_exec_fair@basic-flow@rcs0}:
- shard-tglb: [FAIL][86] ([i915#2842]) -> [PASS][87]
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9629/shard-tglb8/igt@gem_exec_fair@[email protected]
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-tglb8/igt@gem_exec_fair@[email protected]

* {igt@gem_exec_fair@basic-none-share@rcs0}:
- shard-iclb: [FAIL][88] ([i915#2842]) -> [PASS][89]
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9629/shard-iclb7/igt@gem_exec_fair@[email protected]
[89]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-iclb8/igt@gem_exec_fair@[email protected]
- shard-apl: [SKIP][90] ([fdo#109271]) -> [PASS][91]
[90]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9629/shard-apl1/igt@gem_exec_fair@[email protected]
[91]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-apl4/igt@gem_exec_fair@[email protected]

* {igt@gem_exec_fair@basic-none-solo@rcs0}:
- shard-apl: [FAIL][92] ([i915#2842]) -> [PASS][93]
[92]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9629/shard-apl4/igt@gem_exec_fair@[email protected]
[93]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-apl8/igt@gem_exec_fair@[email protected]

* {igt@gem_exec_fair@basic-none-vip@rcs0}:
- shard-kbl: [FAIL][94] ([i915#2842]) -> [PASS][95] +1 similar issue
[94]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9629/shard-kbl6/igt@gem_exec_fair@[email protected]
[95]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-kbl6/igt@gem_exec_fair@[email protected]

* {igt@gem_exec_schedule@u-fairslice@rcs0}:
- shard-apl: [DMESG-WARN][96] ([i915#1610]) -> [PASS][97]
[96]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9629/shard-apl3/igt@gem_exec_schedule@[email protected]
[97]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-apl2/igt@gem_exec_schedule@[email protected]

* {igt@gem_exec_schedule@u-fairslice@vcs0}:
- shard-skl: [DMESG-WARN][98] ([i915#1610] / [i915#2803]) -> [PASS][99]
[98]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9629/shard-skl4/igt@gem_exec_schedule@[email protected]
[99]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-skl2/igt@gem_exec_schedule@[email protected]

* igt@gem_exec_whisper@basic-queues-priority:
- shard-iclb: [INCOMPLETE][100] ([i915#1895]) -> [PASS][101]
[100]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9629/shard-iclb4/igt@[email protected]
[101]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-iclb6/igt@[email protected]

* igt@gen9_exec_parse@allowed-single:
- shard-skl: [DMESG-WARN][102] ([i915#1436] / [i915#1982] / [i915#716]) -> [PASS][103]
[102]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9629/shard-skl4/igt@[email protected]
[103]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-skl2/igt@[email protected]

* igt@kms_async_flips@alternate-sync-async-flip:
- shard-skl: [FAIL][104] ([i915#2521]) -> [PASS][105]
[104]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9629/shard-skl6/igt@[email protected]
[105]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-skl10/igt@[email protected]

* igt@kms_big_fb@yf-tiled-16bpp-rotate-180:
- shard-kbl: [DMESG-WARN][106] ([i915#165]) -> [PASS][107]
[106]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9629/shard-kbl2/igt@[email protected]
[107]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-kbl7/igt@[email protected]

* igt@kms_cursor_crc@pipe-c-cursor-128x128-random:
- shard-skl: [FAIL][108] ([i915#54]) -> [PASS][109] +5 similar issues
[108]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9629/shard-skl7/igt@[email protected]
[109]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-skl3/igt@[email protected]

* igt@kms_cursor_edge_walk@pipe-a-64x64-top-edge:
- shard-glk: [DMESG-WARN][110] ([i915#118] / [i915#95]) -> [PASS][111]
[110]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9629/shard-glk4/igt@[email protected]
[111]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-glk4/igt@[email protected]

* igt@kms_cursor_legacy@flip-vs-cursor-toggle:
- shard-skl: [FAIL][112] ([i915#2346]) -> [PASS][113] +1 similar issue
[112]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9629/shard-skl3/igt@[email protected]
[113]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-skl5/igt@[email protected]

* igt@kms_flip@flip-vs-blocking-wf-vblank@b-edp1:
- shard-skl: [FAIL][114] ([i915#2122]) -> [PASS][115]
[114]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9629/shard-skl2/igt@kms_flip@[email protected]
[115]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-skl4/igt@kms_flip@[email protected]

* igt@kms_flip@flip-vs-suspend@a-edp1:
- shard-skl: [INCOMPLETE][116] ([i915#146] / [i915#198]) -> [PASS][117]
[116]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9629/shard-skl5/igt@kms_flip@[email protected]
[117]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-skl6/igt@kms_flip@[email protected]

* igt@kms_plane_alpha_blend@pipe-c-coverage-7efc:
- shard-skl: [FAIL][118] ([fdo#108145] / [i915#265]) -> [PASS][119]
[118]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9629/shard-skl3/igt@[email protected]
[119]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-skl5/igt@[email protected]

* igt@kms_plane_alpha_blend@pipe-c-coverage-vs-premult-vs-constant:
- shard-kbl: [DMESG-WARN][120] ([i915#180] / [i915#78]) -> [PASS][121] +1 similar issue
[120]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9629/shard-kbl2/igt@kms_plane_alpha_blend@pipe-c-coverage-vs-premult-vs-constant.html
[121]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-kbl7/igt@kms_plane_alpha_blend@pipe-c-coverage-vs-premult-vs-constant.html

* igt@kms_psr@psr2_cursor_render:
- shard-iclb: [SKIP][122] ([fdo#109441]) -> [PASS][123] +1 similar issue
[122]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9629/shard-iclb5/igt@kms_psr@psr2_cursor_render.html
[123]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-iclb2/igt@kms_psr@psr2_cursor_render.html

* igt@sysfs_heartbeat_interval@mixed@rcs0:
- shard-skl: [INCOMPLETE][124] ([i915#1731] / [i915#198]) -> [PASS][125]
[124]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9629/shard-skl9/igt@sysfs_heartbeat_interval@[email protected]
[125]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-skl5/igt@sysfs_heartbeat_interval@[email protected]

#### Warnings ####

* igt@i915_pm_rc6_residency@rc6-fence:
- shard-iclb: [WARN][126] ([i915#1804] / [i915#2684]) -> [WARN][127] ([i915#2681] / [i915#2684])
[126]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9629/shard-iclb6/igt@[email protected]
[127]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-iclb1/igt@[email protected]

* igt@i915_pm_rc6_residency@rc6-idle:
- shard-iclb: [WARN][128] ([i915#2681] / [i915#2684]) -> [WARN][129] ([i915#1804] / [i915#2684])
[128]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9629/shard-iclb1/igt@[email protected]
[129]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-iclb4/igt@[email protected]

* igt@runner@aborted:
- shard-kbl: [FAIL][130] ([i915#2295]) -> ([FAIL][131], [FAIL][132]) ([i915#1436] / [i915#2295] / [i915#2426])
[130]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9629/shard-kbl7/igt@[email protected]
[131]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-kbl1/igt@[email protected]
[132]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-kbl4/igt@[email protected]
- shard-iclb: [FAIL][133] ([i915#2295] / [i915#2724]) -> ([FAIL][134], [FAIL][135]) ([i915#2295] / [i915#2426] / [i915#2724])
[133]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9629/shard-iclb4/igt@[email protected]
[134]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-iclb3/igt@[email protected]
[135]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-iclb7/igt@[email protected]
- shard-glk: [FAIL][136] ([i915#2295] / [k.org#202321]) -> ([FAIL][137], [FAIL][138]) ([i915#2295] / [i915#2426] / [k.org#202321])
[136]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9629/shard-glk5/igt@[email protected]
[137]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-glk9/igt@[email protected]
[138]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-glk9/igt@[email protected]
- shard-tglb: [FAIL][139] ([i915#2295] / [i915#2667]) -> ([FAIL][140], [FAIL][141]) ([i915#1764] / [i915#2295] / [i915#2426] / [i915#2667])
[139]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9629/shard-tglb1/igt@[email protected]
[140]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-tglb8/igt@[email protected]
[141]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/shard-tglb3/igt@[email protected]

{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).

[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109274]: https://bugs.freedesktop.org/show_bug.cgi?id=109274
[fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
[fdo#109280]: https://bugs.freedesktop.org/show_bug.cgi?id=109280
[fdo#109284]: https://bugs.freedesktop.org/show_bug.cgi?id=109284
[fdo#109291]: https://bugs.freedesktop.org/show_bug.cgi?id=109291
[fdo#109300]: https://bugs.freedesktop.org/show_bug.cgi?id=109300
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642
[fdo#110426]: https://bugs.freedesktop.org/show_bug.cgi?id=110426
[fdo#110892]: https://bugs.freedesktop.org/show_bug.cgi?id=110892
[fdo#111066]: https://bugs.freedesktop.org/show_bug.cgi?id=111066
[fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
[fdo#111304]: https://bugs.freedesktop.org/show_bug.cgi?id=111304
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[fdo#112283]: https://bugs.freedesktop.org/show_bug.cgi?id=112283
[i915#1149]: https://gitlab.freedesktop.org/drm/intel/issues/1149
[i915#118]: https://gitlab.freedesktop.org/drm/intel/issues/118
[i915#1187]: https://gitlab.freedesktop.org/drm/intel/issues/1187
[i915#1188]: https://gitlab.freedesktop.org/drm/intel/issues/1188
[i915#1436]: https://gitlab.freedesktop.org/drm/intel/issues/1436
[i915#146]: https://gitlab.freedesktop.org/drm/intel/issues/146
[i915#1610]: https://gitlab.freedesktop.org/drm/intel/issues/1610
[i915#165]: https://gitlab.freedesktop.org/drm/intel/issues/165
[i915#1704]: https://gitlab.freedesktop.org/drm/intel/issues/1704
[i915#1731]: https://gitlab.freedesktop.org/drm/intel/issues/1731
[i915#1764]: https://gitlab.freedesktop.org/drm/intel/issues/1764
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#1804]: https://gitlab.freedesktop.org/drm/intel/issues/1804
[i915#1895]: https://gitlab.freedesktop.org/drm/intel/issues/1895
[i915#198]: https://gitlab.freedesktop.org/drm/intel/issues/198
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2122]: https://gitlab.freedesktop.org/drm/intel/issues/2122
[i915#2295]: https://gitlab.freedesktop.org/drm/intel/issues/2295
[i915#2346]: https://gitlab.freedesktop.org/drm/intel/issues/2346
[i915#2411]: https://gitlab.freedesktop.org/drm/intel/issues/2411
[i915#2426]: https://gitlab.freedesktop.org/drm/intel/issues/2426
[i915#2521]: https://gitlab.freedesktop.org/drm/intel/issues/2521
[i915#2530]: https://gitlab.freedesktop.org/drm/intel/issues/2530
[i915#2597]: https://gitlab.freedesktop.org/drm/intel/issues/2597
[i915#262]: https://gitlab.freedesktop.org/drm/intel/issues/262
[i915#2624]: https://gitlab.freedesktop.org/drm/intel/issues/2624
[i915#265]: htt

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19387/index.html

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Tested-by on the v21 series
#19 lore raw
In reply to Huang, Sean Z

Hi Sean,

FYI, I updated our Mesa drivers with the new I915_CONTEXT_PARAM_PROTECTED_CONTENT requirement to be only at creation time [1] [2] and gave a try to this series. It all works fine :

Cheers,

-Lionel

[1] : https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8064
[2] : https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8092

Quoted 137 lines · Sean Z

PXP (Protected Xe Path) is an i915 component, available on GEN12+ that helps to establish the hardware protected session and manage the status of the alive software session, as well as its life cycle.

This patch series is to allow the kernel space to create and manage a single hardware session (a.k.a. default session or arbitrary session). So user can allocate the protected buffer, which is encrypted with the leverage of the arbitrary hardware session.

rev21:
#01
- Remove the term "Mesa" from the help description of Kconfig
- Remove unnecessary "select INTEL_MEI_TXE" from DRM_I915_PXP in Kconfig

#02
- Remove "#define KCR_INIT_MASK_SHIFT (16)", but still keep the macro in this .c file
- Write KCR_INIT reg inly for gen12 during boot, not required for gen13+

#03
- Remove debug print_hex_dump() from intel_pxp_tee_io_message()
- In struct i915_pxp_component_ops, change "receive" to "recv"

#04:
- Rename SESSION_TYPE_TYPE0, SESSION_TYPE_TYPE1 as SESSION_TYPE_HWDRM,
SESSION_TYPE_NONHWDRM to have better meaning.
- Remove enum pxp_session_types and enum pxp_protection_modes from
single session patch series.

#05
In intel_pxp_cmd.c:
- Remove the debug print as well as print_hex_dump()
- Should call i915_gem_object_flush_map() before unpin map
- Using "goto label" instead of bool such as is_engine_pm_get
- We should always return the error if any, instead of skip with i915_request_set_error_once()

#06
- Fix bug, access i915 pointer before assigning the value at intel_pxp_irq_handler()
- Writing register GEN11_CRYPTO_RSVD_INTR_ENABLE to enable the PXP irq
- Remove the unnecessary comment for GEN11_CRYPTO_RSVD_INTR_MASK

#07
- Bug fixing, we need to set the PXP_GLOBAL_TERMINATE 0x320f8 register after arb session termination
- Remove enum pxp_session_types and enum pxp_protection_modes from
single session patch series.

#11
- Fix "Fi.CI.CHECKPATCH" warnings

#12
- Only allow set I915_CONTEXT_PARAM_PROTECTED_CONTENT during context
creation (i915_gem_context_create_ioctl), but not allow during context set param (i915_gem_context_setparam_ioctl)

Anshuman Gupta (1):
drm/i915/pxp: Add plane decryption support

Bommu Krishnaiah (2):
drm/i915/uapi: introduce drm_i915_gem_create_ext drm/i915/pxp: User interface for Protected buffer

Huang, Sean Z (9):
drm/i915/pxp: Introduce Intel PXP component drm/i915/pxp: set KCR reg init during the boot time drm/i915/pxp: Implement funcs to create the TEE channel drm/i915/pxp: Create the arbitrary session after boot drm/i915/pxp: Func to send hardware session termination drm/i915/pxp: Enable PXP irq worker and callback stub drm/i915/pxp: Destroy arb session upon teardown drm/i915/pxp: Enable PXP power management drm/i915/pxp: Expose session state for display protection flip

Vitaly Lubart (1):
mei: pxp: export pavp client to me client bus

  drivers/gpu/drm/i915/Kconfig                  |  21 ++
  drivers/gpu/drm/i915/Makefile                 |   9 +
  drivers/gpu/drm/i915/display/intel_sprite.c   |  21 +-
  drivers/gpu/drm/i915/gem/i915_gem_context.c   |  15 +-
  drivers/gpu/drm/i915/gem/i915_gem_context.h   |   5 +
  .../gpu/drm/i915/gem/i915_gem_context_types.h |   1 +
  drivers/gpu/drm/i915/gem/i915_gem_create.c    |  68 +++++-
  .../gpu/drm/i915/gem/i915_gem_object_types.h  |   5 +
  drivers/gpu/drm/i915/gt/intel_gt.c            |   5 +
  drivers/gpu/drm/i915/gt/intel_gt_irq.c        |  14 ++
  drivers/gpu/drm/i915/gt/intel_gt_pm.c         |   4 +
  drivers/gpu/drm/i915/gt/intel_gt_types.h      |   3 +
  drivers/gpu/drm/i915/i915_drv.c               |   7 +-
  drivers/gpu/drm/i915/i915_drv.h               |   6 +
  drivers/gpu/drm/i915/i915_reg.h               |   2 +
  drivers/gpu/drm/i915/pxp/intel_pxp.c          | 185 ++++++++++++++
  drivers/gpu/drm/i915/pxp/intel_pxp.h          |  64 +++++
  drivers/gpu/drm/i915/pxp/intel_pxp_arb.c      | 208 ++++++++++++++++
  drivers/gpu/drm/i915/pxp/intel_pxp_arb.h      |  17 ++
  drivers/gpu/drm/i915/pxp/intel_pxp_cmd.c      | 223 +++++++++++++++++
  drivers/gpu/drm/i915/pxp/intel_pxp_cmd.h      |  19 ++
  drivers/gpu/drm/i915/pxp/intel_pxp_context.c  |  28 +++
  drivers/gpu/drm/i915/pxp/intel_pxp_context.h  |  15 ++
  drivers/gpu/drm/i915/pxp/intel_pxp_pm.c       |  65 +++++
  drivers/gpu/drm/i915/pxp/intel_pxp_pm.h       |  31 +++
  drivers/gpu/drm/i915/pxp/intel_pxp_tee.c      | 202 +++++++++++++++
  drivers/gpu/drm/i915/pxp/intel_pxp_tee.h      |  17 ++
  drivers/gpu/drm/i915/pxp/intel_pxp_types.h    |  38 +++
  drivers/misc/mei/Kconfig                      |   2 +
  drivers/misc/mei/Makefile                     |   1 +
  drivers/misc/mei/pxp/Kconfig                  |  13 +
  drivers/misc/mei/pxp/Makefile                 |   7 +
  drivers/misc/mei/pxp/mei_pxp.c                | 230 ++++++++++++++++++
  drivers/misc/mei/pxp/mei_pxp.h                |  18 ++
  include/drm/i915_component.h                  |   1 +
  include/drm/i915_pxp_tee_interface.h          |  45 ++++
  include/uapi/drm/i915_drm.h                   |  66 +++++
  37 files changed, 1671 insertions(+), 10 deletions(-)

create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp.c create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp.h create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_arb.c create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_arb.h create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_cmd.c create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_cmd.h create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_context.c create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_context.h create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_pm.c create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_pm.h

Quoted 9 lines

create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_tee.c create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_tee.h create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_types.h create mode 100644 drivers/misc/mei/pxp/Kconfig create mode 100644 drivers/misc/mei/pxp/Makefile create mode 100644 drivers/misc/mei/pxp/mei_pxp.c create mode 100644 drivers/misc/mei/pxp/mei_pxp.h create mode 100644 include/drm/i915_pxp_tee_interface.h

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

author Tested-by Lionel Landwerlin
#20 lore raw

Hi Lionel,

I'm glad to hear the good news, thank you!

Best regards,
Sean

-----Original Message-----
From: Lionel Landwerlin <[email protected]>
Sent: Monday, January 18, 2021 5:17 AM
To: Huang, Sean Z <[email protected]>; [email protected]
Cc: Gaurav, Kumar <[email protected]>
Subject: Re: [Intel-gfx] [RFC-v21 00/13] Introduce Intel PXP component - Mesa single session

Hi Sean,

FYI, I updated our Mesa drivers with the new I915_CONTEXT_PARAM_PROTECTED_CONTENT requirement to be only at creation time [1] [2] and gave a try to this series. It all works fine :

Cheers,

-Lionel

[1] : https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8064
[2] : https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8092

Quoted 137 lines · Sean Z

PXP (Protected Xe Path) is an i915 component, available on GEN12+ that helps to establish the hardware protected session and manage the status of the alive software session, as well as its life cycle.

This patch series is to allow the kernel space to create and manage a single hardware session (a.k.a. default session or arbitrary session). So user can allocate the protected buffer, which is encrypted with the leverage of the arbitrary hardware session.

rev21:
#01
- Remove the term "Mesa" from the help description of Kconfig
- Remove unnecessary "select INTEL_MEI_TXE" from DRM_I915_PXP in Kconfig

#02
- Remove "#define KCR_INIT_MASK_SHIFT (16)", but still keep the macro in this .c file
- Write KCR_INIT reg inly for gen12 during boot, not required for gen13+

#03
- Remove debug print_hex_dump() from intel_pxp_tee_io_message()
- In struct i915_pxp_component_ops, change "receive" to "recv"

#04:
- Rename SESSION_TYPE_TYPE0, SESSION_TYPE_TYPE1 as SESSION_TYPE_HWDRM,
SESSION_TYPE_NONHWDRM to have better meaning.
- Remove enum pxp_session_types and enum pxp_protection_modes from
single session patch series.

#05
In intel_pxp_cmd.c:
- Remove the debug print as well as print_hex_dump()
- Should call i915_gem_object_flush_map() before unpin map
- Using "goto label" instead of bool such as is_engine_pm_get
- We should always return the error if any, instead of skip with i915_request_set_error_once()

#06
- Fix bug, access i915 pointer before assigning the value at intel_pxp_irq_handler()
- Writing register GEN11_CRYPTO_RSVD_INTR_ENABLE to enable the PXP irq
- Remove the unnecessary comment for
GEN11_CRYPTO_RSVD_INTR_MASK

#07
- Bug fixing, we need to set the PXP_GLOBAL_TERMINATE 0x320f8 register after arb session termination
- Remove enum pxp_session_types and enum pxp_protection_modes from
single session patch series.

#11
- Fix "Fi.CI.CHECKPATCH" warnings

#12
- Only allow set I915_CONTEXT_PARAM_PROTECTED_CONTENT during context
creation (i915_gem_context_create_ioctl), but not allow during context set param (i915_gem_context_setparam_ioctl)

Anshuman Gupta (1):
drm/i915/pxp: Add plane decryption support

Bommu Krishnaiah (2):
drm/i915/uapi: introduce drm_i915_gem_create_ext drm/i915/pxp: User interface for Protected buffer

Huang, Sean Z (9):
drm/i915/pxp: Introduce Intel PXP component drm/i915/pxp: set KCR reg init during the boot time drm/i915/pxp: Implement funcs to create the TEE channel drm/i915/pxp: Create the arbitrary session after boot drm/i915/pxp: Func to send hardware session termination drm/i915/pxp: Enable PXP irq worker and callback stub drm/i915/pxp: Destroy arb session upon teardown drm/i915/pxp: Enable PXP power management drm/i915/pxp: Expose session state for display protection flip

Vitaly Lubart (1):
mei: pxp: export pavp client to me client bus

  drivers/gpu/drm/i915/Kconfig                  |  21 ++
  drivers/gpu/drm/i915/Makefile                 |   9 +
  drivers/gpu/drm/i915/display/intel_sprite.c   |  21 +-
  drivers/gpu/drm/i915/gem/i915_gem_context.c   |  15 +-
  drivers/gpu/drm/i915/gem/i915_gem_context.h   |   5 +
  .../gpu/drm/i915/gem/i915_gem_context_types.h |   1 +
  drivers/gpu/drm/i915/gem/i915_gem_create.c    |  68 +++++-
  .../gpu/drm/i915/gem/i915_gem_object_types.h  |   5 +
  drivers/gpu/drm/i915/gt/intel_gt.c            |   5 +
  drivers/gpu/drm/i915/gt/intel_gt_irq.c        |  14 ++
  drivers/gpu/drm/i915/gt/intel_gt_pm.c         |   4 +
  drivers/gpu/drm/i915/gt/intel_gt_types.h      |   3 +
  drivers/gpu/drm/i915/i915_drv.c               |   7 +-
  drivers/gpu/drm/i915/i915_drv.h               |   6 +
  drivers/gpu/drm/i915/i915_reg.h               |   2 +
  drivers/gpu/drm/i915/pxp/intel_pxp.c          | 185 ++++++++++++++
  drivers/gpu/drm/i915/pxp/intel_pxp.h          |  64 +++++
  drivers/gpu/drm/i915/pxp/intel_pxp_arb.c      | 208 ++++++++++++++++
  drivers/gpu/drm/i915/pxp/intel_pxp_arb.h      |  17 ++
  drivers/gpu/drm/i915/pxp/intel_pxp_cmd.c      | 223 +++++++++++++++++
  drivers/gpu/drm/i915/pxp/intel_pxp_cmd.h      |  19 ++
  drivers/gpu/drm/i915/pxp/intel_pxp_context.c  |  28 +++
  drivers/gpu/drm/i915/pxp/intel_pxp_context.h  |  15 ++
  drivers/gpu/drm/i915/pxp/intel_pxp_pm.c       |  65 +++++
  drivers/gpu/drm/i915/pxp/intel_pxp_pm.h       |  31 +++
  drivers/gpu/drm/i915/pxp/intel_pxp_tee.c      | 202 +++++++++++++++
  drivers/gpu/drm/i915/pxp/intel_pxp_tee.h      |  17 ++
  drivers/gpu/drm/i915/pxp/intel_pxp_types.h    |  38 +++
  drivers/misc/mei/Kconfig                      |   2 +
  drivers/misc/mei/Makefile                     |   1 +
  drivers/misc/mei/pxp/Kconfig                  |  13 +
  drivers/misc/mei/pxp/Makefile                 |   7 +
  drivers/misc/mei/pxp/mei_pxp.c                | 230 ++++++++++++++++++
  drivers/misc/mei/pxp/mei_pxp.h                |  18 ++
  include/drm/i915_component.h                  |   1 +
  include/drm/i915_pxp_tee_interface.h          |  45 ++++
  include/uapi/drm/i915_drm.h                   |  66 +++++
  37 files changed, 1671 insertions(+), 10 deletions(-)

create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp.c create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp.h create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_arb.c create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_arb.h create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_cmd.c create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_cmd.h create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_context.c create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_context.h create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_pm.c create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_pm.h

Quoted 9 lines

create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_tee.c create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_tee.h create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_types.h create mode 100644 drivers/misc/mei/pxp/Kconfig create mode 100644 drivers/misc/mei/pxp/Makefile create mode 100644 drivers/misc/mei/pxp/mei_pxp.c create mode 100644 drivers/misc/mei/pxp/mei_pxp.h create mode 100644 include/drm/i915_pxp_tee_interface.h

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx