[Intel-gfx] [RFC 7/7] drm/i915/pxp: Better hierarchy readibility - move backends to a backend folder

[Alan Previn]

Move the mei and gsccs backend implementation files into a backend folder
This would provide clearer readibility of file hiearchy with regards to this
backend vs front end thus encouraging better code location selcection for
future changes.

Signed-off-by: Alan Previn <alan.previn.teres.alexis at intel.com>
---
 drivers/gpu/drm/i915/Makefile                         |  6 +++---
 drivers/gpu/drm/i915/pxp/intel_pxp_tee.c              |  4 ++--
 .../drm/i915/pxp/{ => tee_backends}/intel_pxp_gsccs.c |  6 ++++--
 .../drm/i915/pxp/{ => tee_backends}/intel_pxp_gsccs.h |  0
 .../i915/pxp/{ => tee_backends}/intel_pxp_tee_mei.c   | 11 ++++++-----
 .../i915/pxp/{ => tee_backends}/intel_pxp_tee_mei.h   |  0
 6 files changed, 15 insertions(+), 12 deletions(-)
 rename drivers/gpu/drm/i915/pxp/{ => tee_backends}/intel_pxp_gsccs.c (92%)
 rename drivers/gpu/drm/i915/pxp/{ => tee_backends}/intel_pxp_gsccs.h (100%)
 rename drivers/gpu/drm/i915/pxp/{ => tee_backends}/intel_pxp_tee_mei.c (98%)
 rename drivers/gpu/drm/i915/pxp/{ => tee_backends}/intel_pxp_tee_mei.h (100%)

diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
index 05072d7a4ba4..10e252192b3f 100644
--- a/drivers/gpu/drm/i915/Makefile
+++ b/drivers/gpu/drm/i915/Makefile
@@ -318,10 +318,10 @@ i915-y += i915_perf.o
 # Protected execution platform (PXP) support. Base support is required for HuC
 i915-y += \
 	pxp/intel_pxp.o \
-	pxp/intel_pxp_tee.o \
-	pxp/intel_pxp_tee_mei.o \
 	pxp/intel_pxp_huc.o \
-	pxp/intel_pxp_gsccs.o
+	pxp/intel_pxp_tee.o \
+	pxp/tee_backends/intel_pxp_tee_mei.o \
+	pxp/tee_backends/intel_pxp_gsccs.o
 
 i915-$(CONFIG_DRM_I915_PXP) += \
 	pxp/intel_pxp_cmd.o \
diff --git a/drivers/gpu/drm/i915/pxp/intel_pxp_tee.c b/drivers/gpu/drm/i915/pxp/intel_pxp_tee.c
index a4b7f6c7bc54..9b6e48929e6c 100644
--- a/drivers/gpu/drm/i915/pxp/intel_pxp_tee.c
+++ b/drivers/gpu/drm/i915/pxp/intel_pxp_tee.c
@@ -5,9 +5,9 @@
 
 #include "i915_drv.h"
 #include "intel_pxp.h"
-#include "intel_pxp_gsccs.h"
 #include "intel_pxp_tee.h"
-#include "intel_pxp_tee_mei.h"
+#include "tee_backends/intel_pxp_gsccs.h"
+#include "tee_backends/intel_pxp_tee_mei.h"
 
 int intel_pxp_teelink_create_session(struct intel_pxp *pxp,
 				     int arb_session_id)
diff --git a/drivers/gpu/drm/i915/pxp/intel_pxp_gsccs.c b/drivers/gpu/drm/i915/pxp/tee_backends/intel_pxp_gsccs.c
similarity index 92%
rename from drivers/gpu/drm/i915/pxp/intel_pxp_gsccs.c
rename to drivers/gpu/drm/i915/pxp/tee_backends/intel_pxp_gsccs.c
index a4243272ca73..6441018f5207 100644
--- a/drivers/gpu/drm/i915/pxp/intel_pxp_gsccs.c
+++ b/drivers/gpu/drm/i915/pxp/tee_backends/intel_pxp_gsccs.c
@@ -4,8 +4,10 @@
  */
 
 #include "i915_drv.h"
-#include "intel_pxp.h"
-#include "intel_pxp_gsccs.h"
+
+#include "pxp/intel_pxp.h"
+
+#include "pxp/tee_backends/intel_pxp_gsccs.h"
 
 static int gsccs_tee_send_message(struct intel_pxp *pxp,
 				  void *msg_in, size_t msg_in_size,
diff --git a/drivers/gpu/drm/i915/pxp/intel_pxp_gsccs.h b/drivers/gpu/drm/i915/pxp/tee_backends/intel_pxp_gsccs.h
similarity index 100%
rename from drivers/gpu/drm/i915/pxp/intel_pxp_gsccs.h
rename to drivers/gpu/drm/i915/pxp/tee_backends/intel_pxp_gsccs.h
diff --git a/drivers/gpu/drm/i915/pxp/intel_pxp_tee_mei.c b/drivers/gpu/drm/i915/pxp/tee_backends/intel_pxp_tee_mei.c
similarity index 98%
rename from drivers/gpu/drm/i915/pxp/intel_pxp_tee_mei.c
rename to drivers/gpu/drm/i915/pxp/tee_backends/intel_pxp_tee_mei.c
index a81e8859335e..881fc93b1cb0 100644
--- a/drivers/gpu/drm/i915/pxp/intel_pxp_tee_mei.c
+++ b/drivers/gpu/drm/i915/pxp/tee_backends/intel_pxp_tee_mei.c
@@ -11,11 +11,12 @@
 #include "gem/i915_gem_lmem.h"
 
 #include "i915_drv.h"
-#include "intel_pxp.h"
-#include "intel_pxp_cmd_interface_42.h"
-#include "intel_pxp_huc.h"
-#include "intel_pxp_session.h"
-#include "intel_pxp_tee_mei.h"
+
+#include "pxp/intel_pxp.h"
+#include "pxp/intel_pxp_cmd_interface_42.h"
+#include "pxp/intel_pxp_huc.h"
+#include "pxp/intel_pxp_session.h"
+#include "pxp/tee_backends/intel_pxp_tee_mei.h"
 
 struct mei_teelink_priv {
 	/**
diff --git a/drivers/gpu/drm/i915/pxp/intel_pxp_tee_mei.h b/drivers/gpu/drm/i915/pxp/tee_backends/intel_pxp_tee_mei.h
similarity index 100%
rename from drivers/gpu/drm/i915/pxp/intel_pxp_tee_mei.h
rename to drivers/gpu/drm/i915/pxp/tee_backends/intel_pxp_tee_mei.h
-- 
2.34.1