[PATCH 1/6] drm/i915/uc: move GuC and HuC files under gt/
Daniele Ceraolo Spurio
daniele.ceraolospurio at intel.com
Sat Jun 29 01:19:07 UTC 2019
Both microcontrollers are part of the GT HW and are closely related to
GT operations.
Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio at intel.com>
Cc: Michal Wajdeczko <michal.wajdeczko at intel.com>
Cc: Chris Wilson <chris at chris-wilson.co.uk>
---
drivers/gpu/drm/i915/Makefile | 20 +++++++++----------
drivers/gpu/drm/i915/Makefile.header-test | 4 ----
drivers/gpu/drm/i915/{ => gt}/intel_guc.c | 0
drivers/gpu/drm/i915/{ => gt}/intel_guc.h | 0
drivers/gpu/drm/i915/{ => gt}/intel_guc_ads.c | 0
drivers/gpu/drm/i915/{ => gt}/intel_guc_ads.h | 0
drivers/gpu/drm/i915/{ => gt}/intel_guc_ct.c | 0
drivers/gpu/drm/i915/{ => gt}/intel_guc_ct.h | 0
drivers/gpu/drm/i915/{ => gt}/intel_guc_fw.c | 0
drivers/gpu/drm/i915/{ => gt}/intel_guc_fw.h | 0
.../gpu/drm/i915/{ => gt}/intel_guc_fwif.h | 0
drivers/gpu/drm/i915/{ => gt}/intel_guc_log.c | 0
drivers/gpu/drm/i915/{ => gt}/intel_guc_log.h | 0
drivers/gpu/drm/i915/{ => gt}/intel_guc_reg.h | 0
.../drm/i915/{ => gt}/intel_guc_submission.c | 7 ++++---
.../drm/i915/{ => gt}/intel_guc_submission.h | 2 +-
drivers/gpu/drm/i915/{ => gt}/intel_huc.c | 0
drivers/gpu/drm/i915/{ => gt}/intel_huc.h | 0
drivers/gpu/drm/i915/{ => gt}/intel_huc_fw.c | 0
drivers/gpu/drm/i915/{ => gt}/intel_huc_fw.h | 0
drivers/gpu/drm/i915/{ => gt}/intel_uc.c | 2 +-
drivers/gpu/drm/i915/{ => gt}/intel_uc.h | 0
drivers/gpu/drm/i915/{ => gt}/intel_uc_fw.c | 0
drivers/gpu/drm/i915/{ => gt}/intel_uc_fw.h | 0
drivers/gpu/drm/i915/i915_debugfs.c | 2 +-
drivers/gpu/drm/i915/i915_drv.c | 2 +-
drivers/gpu/drm/i915/i915_drv.h | 2 +-
drivers/gpu/drm/i915/i915_gpu_error.h | 2 +-
28 files changed, 20 insertions(+), 23 deletions(-)
rename drivers/gpu/drm/i915/{ => gt}/intel_guc.c (100%)
rename drivers/gpu/drm/i915/{ => gt}/intel_guc.h (100%)
rename drivers/gpu/drm/i915/{ => gt}/intel_guc_ads.c (100%)
rename drivers/gpu/drm/i915/{ => gt}/intel_guc_ads.h (100%)
rename drivers/gpu/drm/i915/{ => gt}/intel_guc_ct.c (100%)
rename drivers/gpu/drm/i915/{ => gt}/intel_guc_ct.h (100%)
rename drivers/gpu/drm/i915/{ => gt}/intel_guc_fw.c (100%)
rename drivers/gpu/drm/i915/{ => gt}/intel_guc_fw.h (100%)
rename drivers/gpu/drm/i915/{ => gt}/intel_guc_fwif.h (100%)
rename drivers/gpu/drm/i915/{ => gt}/intel_guc_log.c (100%)
rename drivers/gpu/drm/i915/{ => gt}/intel_guc_log.h (100%)
rename drivers/gpu/drm/i915/{ => gt}/intel_guc_reg.h (100%)
rename drivers/gpu/drm/i915/{ => gt}/intel_guc_submission.c (99%)
rename drivers/gpu/drm/i915/{ => gt}/intel_guc_submission.h (99%)
rename drivers/gpu/drm/i915/{ => gt}/intel_huc.c (100%)
rename drivers/gpu/drm/i915/{ => gt}/intel_huc.h (100%)
rename drivers/gpu/drm/i915/{ => gt}/intel_huc_fw.c (100%)
rename drivers/gpu/drm/i915/{ => gt}/intel_huc_fw.h (100%)
rename drivers/gpu/drm/i915/{ => gt}/intel_uc.c (99%)
rename drivers/gpu/drm/i915/{ => gt}/intel_uc.h (100%)
rename drivers/gpu/drm/i915/{ => gt}/intel_uc_fw.c (100%)
rename drivers/gpu/drm/i915/{ => gt}/intel_uc_fw.h (100%)
diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
index 3bd8f0349a8a..b7742a550052 100644
--- a/drivers/gpu/drm/i915/Makefile
+++ b/drivers/gpu/drm/i915/Makefile
@@ -133,16 +133,16 @@ i915-y += \
intel_wopcm.o
# general-purpose microcontroller (GuC) support
-i915-y += intel_uc.o \
- intel_uc_fw.o \
- intel_guc.o \
- intel_guc_ads.o \
- intel_guc_ct.o \
- intel_guc_fw.o \
- intel_guc_log.o \
- intel_guc_submission.o \
- intel_huc.o \
- intel_huc_fw.o
+i915-y += gt/intel_uc.o \
+ gt/intel_uc_fw.o \
+ gt/intel_guc.o \
+ gt/intel_guc_ads.o \
+ gt/intel_guc_ct.o \
+ gt/intel_guc_fw.o \
+ gt/intel_guc_log.o \
+ gt/intel_guc_submission.o \
+ gt/intel_huc.o \
+ gt/intel_huc_fw.o
# autogenerated null render state
i915-y += intel_renderstate_gen6.o \
diff --git a/drivers/gpu/drm/i915/Makefile.header-test b/drivers/gpu/drm/i915/Makefile.header-test
index 2fd61869bdaa..88ad1ad31c9b 100644
--- a/drivers/gpu/drm/i915/Makefile.header-test
+++ b/drivers/gpu/drm/i915/Makefile.header-test
@@ -19,14 +19,10 @@ header_test := \
i915_vgpu.h \
intel_csr.h \
intel_drv.h \
- intel_guc_ct.h \
- intel_guc_fwif.h \
- intel_guc_reg.h \
intel_gvt.h \
intel_pm.h \
intel_runtime_pm.h \
intel_sideband.h \
- intel_uc_fw.h \
intel_uncore.h \
intel_wakeref.h
diff --git a/drivers/gpu/drm/i915/intel_guc.c b/drivers/gpu/drm/i915/gt/intel_guc.c
similarity index 100%
rename from drivers/gpu/drm/i915/intel_guc.c
rename to drivers/gpu/drm/i915/gt/intel_guc.c
diff --git a/drivers/gpu/drm/i915/intel_guc.h b/drivers/gpu/drm/i915/gt/intel_guc.h
similarity index 100%
rename from drivers/gpu/drm/i915/intel_guc.h
rename to drivers/gpu/drm/i915/gt/intel_guc.h
diff --git a/drivers/gpu/drm/i915/intel_guc_ads.c b/drivers/gpu/drm/i915/gt/intel_guc_ads.c
similarity index 100%
rename from drivers/gpu/drm/i915/intel_guc_ads.c
rename to drivers/gpu/drm/i915/gt/intel_guc_ads.c
diff --git a/drivers/gpu/drm/i915/intel_guc_ads.h b/drivers/gpu/drm/i915/gt/intel_guc_ads.h
similarity index 100%
rename from drivers/gpu/drm/i915/intel_guc_ads.h
rename to drivers/gpu/drm/i915/gt/intel_guc_ads.h
diff --git a/drivers/gpu/drm/i915/intel_guc_ct.c b/drivers/gpu/drm/i915/gt/intel_guc_ct.c
similarity index 100%
rename from drivers/gpu/drm/i915/intel_guc_ct.c
rename to drivers/gpu/drm/i915/gt/intel_guc_ct.c
diff --git a/drivers/gpu/drm/i915/intel_guc_ct.h b/drivers/gpu/drm/i915/gt/intel_guc_ct.h
similarity index 100%
rename from drivers/gpu/drm/i915/intel_guc_ct.h
rename to drivers/gpu/drm/i915/gt/intel_guc_ct.h
diff --git a/drivers/gpu/drm/i915/intel_guc_fw.c b/drivers/gpu/drm/i915/gt/intel_guc_fw.c
similarity index 100%
rename from drivers/gpu/drm/i915/intel_guc_fw.c
rename to drivers/gpu/drm/i915/gt/intel_guc_fw.c
diff --git a/drivers/gpu/drm/i915/intel_guc_fw.h b/drivers/gpu/drm/i915/gt/intel_guc_fw.h
similarity index 100%
rename from drivers/gpu/drm/i915/intel_guc_fw.h
rename to drivers/gpu/drm/i915/gt/intel_guc_fw.h
diff --git a/drivers/gpu/drm/i915/intel_guc_fwif.h b/drivers/gpu/drm/i915/gt/intel_guc_fwif.h
similarity index 100%
rename from drivers/gpu/drm/i915/intel_guc_fwif.h
rename to drivers/gpu/drm/i915/gt/intel_guc_fwif.h
diff --git a/drivers/gpu/drm/i915/intel_guc_log.c b/drivers/gpu/drm/i915/gt/intel_guc_log.c
similarity index 100%
rename from drivers/gpu/drm/i915/intel_guc_log.c
rename to drivers/gpu/drm/i915/gt/intel_guc_log.c
diff --git a/drivers/gpu/drm/i915/intel_guc_log.h b/drivers/gpu/drm/i915/gt/intel_guc_log.h
similarity index 100%
rename from drivers/gpu/drm/i915/intel_guc_log.h
rename to drivers/gpu/drm/i915/gt/intel_guc_log.h
diff --git a/drivers/gpu/drm/i915/intel_guc_reg.h b/drivers/gpu/drm/i915/gt/intel_guc_reg.h
similarity index 100%
rename from drivers/gpu/drm/i915/intel_guc_reg.h
rename to drivers/gpu/drm/i915/gt/intel_guc_reg.h
diff --git a/drivers/gpu/drm/i915/intel_guc_submission.c b/drivers/gpu/drm/i915/gt/intel_guc_submission.c
similarity index 99%
rename from drivers/gpu/drm/i915/intel_guc_submission.c
rename to drivers/gpu/drm/i915/gt/intel_guc_submission.c
index 12c22359fdac..c40967a476e9 100644
--- a/drivers/gpu/drm/i915/intel_guc_submission.c
+++ b/drivers/gpu/drm/i915/gt/intel_guc_submission.c
@@ -24,12 +24,13 @@
#include <linux/circ_buf.h>
-#include "gt/intel_engine_pm.h"
-#include "gt/intel_lrc_reg.h"
-#include "gt/intel_context.h"
#include "gem/i915_gem_context.h"
+#include "intel_context.h"
+#include "intel_engine_pm.h"
#include "intel_guc_submission.h"
+#include "intel_lrc_reg.h"
+
#include "i915_drv.h"
enum {
diff --git a/drivers/gpu/drm/i915/intel_guc_submission.h b/drivers/gpu/drm/i915/gt/intel_guc_submission.h
similarity index 99%
rename from drivers/gpu/drm/i915/intel_guc_submission.h
rename to drivers/gpu/drm/i915/gt/intel_guc_submission.h
index 7d823a513b9c..b1d6e8743261 100644
--- a/drivers/gpu/drm/i915/intel_guc_submission.h
+++ b/drivers/gpu/drm/i915/gt/intel_guc_submission.h
@@ -27,7 +27,7 @@
#include <linux/spinlock.h>
-#include "gt/intel_engine_types.h"
+#include "intel_engine_types.h"
#include "i915_gem.h"
#include "i915_selftest.h"
diff --git a/drivers/gpu/drm/i915/intel_huc.c b/drivers/gpu/drm/i915/gt/intel_huc.c
similarity index 100%
rename from drivers/gpu/drm/i915/intel_huc.c
rename to drivers/gpu/drm/i915/gt/intel_huc.c
diff --git a/drivers/gpu/drm/i915/intel_huc.h b/drivers/gpu/drm/i915/gt/intel_huc.h
similarity index 100%
rename from drivers/gpu/drm/i915/intel_huc.h
rename to drivers/gpu/drm/i915/gt/intel_huc.h
diff --git a/drivers/gpu/drm/i915/intel_huc_fw.c b/drivers/gpu/drm/i915/gt/intel_huc_fw.c
similarity index 100%
rename from drivers/gpu/drm/i915/intel_huc_fw.c
rename to drivers/gpu/drm/i915/gt/intel_huc_fw.c
diff --git a/drivers/gpu/drm/i915/intel_huc_fw.h b/drivers/gpu/drm/i915/gt/intel_huc_fw.h
similarity index 100%
rename from drivers/gpu/drm/i915/intel_huc_fw.h
rename to drivers/gpu/drm/i915/gt/intel_huc_fw.h
diff --git a/drivers/gpu/drm/i915/intel_uc.c b/drivers/gpu/drm/i915/gt/intel_uc.c
similarity index 99%
rename from drivers/gpu/drm/i915/intel_uc.c
rename to drivers/gpu/drm/i915/gt/intel_uc.c
index fdf00f1ebb57..123a26d2ff4a 100644
--- a/drivers/gpu/drm/i915/intel_uc.c
+++ b/drivers/gpu/drm/i915/gt/intel_uc.c
@@ -22,7 +22,7 @@
*
*/
-#include "gt/intel_reset.h"
+#include "intel_reset.h"
#include "intel_uc.h"
#include "intel_guc.h"
#include "intel_guc_ads.h"
diff --git a/drivers/gpu/drm/i915/intel_uc.h b/drivers/gpu/drm/i915/gt/intel_uc.h
similarity index 100%
rename from drivers/gpu/drm/i915/intel_uc.h
rename to drivers/gpu/drm/i915/gt/intel_uc.h
diff --git a/drivers/gpu/drm/i915/intel_uc_fw.c b/drivers/gpu/drm/i915/gt/intel_uc_fw.c
similarity index 100%
rename from drivers/gpu/drm/i915/intel_uc_fw.c
rename to drivers/gpu/drm/i915/gt/intel_uc_fw.c
diff --git a/drivers/gpu/drm/i915/intel_uc_fw.h b/drivers/gpu/drm/i915/gt/intel_uc_fw.h
similarity index 100%
rename from drivers/gpu/drm/i915/intel_uc_fw.h
rename to drivers/gpu/drm/i915/gt/intel_uc_fw.h
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index eeecdad0e3ca..b2e018a118e1 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -39,13 +39,13 @@
#include "display/intel_psr.h"
#include "gem/i915_gem_context.h"
+#include "gt/intel_guc_submission.h"
#include "gt/intel_reset.h"
#include "i915_debugfs.h"
#include "i915_irq.h"
#include "intel_csr.h"
#include "intel_drv.h"
-#include "intel_guc_submission.h"
#include "intel_pm.h"
#include "intel_sideband.h"
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 794c6814a6d0..ef2a273cd09f 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -64,6 +64,7 @@
#include "gt/intel_gt.h"
#include "gt/intel_gt_pm.h"
#include "gt/intel_reset.h"
+#include "gt/intel_uc.h"
#include "gt/intel_workarounds.h"
#include "i915_debugfs.h"
@@ -76,7 +77,6 @@
#include "intel_csr.h"
#include "intel_drv.h"
#include "intel_pm.h"
-#include "intel_uc.h"
static struct drm_driver driver;
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 7e981b03face..7c30e8559db9 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -73,11 +73,11 @@
#include "gt/intel_lrc.h"
#include "gt/intel_engine.h"
#include "gt/intel_gt_types.h"
+#include "gt/intel_uc.h"
#include "gt/intel_workarounds.h"
#include "intel_device_info.h"
#include "intel_runtime_pm.h"
-#include "intel_uc.h"
#include "intel_uncore.h"
#include "intel_wakeref.h"
#include "intel_wopcm.h"
diff --git a/drivers/gpu/drm/i915/i915_gpu_error.h b/drivers/gpu/drm/i915/i915_gpu_error.h
index 2ecd0c6a1c94..c94eb01d3d53 100644
--- a/drivers/gpu/drm/i915/i915_gpu_error.h
+++ b/drivers/gpu/drm/i915/i915_gpu_error.h
@@ -14,9 +14,9 @@
#include <drm/drm_mm.h>
#include "gt/intel_engine.h"
+#include "gt/intel_uc_fw.h"
#include "intel_device_info.h"
-#include "intel_uc_fw.h"
#include "i915_gem.h"
#include "i915_gem_gtt.h"
--
2.20.1
More information about the Intel-gfx-trybot
mailing list