9f8f297234ecb923355611d6d75b1e140cc4f672da2dce0f9faedf34.patch

From 12ff23560e791b88fd06e0e2f3f8e3875cd5beca Mon Sep 17 00:00:00 2001
From: Tomas Winkler <tomas.winkler@intel.com>
Date: Fri, 11 Dec 2020 01:04:56 -0800
Subject: [PATCH] CHROMIUM: mei: pxp: add vtag parameter to
 mei_pxp_send/receive interface

Added vtag parameter to mei_pxp_send_message and mei_pxp_receive_message
functions.

Signed-off-by: Vitaly Lubart <vitaly.lubart@intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
(am from https://patchwork.freedesktop.org/patch/407046/)

For now, send vtag id 1 for all msgs until sandbox support is
implemented

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

Signed-off-by: Juston Li <juston.li@intel.com>
Change-Id: Ie56731133e2786991e407e80da8bbc38c7a33f20
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/3203920
Tested-by: Jeffrey Kardatzke <jkardatzke@google.com>
Reviewed-by: Jeffrey Kardatzke <jkardatzke@google.com>
Commit-Queue: Jeffrey Kardatzke <jkardatzke@google.com>
---
 drivers/gpu/drm/i915/pxp/intel_pxp_tee.c | 4 ++--
 include/drm/i915_pxp_tee_interface.h     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/i915/pxp/intel_pxp_tee.c b/drivers/gpu/drm/i915/pxp/intel_pxp_tee.c
--- a/drivers/gpu/drm/i915/pxp/intel_pxp_tee.c
+++ b/drivers/gpu/drm/i915/pxp/intel_pxp_tee.c
@@ -37,13 +37,13 @@ static int intel_pxp_tee_io_message(struct intel_pxp *pxp,
 		goto unlock;
 	}
 
-	ret = pxp_component->ops->send(pxp_component->tee_dev, msg_in, msg_in_size);
+	ret = pxp_component->ops->send(pxp_component->tee_dev, msg_in, msg_in_size, 1);
 	if (ret) {
 		drm_err(&i915->drm, "Failed to send PXP TEE message\n");
 		goto unlock;
 	}
 
-	ret = pxp_component->ops->recv(pxp_component->tee_dev, msg_out, msg_out_max_size);
+	ret = pxp_component->ops->recv(pxp_component->tee_dev, msg_out, msg_out_max_size, 1);
 	if (ret < 0) {
 		drm_err(&i915->drm, "Failed to receive PXP TEE message\n");
 		goto unlock;
diff --git a/include/drm/i915_pxp_tee_interface.h b/include/drm/i915_pxp_tee_interface.h
--- a/include/drm/i915_pxp_tee_interface.h
+++ b/include/drm/i915_pxp_tee_interface.h
@@ -21,8 +21,8 @@ struct i915_pxp_component_ops {
 	 */
 	struct module *owner;
 
-	int (*send)(struct device *dev, const void *message, size_t size);
-	int (*recv)(struct device *dev, void *buffer, size_t size);
+	int (*send)(struct device *dev, const void *message, size_t size, u8 vtag);
+	int (*recv)(struct device *dev, void *buffer, size_t size, u8 vtag);
 };
 
 /**
-- 
2.33.0.1079.g6e70778dc9-goog