subject:"\[Intel\-gfx\] \[PATCH\] drm\/i915\/gt\: Move gen8 CS emitters into gen8_engine

Re: [Intel-gfx] [PATCH] drm/i915/gt: Move gen8 CS emitters into gen8_engine_cs.h

2020-12-16 Thread Mika Kuoppala

Chris Wilson  writes:

> Reduce the pollution of intel_engine.h by moving gen8_emit_pipe_control
> and friends to gen8_engine_cs.h
>
> Signed-off-by: Chris Wilson 

Reviewed-by: Mika Kuoppala 

> ---
>  drivers/gpu/drm/i915/display/intel_overlay.c  |  1 +
>  drivers/gpu/drm/i915/gem/i915_gem_context.c   |  1 +
>  .../gpu/drm/i915/gem/i915_gem_execbuffer.c|  1 +
>  .../gpu/drm/i915/gem/i915_gem_object_blt.c|  1 +
>  .../i915/gem/selftests/i915_gem_coherency.c   |  1 +
>  .../drm/i915/gem/selftests/i915_gem_mman.c|  1 +
>  .../drm/i915/gem/selftests/igt_gem_utils.c|  1 +
>  drivers/gpu/drm/i915/gt/gen8_engine_cs.h  | 92 +++
>  drivers/gpu/drm/i915/gt/intel_engine.h| 86 -
>  drivers/gpu/drm/i915/gt/intel_renderstate.c   |  3 +-
>  drivers/gpu/drm/i915/gt/intel_ring.c  |  2 +
>  drivers/gpu/drm/i915/gt/intel_workarounds.c   |  1 +
>  drivers/gpu/drm/i915/gt/selftest_engine_cs.c  |  1 +
>  drivers/gpu/drm/i915/gt/selftest_engine_pm.c  |  2 +
>  drivers/gpu/drm/i915/gt/selftest_mocs.c   |  1 +
>  drivers/gpu/drm/i915/gt/selftest_rc6.c|  1 +
>  drivers/gpu/drm/i915/gt/selftest_reset.c  |  1 +
>  drivers/gpu/drm/i915/gt/selftest_timeline.c   |  1 +
>  drivers/gpu/drm/i915/gvt/cmd_parser.c |  1 +
>  drivers/gpu/drm/i915/gvt/mmio_context.c   |  1 +
>  drivers/gpu/drm/i915/i915_cmd_parser.c|  1 +
>  drivers/gpu/drm/i915/i915_perf.c  |  1 +
>  drivers/gpu/drm/i915/i915_request.c   |  1 +
>  drivers/gpu/drm/i915/selftests/i915_gem_gtt.c |  1 +
>  drivers/gpu/drm/i915/selftests/igt_spinner.c  |  1 +
>  25 files changed, 118 insertions(+), 87 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_overlay.c 
> b/drivers/gpu/drm/i915/display/intel_overlay.c
> index 52b4f6193b4c..6be5d8946c69 100644
> --- a/drivers/gpu/drm/i915/display/intel_overlay.c
> +++ b/drivers/gpu/drm/i915/display/intel_overlay.c
> @@ -29,6 +29,7 @@
>  #include 
>  
>  #include "gem/i915_gem_pm.h"
> +#include "gt/intel_gpu_commands.h"
>  #include "gt/intel_ring.h"
>  
>  #include "i915_drv.h"
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_context.c 
> b/drivers/gpu/drm/i915/gem/i915_gem_context.c
> index ad136d009d9b..7aa4629f6111 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_context.c
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_context.c
> @@ -73,6 +73,7 @@
>  #include "gt/intel_engine_heartbeat.h"
>  #include "gt/intel_engine_user.h"
>  #include "gt/intel_execlists_submission.h" /* virtual_engine */
> +#include "gt/intel_gpu_commands.h"
>  #include "gt/intel_ring.h"
>  
>  #include "i915_gem_context.h"
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c 
> b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
> index 2ff32daa50bd..0cf9e79325a8 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
> @@ -15,6 +15,7 @@
>  
>  #include "gem/i915_gem_ioctls.h"
>  #include "gt/intel_context.h"
> +#include "gt/intel_gpu_commands.h"
>  #include "gt/intel_gt.h"
>  #include "gt/intel_gt_buffer_pool.h"
>  #include "gt/intel_gt_pm.h"
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object_blt.c 
> b/drivers/gpu/drm/i915/gem/i915_gem_object_blt.c
> index aee7ad3cc3c6..10cac9fac79b 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_object_blt.c
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_object_blt.c
> @@ -6,6 +6,7 @@
>  #include "i915_drv.h"
>  #include "gt/intel_context.h"
>  #include "gt/intel_engine_pm.h"
> +#include "gt/intel_gpu_commands.h"
>  #include "gt/intel_gt.h"
>  #include "gt/intel_gt_buffer_pool.h"
>  #include "gt/intel_ring.h"
> diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_coherency.c 
> b/drivers/gpu/drm/i915/gem/selftests/i915_gem_coherency.c
> index 7049a6bbc03d..1117d2a44518 100644
> --- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_coherency.c
> +++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_coherency.c
> @@ -7,6 +7,7 @@
>  #include 
>  
>  #include "gt/intel_engine_pm.h"
> +#include "gt/intel_gpu_commands.h"
>  #include "gt/intel_gt.h"
>  #include "gt/intel_gt_pm.h"
>  #include "gt/intel_ring.h"
> diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c 
> b/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c
> index d27d87a678c8..d429c7643ff2 100644
> --- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c
> +++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c
> @@ -7,6 +7,7 @@
>  #include 
>  
>  #include "gt/intel_engine_pm.h"
> +#include "gt/intel_gpu_commands.h"
>  #include "gt/intel_gt.h"
>  #include "gt/intel_gt_pm.h"
>  #include "gem/i915_gem_region.h"
> diff --git a/drivers/gpu/drm/i915/gem/selftests/igt_gem_utils.c 
> b/drivers/gpu/drm/i915/gem/selftests/igt_gem_utils.c
> index e21b5023ca7d..d6783061bc72 100644
> --- a/drivers/gpu/drm/i915/gem/selftests/igt_gem_utils.c
> +++ b/drivers/gpu/drm/i915/gem/selftests/igt_gem_utils.c
> @@ -9,6 +9,7 @@
>  #include "gem/i915_gem_context.h"
>  #include "gem/i915_gem_p

[Intel-gfx] [PATCH] drm/i915/gt: Move gen8 CS emitters into gen8_engine_cs.h

2020-12-16 Thread Chris Wilson

Reduce the pollution of intel_engine.h by moving gen8_emit_pipe_control
and friends to gen8_engine_cs.h

Signed-off-by: Chris Wilson 
---
 drivers/gpu/drm/i915/display/intel_overlay.c  |  1 +
 drivers/gpu/drm/i915/gem/i915_gem_context.c   |  1 +
 .../gpu/drm/i915/gem/i915_gem_execbuffer.c|  1 +
 .../gpu/drm/i915/gem/i915_gem_object_blt.c|  1 +
 .../i915/gem/selftests/i915_gem_coherency.c   |  1 +
 .../drm/i915/gem/selftests/i915_gem_mman.c|  1 +
 .../drm/i915/gem/selftests/igt_gem_utils.c|  1 +
 drivers/gpu/drm/i915/gt/gen8_engine_cs.h  | 92 +++
 drivers/gpu/drm/i915/gt/intel_engine.h| 86 -
 drivers/gpu/drm/i915/gt/intel_renderstate.c   |  3 +-
 drivers/gpu/drm/i915/gt/intel_ring.c  |  2 +
 drivers/gpu/drm/i915/gt/intel_workarounds.c   |  1 +
 drivers/gpu/drm/i915/gt/selftest_engine_cs.c  |  1 +
 drivers/gpu/drm/i915/gt/selftest_engine_pm.c  |  2 +
 drivers/gpu/drm/i915/gt/selftest_mocs.c   |  1 +
 drivers/gpu/drm/i915/gt/selftest_rc6.c|  1 +
 drivers/gpu/drm/i915/gt/selftest_reset.c  |  1 +
 drivers/gpu/drm/i915/gt/selftest_timeline.c   |  1 +
 drivers/gpu/drm/i915/gvt/cmd_parser.c |  1 +
 drivers/gpu/drm/i915/gvt/mmio_context.c   |  1 +
 drivers/gpu/drm/i915/i915_cmd_parser.c|  1 +
 drivers/gpu/drm/i915/i915_perf.c  |  1 +
 drivers/gpu/drm/i915/i915_request.c   |  1 +
 drivers/gpu/drm/i915/selftests/i915_gem_gtt.c |  1 +
 drivers/gpu/drm/i915/selftests/igt_spinner.c  |  1 +
 25 files changed, 118 insertions(+), 87 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_overlay.c 
b/drivers/gpu/drm/i915/display/intel_overlay.c
index 52b4f6193b4c..6be5d8946c69 100644
--- a/drivers/gpu/drm/i915/display/intel_overlay.c
+++ b/drivers/gpu/drm/i915/display/intel_overlay.c
@@ -29,6 +29,7 @@
 #include 
 
 #include "gem/i915_gem_pm.h"
+#include "gt/intel_gpu_commands.h"
 #include "gt/intel_ring.h"
 
 #include "i915_drv.h"
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_context.c 
b/drivers/gpu/drm/i915/gem/i915_gem_context.c
index ad136d009d9b..7aa4629f6111 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_context.c
@@ -73,6 +73,7 @@
 #include "gt/intel_engine_heartbeat.h"
 #include "gt/intel_engine_user.h"
 #include "gt/intel_execlists_submission.h" /* virtual_engine */
+#include "gt/intel_gpu_commands.h"
 #include "gt/intel_ring.h"
 
 #include "i915_gem_context.h"
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c 
b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
index 2ff32daa50bd..0cf9e79325a8 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
@@ -15,6 +15,7 @@
 
 #include "gem/i915_gem_ioctls.h"
 #include "gt/intel_context.h"
+#include "gt/intel_gpu_commands.h"
 #include "gt/intel_gt.h"
 #include "gt/intel_gt_buffer_pool.h"
 #include "gt/intel_gt_pm.h"
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object_blt.c 
b/drivers/gpu/drm/i915/gem/i915_gem_object_blt.c
index aee7ad3cc3c6..10cac9fac79b 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_object_blt.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_object_blt.c
@@ -6,6 +6,7 @@
 #include "i915_drv.h"
 #include "gt/intel_context.h"
 #include "gt/intel_engine_pm.h"
+#include "gt/intel_gpu_commands.h"
 #include "gt/intel_gt.h"
 #include "gt/intel_gt_buffer_pool.h"
 #include "gt/intel_ring.h"
diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_coherency.c 
b/drivers/gpu/drm/i915/gem/selftests/i915_gem_coherency.c
index 7049a6bbc03d..1117d2a44518 100644
--- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_coherency.c
+++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_coherency.c
@@ -7,6 +7,7 @@
 #include 
 
 #include "gt/intel_engine_pm.h"
+#include "gt/intel_gpu_commands.h"
 #include "gt/intel_gt.h"
 #include "gt/intel_gt_pm.h"
 #include "gt/intel_ring.h"
diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c 
b/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c
index d27d87a678c8..d429c7643ff2 100644
--- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c
+++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c
@@ -7,6 +7,7 @@
 #include 
 
 #include "gt/intel_engine_pm.h"
+#include "gt/intel_gpu_commands.h"
 #include "gt/intel_gt.h"
 #include "gt/intel_gt_pm.h"
 #include "gem/i915_gem_region.h"
diff --git a/drivers/gpu/drm/i915/gem/selftests/igt_gem_utils.c 
b/drivers/gpu/drm/i915/gem/selftests/igt_gem_utils.c
index e21b5023ca7d..d6783061bc72 100644
--- a/drivers/gpu/drm/i915/gem/selftests/igt_gem_utils.c
+++ b/drivers/gpu/drm/i915/gem/selftests/igt_gem_utils.c
@@ -9,6 +9,7 @@
 #include "gem/i915_gem_context.h"
 #include "gem/i915_gem_pm.h"
 #include "gt/intel_context.h"
+#include "gt/intel_gpu_commands.h"
 #include "gt/intel_gt.h"
 #include "i915_vma.h"
 #include "i915_drv.h"
diff --git a/drivers/gpu/drm/i915/gt/gen8_engine_cs.h 
b/drivers/gpu/drm/i915/gt/gen8_engine_cs.h
index 3c5771fea235..38142c0d6dde 100644
--- a

Re: [Intel-gfx] [PATCH] drm/i915/gt: Move gen8 CS emitters into gen8_engine_cs.h

[Intel-gfx] [PATCH] drm/i915/gt: Move gen8 CS emitters into gen8_engine_cs.h

2 matches

Site Navigation

Mail list logo

Footer information