09c67be8fccbfac0772ced72ed2f5d18c786c0e1a813f18007e810f4.patch

From ff7d8ecab1ba28800b52d4a57224d6fc9ba34bae Mon Sep 17 00:00:00 2001
From: Juston Li <juston.li@intel.com>
Date: Thu, 8 Jul 2021 16:11:20 -0700
Subject: [PATCH] CHROMIUM: drm/i915/pxp: import downstream pxp definitions

To avoid ioctl define collision and upstream conflicts, definitions for
PXP multi-session downstream implementation will live in
include/uapi/drm/i915_drm_downstream.h.

These definitions must be synchornized with other kernels that support
PXP.

BUG=b:227971069
TEST=tast run <IP> video.PlayDRM*

Signed-off-by: Juston Li <juston.li@intel.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/3203914
Tested-by: Jeffrey Kardatzke <jkardatzke@google.com>
Reviewed-by: Jeffrey Kardatzke <jkardatzke@google.com>
Commit-Queue: Jeffrey Kardatzke <jkardatzke@google.com>

Change-Id: Iad6198f26221cefbf9879d2a25364a54381926a4
Signed-off-by: Sudarshan S <sudarshan.s@intel.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/3699227
Tested-by: Altaf Basha <altaf.basha@intel.com>
Commit-Queue: Victor Ding <victording@chromium.org>
Reviewed-by: Drew Davenport <ddavenport@chromium.org>
---
 include/uapi/drm/i915_drm.h            |  2 +
 include/uapi/drm/i915_drm_downstream.h | 87 ++++++++++++++++++++++++++
 2 files changed, 89 insertions(+)
 create mode 100644 include/uapi/drm/i915_drm_downstream.h

diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h
index 7000e5910a1d7453d99b92152689fa62a2422776..063ffb43890fa857a8bdc149a4fff546991eebd2 100644
--- a/include/uapi/drm/i915_drm.h
+++ b/include/uapi/drm/i915_drm.h
@@ -3838,6 +3838,8 @@ struct drm_i915_gem_create_ext_set_pat {
 	__u32 rsvd;
 };
 
+#include "i915_drm_downstream.h"
+
 /* ID of the protected content session managed by i915 when PXP is active */
 #define I915_PROTECTED_CONTENT_DEFAULT_SESSION 0xf
 
diff --git a/include/uapi/drm/i915_drm_downstream.h b/include/uapi/drm/i915_drm_downstream.h
new file mode 100644
index 0000000000000000000000000000000000000000..7002cd22beb6d44aca569ec90e7277684e7b3bf2
--- /dev/null
+++ b/include/uapi/drm/i915_drm_downstream.h
@@ -0,0 +1,87 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright © 2021 Intel Corporation
+ */
+
+#ifndef __I915_DRM_DOWNSTREAM_H__
+#define __I915_DRM_DOWNSTREAM_H__
+
+#include "drm.h"
+
+/*
+ * Modifications to structs/values defined here are subject to
+ * backwards-compatibility constraints.
+ *
+ * Downstream declarations must be added here, not to i915_drm.h.
+ * The values in i915_drm_downstream.h must also be kept
+ * synchronized with values in i915_drm.h.
+ */
+
+#define DOWNSTREAM_DRM_IOCTL_DEF_DRV(ioctl, _func, _flags)                  \
+	[DRM_IOCTL_NR(DOWNSTREAM_DRM_IOCTL_##ioctl) - DRM_COMMAND_BASE] = { \
+		.cmd = DOWNSTREAM_DRM_IOCTL_##ioctl,                        \
+		.func = _func,                                          \
+		.flags = _flags,                                        \
+		.name = #ioctl                                          \
+	}
+
+/* DOWNSTREAM ioctl's */
+
+/* DOWNSTREAM ioctl numbers go down from 0x5f */
+#define DOWNSTREAM_DRM_I915_PXP_OPS		0x5f
+
+#define DOWNSTREAM_DRM_IOCTL_I915_PXP_OPS	DRM_IOWR(DRM_COMMAND_BASE + \
+						DOWNSTREAM_DRM_I915_PXP_OPS, \
+						struct downstream_drm_i915_pxp_ops)
+
+/* End DOWNSTREAM ioctl's */
+
+/*
+ * struct pxp_set_session_status_params - Params to reserved, set or destroy
+ * the session from the PXP state machine.
+ */
+struct downstream_drm_i915_pxp_set_session_status_params {
+	__u32 pxp_tag; /* in/out, session identifier tag */
+	__u32 session_type; /* in, session type */
+	__u32 session_mode; /* in, session mode */
+#define DOWNSTREAM_DRM_I915_PXP_MODE_LM 0
+#define DOWNSTREAM_DRM_I915_PXP_MODE_HM 1
+#define DOWNSTREAM_DRM_I915_PXP_MODE_SM 2
+
+	__u32 req_session_state; /* in, new session state */
+	/* Request KMD to allocate session id and move it to INIT */
+#define DOWNSTREAM_DRM_I915_PXP_REQ_SESSION_ID_INIT 0
+	/* Inform KMD that UMD has completed the initialization */
+#define DOWNSTREAM_DRM_I915_PXP_REQ_SESSION_IN_PLAY 1
+	/* Request KMD to terminate the session */
+#define DOWNSTREAM_DRM_I915_PXP_REQ_SESSION_TERMINATE 2
+} __attribute__((packed));
+
+/*
+ * DRM_I915_PXP_OPS -
+ *
+ * PXP is an i915 componment, that helps user space to establish the hardware
+ * protected session and manage the status of each alive software session,
+ * as well as the life cycle of each session.
+ *
+ * This ioctl is to allow user space driver to create, set, and destroy each
+ * session. It also provides the communication chanel to TEE (Trusted
+ * Execution Environment) for the protected hardware session creation.
+ */
+
+struct downstream_drm_i915_pxp_ops {
+	__u32 action; /* in - specified action of this operation */
+#define DOWNSTREAM_DRM_I915_PXP_ACTION_SET_SESSION_STATUS 0
+
+	__u32 status; /* out - status output for this operation */
+#define DOWNSTREAM_DRM_I915_PXP_OP_STATUS_SUCCESS 0
+#define DOWNSTREAM_DRM_I915_PXP_OP_STATUS_RETRY_REQUIRED 1
+#define DOWNSTREAM_DRM_I915_PXP_OP_STATUS_SESSION_NOT_AVAILABLE 2
+#define DOWNSTREAM_DRM_I915_PXP_OP_STATUS_ERROR_UNKNOWN 3
+
+	__u64 params; /* in/out - pointer to data matching the action */
+} __attribute__((packed));
+
+#define DOWNSTREAM_PERF_VERSION	(1000)
+
+#endif /* __I915_DRM_DOWNSTREAM_H__ */
-- 
2.34.1