Skip to content

drm/i915: Extra media engines for ATS

[email protected] intel-gfx 1 version New

Get series with b4
b4 am [email protected]

Versions newest first

  1. v4 Latest0 of 11 patches 0 repliesNew

Patches in v4 No applies recorded yet

None of the 11 patches the cover letter announces are in this archive.

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v4 yet.

Read the v4 thread

Cover letter [PATCH 0/11 v4] drm/i915: Extra media engines for ATS

From: John Harrison <[email protected]>

ATS has lots of extra media engines. This series adds support for them.

Note, a recent GuC FW is required - 32.0.3 is known to be good. Version 31.0.1 causes a hang when i915 initialised the fifth VCS engine.

v2: Clean up the I915_MAX_ENGINES define. Make assumptions about ATS engine counts. [Tvrtko Ursulin]

v3: Rebase to a new location within the internal history and add a NOT_UPSTREAM patch to disable the extra engines if the GuC FW in use is too old to support them. [Daniele].

v4: Tweaks to GuC FW test (for module param overrides) and to interrupt enabling (to support fused parts). [Daniele]

CC Daniele Ceraolo Spurio <[email protected]>
CC Tvrtko Ursulin <[email protected]>

---
baseline: 32a1e283d330638d2e5de8f89a9ff7c8512b75e8
pile-commit: 603f996d0b32c3733f4ce4e7263e9f40e0d263ce range-diff:

  -:  ------------ > 142:  ce1f037b197f drm/i915/selftests: Allow for larger engine counts
  -:  ------------ > 143:  61e8501f5afe drm/i915: Extra media engines for ATS - Part 1 (engine definitions)
  -:  ------------ > 144:  eaf383e48944 drm/i915: Extra media engines for ATS - Part 2 (interrupts)
  -:  ------------ > 145:  7d107e0cde94 drm/i915: Extra media engines for ATS - Part 3 (reset)
  -:  ------------ > 146:  9d3d03cbd52d drm/i915: Extra media engines for ATS - Part 4 (FW)
  -:  ------------ > 147:  e37f175dd42e drm/i915: Extra media engines for ATS - Part 5 (UAPI)
217:  af2ca7c68d46 ! 223:  bfbff755e80c drm/i915/ats: ATS has MMIO doorbells
  -:  ------------ > 239:  facf506a7805 NOT_UPSTREAM: drm/i915: Disable extra engines on older GuC FW
275:  0ceb5bac58a5 <   -:  ------------ drm/i915/ats: Disable all display device information capabilities
  -:  ------------ > 282:  f0213ad8ede3 drm/i915/ats: Disable all display device information capabilities
301:  643dcaa8783f ! 308:  960d8a3acefe drm/i915/guc: Support for VFPF relay messages
317:  2a3a78301cee ! 324:  3ccd2e3fca85 drm/i915: Add has_remote_tiles to device info
 series                                             |   7 +
 ...M-drm-i915-Disable-extra-engines-on-older.patch |  80 ++++++++
 ...-i915-Add-has_remote_tiles-to-device-info.patch |   4 +-
 ...tra-media-engines-for-ATS-Part-1-engine-d.patch | 218 +++++++++++++++++++++
 ...tra-media-engines-for-ATS-Part-2-interrup.patch |  97 +++++++++
 ...-Extra-media-engines-for-ATS-Part-3-reset.patch |  54 +++++
 ...915-Extra-media-engines-for-ATS-Part-4-FW.patch | 110 +++++++++++
 ...5-Extra-media-engines-for-ATS-Part-5-UAPI.patch |  30 +++
 0001-drm-i915-ats-ATS-has-MMIO-doorbells.patch     |   4 +-
 ...s-Disable-all-display-device-information-.patch |   8 +-
 ...-i915-guc-Support-for-VFPF-relay-messages.patch |   4 +-
 ...-selftests-Allow-for-larger-engine-counts.patch |  85 ++++++++
 12 files changed, 691 insertions(+), 10 deletions(-)
series +7 -0
index e8645e80dbf9..4a072408dad2 100644
@@ -141,6 +141,12 @@
 0001-drm-i915-ats-ack-intr-through-master-control.patch
 0001-FIXME-drm-i915-ats-context-status-and-descriptor-cha.patch
 0001-drm-i915-ats-Handle-ATS-VDBOX-VEBOX-fusing-register.patch
+0001-drm-i915-selftests-Allow-for-larger-engine-counts.patch
+0001-drm-i915-Extra-media-engines-for-ATS-Part-1-engine-d.patch
+0001-drm-i915-Extra-media-engines-for-ATS-Part-2-interrup.patch
+0001-drm-i915-Extra-media-engines-for-ATS-Part-3-reset.patch
+0001-drm-i915-Extra-media-engines-for-ATS-Part-4-FW.patch
+0001-drm-i915-Extra-media-engines-for-ATS-Part-5-UAPI.patch
 0001-NOTUPSTREAM-drm-i915-perf-Enable-large-OA-buffer-sup.patch
 0001-NOTUPSTREAM-drm-i915-perf-complete-programming-white.patch
 0001-drm-i915-support-1G-pages-for-the-48b-PPGTT.patch
@@ -232,6 +238,7 @@
 0001-drm-i915-dg1-add-initial-DG-1-definitions.patch
 0001-drm-i915-dg1-Add-DG1-PCI-IDs.patch
 0001-DRM_INTEL_INTERNAL_PLATFORM_POINT-dg1.patch
+0001-NOT_UPSTREAM-drm-i915-Disable-extra-engines-on-older.patch
 0001-NOT_UPSTREAM-drm-i915-tgl-ack-master-control-on-all-.patch
 0001-NOT_UPSTREAM-drm-i915-guc-add-H2G-to-ring-doorbells.patch
 0001-NOT-UPSTREAM-drm-i915-guc-Workaround-ATS-GuC-31.0.0-.patch
0001-NOT_UPSTREAM-drm-i915-Disable-extra-engines-on-older.patch new file +80 -0

80 lines not on this page · raw message

0001-drm-i915-Add-has_remote_tiles-to-device-info.patch +2 -2
index 25d2b969eef0..ed470e5c95b3 100644
@@ -34,8 +34,8 @@ diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
  	.has_guc_mmio_db = 1,
 +	.has_remote_tiles = 1,
  	.engine_mask =
- 		BIT(RCS0) | BIT(BCS0) | BIT(VECS0) | BIT(VECS1) | BIT(VCS0) |
- 		BIT(VCS1) | BIT(VCS2) | BIT(VCS3) | BIT(CCS0),
+ 		BIT(RCS0) | BIT(BCS0) |
+ 		BIT(VECS0) | BIT(VECS1) | BIT(VECS2) | BIT(VECS3) |
 diff --git a/drivers/gpu/drm/i915/intel_device_info.h b/drivers/gpu/drm/i915/intel_device_info.h
 --- a/drivers/gpu/drm/i915/intel_device_info.h
 +++ b/drivers/gpu/drm/i915/intel_device_info.h
0001-drm-i915-Extra-media-engines-for-ATS-Part-1-engine-d.patch new file +218 -0

218 lines not on this page · raw message

0001-drm-i915-Extra-media-engines-for-ATS-Part-2-interrup.patch new file +97 -0

97 lines not on this page · raw message

0001-drm-i915-Extra-media-engines-for-ATS-Part-3-reset.patch new file +54 -0

54 lines not on this page · raw message

0001-drm-i915-Extra-media-engines-for-ATS-Part-4-FW.patch new file +110 -0

110 lines not on this page · raw message

0001-drm-i915-Extra-media-engines-for-ATS-Part-5-UAPI.patch new file +30 -0
new file mode 100644
index 000000000000..275437f27a23
@@ -0,0 +1,30 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: John Harrison <[email protected]>
+Date: Fri, 22 Mar 2019 17:12:56 -0700
+Subject: [PATCH] drm/i915: Extra media engines for ATS - Part 5 (UAPI)
+
+ATS has lots of extra media engines. This patch enables them in the
+engine query UAPI so that they can actually be used.
+
+Signed-off-by: John Harrison <[email protected]>
+---
+ drivers/gpu/drm/i915/i915_pci.c | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
+--- a/drivers/gpu/drm/i915/i915_pci.c
++++ b/drivers/gpu/drm/i915/i915_pci.c
+@@ -780,8 +780,11 @@ static const struct intel_device_info intel_arcticsound_info = {
+ 	.is_alpha_support = 1,
+ 	.has_guc_dist_db = 0,
+ 	.engine_mask =
+-		BIT(RCS0) | BIT(BCS0) | BIT(VECS0) | BIT(VECS1) | BIT(VCS0) |
+-		BIT(VCS1) | BIT(VCS2) | BIT(VCS3) | BIT(CCS0),
++		BIT(RCS0) | BIT(BCS0) |
++		BIT(VECS0) | BIT(VECS1) | BIT(VECS2) | BIT(VECS3) |
++		BIT(VCS0) | BIT(VCS1) | BIT(VCS2) | BIT(VCS3) |
++		BIT(VCS4) | BIT(VCS5) | BIT(VCS6) | BIT(VCS7) |
++		BIT(CCS0),
+ };
+ 
+ #undef GEN
0001-drm-i915-ats-ATS-has-MMIO-doorbells.patch +2 -2
index 1b216a7ea5b4..902179ce484d 100644
@@ -21,5 +21,5 @@ diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
  	.has_guc_dist_db = 0,
 +	.has_guc_mmio_db = 1,
  	.engine_mask =
- 		BIT(RCS0) | BIT(BCS0) | BIT(VECS0) | BIT(VECS1) | BIT(VCS0) |
- 		BIT(VCS1) | BIT(VCS2) | BIT(VCS3) | BIT(CCS0),
+ 		BIT(RCS0) | BIT(BCS0) |
+ 		BIT(VECS0) | BIT(VECS1) | BIT(VECS2) | BIT(VECS3) |
0001-drm-i915-ats-Disable-all-display-device-information-.patch +4 -4
index fa5435a374fe..15358a1e4ef0 100644
@@ -19,10 +19,10 @@ Acked-by: Lucas De Marchi <[email protected]>
 diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
 --- a/drivers/gpu/drm/i915/i915_pci.c
 +++ b/drivers/gpu/drm/i915/i915_pci.c
-@@ -818,6 +818,7 @@ static const struct intel_device_info intel_arcticsound_info = {
- 	.engine_mask =
- 		BIT(RCS0) | BIT(BCS0) | BIT(VECS0) | BIT(VECS1) | BIT(VCS0) |
- 		BIT(VCS1) | BIT(VCS2) | BIT(VCS3) | BIT(CCS0),
+@@ -821,6 +821,7 @@ static const struct intel_device_info intel_arcticsound_info = {
+ 		BIT(VCS0) | BIT(VCS1) | BIT(VCS2) | BIT(VCS3) |
+ 		BIT(VCS4) | BIT(VCS5) | BIT(VCS6) | BIT(VCS7) |
+ 		BIT(CCS0),
 +	.display = { 0 },
  };
  
0001-drm-i915-guc-Support-for-VFPF-relay-messages.patch +2 -2
index 0873dd1ef112..8b2163a221db 100644
@@ -59,9 +59,9 @@ diff --git a/drivers/gpu/drm/i915/intel_guc.h b/drivers/gpu/drm/i915/intel_guc.h
  #include "intel_guc_reg.h"
 +#include "intel_guc_relay.h"
  #include "intel_uc_fw.h"
+ #include "intel_engine_types.h"
  #include "i915_utils.h"
- #include "i915_vma.h"
-@@ -50,6 +51,7 @@ struct intel_guc {
+@@ -51,6 +52,7 @@ struct intel_guc {
  	struct intel_uc_fw fw;
  	struct intel_guc_log log;
  	struct intel_guc_ct ct;
0001-drm-i915-selftests-Allow-for-larger-engine-counts.patch new file +85 -0

85 lines not on this page · raw message

--
git-pile 0.91

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx