Skip to contentSkip to conversation

drm/i915: Split out intel_vtd_active and run_as_guest to own header

RFC In review Tvrtko Ursulin 4 participants 15 messages Mar 22, 2022 – Mar 28, 2022

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

RFC 1/1 drm/i915: Split out intel_vtd_active and run_as_guest to own header

From: Tvrtko Ursulin <[email protected]>

...

Cc Jani Nikula <[email protected]>
Cc Lucas De Marchi <[email protected]>

---
Typed up how I see it - bash away.

---
 drivers/gpu/drm/i915/display/intel_bw.c      |  3 +-
 drivers/gpu/drm/i915/display/intel_display.c |  9 ++++-
 drivers/gpu/drm/i915/display/intel_display.h |  2 ++
 drivers/gpu/drm/i915/display/intel_fbc.c     |  3 +-
 drivers/gpu/drm/i915/gem/i915_gem_stolen.c   |  3 +-
 drivers/gpu/drm/i915/gem/i915_gemfs.c        |  3 +-
 drivers/gpu/drm/i915/gt/intel_ggtt.c         |  5 +--
 drivers/gpu/drm/i915/gt/intel_gtt.c          | 12 +++++++
 drivers/gpu/drm/i915/gt/intel_gtt.h          |  2 ++
 drivers/gpu/drm/i915/i915_debugfs.c          |  1 +
 drivers/gpu/drm/i915/i915_driver.c           |  3 +-
 drivers/gpu/drm/i915/i915_driver.h           |  4 +++
 drivers/gpu/drm/i915/i915_drv.h              | 37 --------------------
 drivers/gpu/drm/i915/i915_gpu_error.c        |  3 +-
 drivers/gpu/drm/i915/intel_device_info.c     |  4 ++-
 drivers/gpu/drm/i915/intel_pch.c             |  3 +-
 drivers/gpu/drm/i915/intel_vtd.h             | 27 ++++++++++++++
 17 files changed, 76 insertions(+), 48 deletions(-)
 create mode 100644 drivers/gpu/drm/i915/intel_vtd.h
drivers/gpu/drm/i915/display/intel_bw.c +2 -1
index ac11ff19e47d..6c9cb4f97218 100644
@@ -13,6 +13,7 @@
 #include "intel_mchbar_regs.h"
 #include "intel_pcode.h"
 #include "intel_pm.h"
+#include "intel_vtd.h"
 
 /* Parameters for Qclk Geyserville (QGV) */
 struct intel_qgv_point {
@@ -649,7 +650,7 @@ static unsigned int intel_bw_data_rate(struct drm_i915_private *dev_priv,
 	for_each_pipe(dev_priv, pipe)
 		data_rate += bw_state->data_rate[pipe];
 
-	if (DISPLAY_VER(dev_priv) >= 13 && intel_vtd_active(dev_priv))
+	if (DISPLAY_VER(dev_priv) >= 13 && intel_vtd_active(dev_priv->drm.dev))
 		data_rate = DIV_ROUND_UP(data_rate * 105, 100);
 
 	return data_rate;
drivers/gpu/drm/i915/display/intel_display.c +8 -1
index dc6e21e4ef0b..e80f3ca3ee4e 100644
@@ -110,6 +110,7 @@
 #include "intel_quirks.h"
 #include "intel_sprite.h"
 #include "intel_tc.h"
+#include "intel_vtd.h"
 #include "intel_vga.h"
 #include "i9xx_plane.h"
 #include "skl_scaler.h"
@@ -1197,7 +1198,7 @@ static bool needs_async_flip_vtd_wa(const struct intel_crtc_state *crtc_state)
 {
 	struct drm_i915_private *i915 = to_i915(crtc_state->uapi.crtc->dev);
 
-	return crtc_state->uapi.async_flip && intel_vtd_active(i915) &&
+	return crtc_state->uapi.async_flip && intel_vtd_active(i915->drm.dev) &&
 		(DISPLAY_VER(i915) == 9 || IS_BROADWELL(i915) || IS_HASWELL(i915));
 }
 
@@ -10699,3 +10700,9 @@ void intel_display_driver_unregister(struct drm_i915_private *i915)
 	acpi_video_unregister();
 	intel_opregion_unregister(i915);
 }
+
+bool intel_scanout_needs_vtd_wa(struct drm_i915_private *dev_priv)
+{
+	return DISPLAY_VER(dev_priv) >= 6 &&
+	       intel_vtd_active(dev_priv->drm.dev);
+}
drivers/gpu/drm/i915/display/intel_display.h +2 -0
index 8513703086b7..d69587c76e71 100644
@@ -694,4 +694,6 @@ void assert_transcoder(struct drm_i915_private *dev_priv,
 #define I915_STATE_WARN_ON(x)						\
 	I915_STATE_WARN((x), "%s", "WARN_ON(" __stringify(x) ")")
 
+bool intel_scanout_needs_vtd_wa(struct drm_i915_private *dev_priv);
+
 #endif
drivers/gpu/drm/i915/display/intel_fbc.c +2 -1
index 142280b6ce6d..00a3e30587a5 100644
@@ -50,6 +50,7 @@
 #include "intel_display_types.h"
 #include "intel_fbc.h"
 #include "intel_frontbuffer.h"
+#include "intel_vtd.h"
 
 #define for_each_fbc_id(__dev_priv, __fbc_id) \
 	for ((__fbc_id) = INTEL_FBC_A; (__fbc_id) < I915_MAX_FBCS; (__fbc_id)++) \
@@ -1643,7 +1644,7 @@ static int intel_sanitize_fbc_option(struct drm_i915_private *i915)
 static bool need_fbc_vtd_wa(struct drm_i915_private *i915)
 {
 	/* WaFbcTurnOffFbcWhenHyperVisorIsUsed:skl,bxt */
-	if (intel_vtd_active(i915) &&
+	if (intel_vtd_active(i915->drm.dev) &&
 	    (IS_SKYLAKE(i915) || IS_BROXTON(i915))) {
 		drm_info(&i915->drm,
 			 "Disabling framebuffer compression (FBC) to prevent screen flicker with VT-d enabled\n");
drivers/gpu/drm/i915/gem/i915_gem_stolen.c +2 -1
index 143f61aaa867..9b986b1b0b60 100644
@@ -19,6 +19,7 @@
 #include "i915_reg.h"
 #include "i915_vgpu.h"
 #include "intel_mchbar_regs.h"
+#include "intel_vtd.h"
 
 /*
  * The BIOS typically reserves some of the system's memory for the exclusive
@@ -403,7 +404,7 @@ static int i915_gem_init_stolen(struct intel_memory_region *mem)
 		return 0;
 	}
 
-	if (intel_vtd_active(i915) && GRAPHICS_VER(i915) < 8) {
+	if (intel_vtd_active(i915->drm.dev) && GRAPHICS_VER(i915) < 8) {
 		drm_notice(&i915->drm,
 			   "%s, disabling use of stolen memory\n",
 			   "DMAR active");
drivers/gpu/drm/i915/gem/i915_gemfs.c +2 -1
index 7271fbf813fa..271826642bd4 100644
@@ -9,6 +9,7 @@
 
 #include "i915_drv.h"
 #include "i915_gemfs.h"
+#include "intel_vtd.h"
 
 int i915_gemfs_init(struct drm_i915_private *i915)
 {
@@ -32,7 +33,7 @@ int i915_gemfs_init(struct drm_i915_private *i915)
 	 */
 
 	opts = NULL;
-	if (intel_vtd_active(i915)) {
+	if (intel_vtd_active(i915->drm.dev)) {
 		if (IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE)) {
 			opts = huge_opt;
 			drm_info(&i915->drm,
drivers/gpu/drm/i915/gt/intel_ggtt.c +3 -2
index 04191fe2ee34..386181cec300 100644
@@ -21,6 +21,7 @@
 #include "i915_vgpu.h"
 
 #include "intel_gtt.h"
+#include "intel_vtd.h"
 #include "gen8_ppgtt.h"
 
 static void i915_ggtt_color_adjust(const struct drm_mm_node *node,
@@ -104,7 +105,7 @@ static bool needs_idle_maps(struct drm_i915_private *i915)
 	 * Query intel_iommu to see if we need the workaround. Presumably that
 	 * was loaded first.
 	 */
-	if (!intel_vtd_active(i915))
+	if (!intel_vtd_active(i915->drm.dev))
 		return false;
 
 	if (GRAPHICS_VER(i915) == 5 && IS_MOBILE(i915))
@@ -1258,7 +1259,7 @@ int i915_ggtt_probe_hw(struct drm_i915_private *i915)
 	if (ret)
 		return ret;
 
-	if (intel_vtd_active(i915))
+	if (intel_vtd_active(i915->drm.dev))
 		drm_info(&i915->drm, "VT-d active for gfx access\n");
 
 	return 0;
drivers/gpu/drm/i915/gt/intel_gtt.c +12 -0
index aed6de2d5a79..ee17e987cddc 100644
@@ -16,6 +16,18 @@
 #include "intel_gt.h"
 #include "intel_gt_regs.h"
 #include "intel_gtt.h"
+#include "intel_vtd.h"
+
+
+static bool intel_ggtt_update_needs_vtd_wa(struct drm_i915_private *i915)
+{
+	return IS_BROXTON(i915) && intel_vtd_active(i915->drm.dev);
+}
+
+bool intel_vm_no_concurrent_access_wa(struct drm_i915_private *i915)
+{
+	return IS_CHERRYVIEW(i915) || intel_ggtt_update_needs_vtd_wa(i915);
+}
 
 struct drm_i915_gem_object *alloc_pt_lmem(struct i915_address_space *vm, int sz)
 {
drivers/gpu/drm/i915/gt/intel_gtt.h +2 -0
index 4529b5e9f6e6..5922e2cf4d8d 100644
@@ -382,6 +382,8 @@ struct i915_ppgtt {
 #define i915_is_dpt(vm) ((vm)->is_dpt)
 #define i915_is_ggtt_or_dpt(vm) (i915_is_ggtt(vm) || i915_is_dpt(vm))
 
+bool intel_vm_no_concurrent_access_wa(struct drm_i915_private *i915);
+
 int __must_check
 i915_vm_lock_objects(struct i915_address_space *vm, struct i915_gem_ww_ctx *ww);
 
drivers/gpu/drm/i915/i915_debugfs.c +1 -0
index 2cbd1f58e754..cda71457d630 100644
@@ -48,6 +48,7 @@
 
 #include "i915_debugfs.h"
 #include "i915_debugfs_params.h"
+#include "i915_driver.h"
 #include "i915_irq.h"
 #include "i915_scheduler.h"
 #include "intel_mchbar_regs.h"
drivers/gpu/drm/i915/i915_driver.c +2 -1
index 64e6f76861f9..f03a63b57f05 100644
@@ -96,6 +96,7 @@
 #include "intel_pcode.h"
 #include "intel_pm.h"
 #include "intel_region_ttm.h"
+#include "intel_vtd.h"
 #include "vlv_suspend.h"
 
 static const struct drm_driver i915_drm_driver;
@@ -744,7 +745,7 @@ void
 i915_print_iommu_status(struct drm_i915_private *i915, struct drm_printer *p)
 {
 	drm_printf(p, "iommu: %s\n",
-		   str_enabled_disabled(intel_vtd_active(i915)));
+		   str_enabled_disabled(intel_vtd_active(i915->drm.dev)));
 }
 
 static void i915_welcome_messages(struct drm_i915_private *dev_priv)
drivers/gpu/drm/i915/i915_driver.h +4 -0
index 9d11de65daaf..44ec543d92cb 100644
@@ -11,6 +11,7 @@
 struct pci_dev;
 struct pci_device_id;
 struct drm_i915_private;
+struct drm_printer;
 
 #define DRIVER_NAME		"i915"
 #define DRIVER_DESC		"Intel Graphics"
@@ -26,4 +27,7 @@ void i915_driver_shutdown(struct drm_i915_private *i915);
 int i915_driver_resume_switcheroo(struct drm_i915_private *i915);
 int i915_driver_suspend_switcheroo(struct drm_i915_private *i915, pm_message_t state);
 
+void
+i915_print_iommu_status(struct drm_i915_private *i915, struct drm_printer *p);
+
 #endif /* __I915_DRIVER_H__ */
drivers/gpu/drm/i915/i915_drv.h +0 -37
index 217c09422711..799f386a7ef2 100644
@@ -32,9 +32,6 @@
 
 #include <uapi/drm/i915_drm.h>
 
-#include <asm/hypervisor.h>
-
-#include <linux/intel-iommu.h>
 #include <linux/pm_qos.h>
 
 #include <drm/drm_connector.h>
@@ -1387,43 +1384,9 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,
 #define HAS_PERCTX_PREEMPT_CTRL(i915) \
 	((GRAPHICS_VER(i915) >= 9) &&  GRAPHICS_VER_FULL(i915) < IP_VER(12, 55))
 
-static inline bool run_as_guest(void)
-{
-	return !hypervisor_is_type(X86_HYPER_NATIVE);
-}
-
 #define HAS_D12_PLANE_MINIMIZATION(dev_priv) (IS_ROCKETLAKE(dev_priv) || \
 					      IS_ALDERLAKE_S(dev_priv))
 
-static inline bool intel_vtd_active(struct drm_i915_private *i915)
-{
-	if (device_iommu_mapped(i915->drm.dev))
-		return true;
-
-	/* Running as a guest, we assume the host is enforcing VT'd */
-	return run_as_guest();
-}
-
-void
-i915_print_iommu_status(struct drm_i915_private *i915, struct drm_printer *p);
-
-static inline bool intel_scanout_needs_vtd_wa(struct drm_i915_private *dev_priv)
-{
-	return DISPLAY_VER(dev_priv) >= 6 && intel_vtd_active(dev_priv);
-}
-
-static inline bool
-intel_ggtt_update_needs_vtd_wa(struct drm_i915_private *i915)
-{
-	return IS_BROXTON(i915) && intel_vtd_active(i915);
-}
-
-static inline bool
-intel_vm_no_concurrent_access_wa(struct drm_i915_private *i915)
-{
-	return IS_CHERRYVIEW(i915) || intel_ggtt_update_needs_vtd_wa(i915);
-}
-
 /* i915_gem.c */
 void i915_gem_init_early(struct drm_i915_private *dev_priv);
 void i915_gem_cleanup_early(struct drm_i915_private *dev_priv);
drivers/gpu/drm/i915/i915_gpu_error.c +2 -1
index a8acc6fbb299..a221b19e588c 100644
@@ -48,6 +48,7 @@
 #include "gt/intel_gt.h"
 #include "gt/intel_gt_pm.h"
 #include "gt/intel_gt_regs.h"
+#include "intel_vtd.h"
 
 #include "i915_driver.h"
 #include "i915_drv.h"
@@ -1814,7 +1815,7 @@ static void capture_gen(struct i915_gpu_coredump *error)
 	error->wakelock = atomic_read(&i915->runtime_pm.wakeref_count);
 	error->suspended = i915->runtime_pm.suspended;
 
-	error->iommu = intel_vtd_active(i915);
+	error->iommu = intel_vtd_active(i915->drm.dev);
 	error->reset_count = i915_reset_count(&i915->gpu_error);
 	error->suspend_count = i915->suspend_count;
 
drivers/gpu/drm/i915/intel_device_info.c +3 -1
index 8d458226f478..21423e6eacb3 100644
@@ -30,6 +30,7 @@
 #include "display/intel_cdclk.h"
 #include "display/intel_de.h"
 #include "intel_device_info.h"
+#include "intel_vtd.h"
 #include "i915_drv.h"
 
 #define PLATFORM_NAME(x) [INTEL_##x] = #x
@@ -389,7 +390,8 @@ void intel_device_info_runtime_init(struct drm_i915_private *dev_priv)
 			info->display.has_dsc = 0;
 	}
 
-	if (GRAPHICS_VER(dev_priv) == 6 && intel_vtd_active(dev_priv)) {
+	if (GRAPHICS_VER(dev_priv) == 6 &&
+	    intel_vtd_active(dev_priv->drm.dev)) {
 		drm_info(&dev_priv->drm,
 			 "Disabling ppGTT for VT-d support\n");
 		info->ppgtt_type = INTEL_PPGTT_NONE;
drivers/gpu/drm/i915/intel_pch.c +2 -1
index 4cce044efde2..c232343d5ba7 100644
@@ -5,6 +5,7 @@
 
 #include "i915_drv.h"
 #include "intel_pch.h"
+#include "intel_vtd.h"
 
 /* Map PCH device id to PCH type, or PCH_NONE if unknown. */
 static enum intel_pch
@@ -256,7 +257,7 @@ void intel_detect_pch(struct drm_i915_private *dev_priv)
 		dev_priv->pch_type = PCH_NOP;
 		dev_priv->pch_id = 0;
 	} else if (!pch) {
-		if (run_as_guest() && HAS_DISPLAY(dev_priv)) {
+		if (intel_vtd_run_as_guest() && HAS_DISPLAY(dev_priv)) {
 			intel_virt_detect_pch(dev_priv, &id, &pch_type);
 			dev_priv->pch_type = pch_type;
 			dev_priv->pch_id = id;
drivers/gpu/drm/i915/intel_vtd.h new file +27 -0
new file mode 100644
index 000000000000..1aa5d813f002
@@ -0,0 +1,27 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright © 2022 Intel Corporation
+ */
+
+#ifndef __INTEL_VTD_H__
+#define __INTEL_VTD_H__
+
+#include <linux/device.h>
+#include <linux/types.h>
+#include <asm/hypervisor.h>
+
+static inline bool intel_vtd_run_as_guest(void)
+{
+	return !hypervisor_is_type(X86_HYPER_NATIVE);
+}
+
+static inline bool intel_vtd_active(struct device *dev)
+{
+	if (device_iommu_mapped(dev))
+		return true;
+
+	/* Running as a guest, we assume the host is enforcing VT'd */
+	return intel_vtd_run_as_guest();
+}
+
+#endif /* __INTEL_VTD_H__ */
Signature · 1 line
2.32.0
#1 lore raw

[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915: Split out intel_vtd_active and run_as_guest to own header

== Series Details ==

== Series Details ==

Series: drm/i915: Split out intel_vtd_active and run_as_guest to own header
URL : https://patchwork.freedesktop.org/series/101646/
State : warning

== Summary ==

$ dim checkpatch origin/drm-tip
b5d25bc04040 drm/i915: Split out intel_vtd_active and run_as_guest to own header
-:179: CHECK:LINE_SPACING: Please don't use multiple blank lines
#179: FILE: drivers/gpu/drm/i915/gt/intel_gtt.c:21:
+
+

-:381: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating? #381:
new file mode 100644

total: 0 errors, 1 warnings, 1 checks, 300 lines checked

#2 lore raw

[Intel-gfx] ✗ Fi.CI.SPARSE: warning for drm/i915: Split out intel_vtd_active and run_as_guest to own header

In reply to Tvrtko Ursulin
== Series Details ==

== Series Details ==

Series: drm/i915: Split out intel_vtd_active and run_as_guest to own header
URL : https://patchwork.freedesktop.org/series/101646/
State : warning

== Summary ==

$ dim sparse --fast origin/drm-tip
Sparse version: v0.6.2
Fast mode used, each commit won't be checked separately.
#3 lore raw

[Intel-gfx] ✗ Fi.CI.DOCS: warning for drm/i915: Split out intel_vtd_active and run_as_guest to own header

In reply to Tvrtko Ursulin
== Series Details ==

== Series Details ==

Series: drm/i915: Split out intel_vtd_active and run_as_guest to own header
URL : https://patchwork.freedesktop.org/series/101646/
State : warning

== Summary ==

$ make htmldocs 2>&1 > /dev/null | grep i915
./drivers/gpu/drm/i915/display/intel_drrs.c:1: warning: 'intel_drrs_enable' not found
./drivers/gpu/drm/i915/display/intel_drrs.c:1: warning: 'intel_drrs_disable' not found
#4 lore raw

[Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915: Split out intel_vtd_active and run_as_guest to own header

In reply to Tvrtko Ursulin
== Series Details ==

== Series Details ==

Series: drm/i915: Split out intel_vtd_active and run_as_guest to own header
URL : https://patchwork.freedesktop.org/series/101646/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_11396 -> Patchwork_22644
====================================================

Summary
-------

**SUCCESS**

No regressions found.

External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/index.html

Participating hosts (49 -> 43)
------------------------------

Missing (6): shard-tglu fi-hsw-4200u fi-bsw-cyan fi-ctg-p8600 shard-rkl fi-bdw-samus

Possible new issues
-------------------

Here are the unknown changes that may have been introduced in Patchwork_22644:

### IGT changes ###

#### Suppressed ####

The following results come from untrusted machines, tests, or statuses. They do not affect the overall result.

* igt@i915_selftest@live@coherency:
- {bat-rpls-2}: [DMESG-WARN][1] ([i915#4391]) -> [INCOMPLETE][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11396/bat-rpls-2/igt@i915_selftest@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/bat-rpls-2/igt@i915_selftest@[email protected]

* igt@kms_flip@basic-plain-flip@a-dp1:
- {bat-adlm-1}: [PASS][3] -> [INCOMPLETE][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11396/bat-adlm-1/igt@kms_flip@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/bat-adlm-1/igt@kms_flip@[email protected]

Known issues
------------

Here are the changes found in Patchwork_22644 that come from known issues:

### IGT changes ###

#### Issues hit ####

* igt@i915_selftest@live@hangcheck:
- fi-hsw-4770: [PASS][5] -> [INCOMPLETE][6] ([i915#3303])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11396/fi-hsw-4770/igt@i915_selftest@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/fi-hsw-4770/igt@i915_selftest@[email protected]

* igt@kms_force_connector_basic@prune-stale-modes:
- fi-cfl-8109u: [PASS][7] -> [DMESG-WARN][8] ([i915#295])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11396/fi-cfl-8109u/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/fi-cfl-8109u/igt@[email protected]

* igt@runner@aborted:
- fi-hsw-4770: NOTRUN -> [FAIL][9] ([fdo#109271] / [i915#1436] / [i915#4312])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/fi-hsw-4770/igt@[email protected]

#### Possible fixes ####

* igt@gem_exec_suspend@basic-s3@smem:
- {fi-rkl-11600}: [INCOMPLETE][10] ([i915#5127]) -> [PASS][11]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11396/fi-rkl-11600/igt@gem_exec_suspend@[email protected]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/fi-rkl-11600/igt@gem_exec_suspend@[email protected]

* igt@i915_selftest@live@hangcheck:
- bat-dg1-6: [DMESG-FAIL][12] ([i915#4494] / [i915#4957]) -> [PASS][13]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11396/bat-dg1-6/igt@i915_selftest@[email protected]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/bat-dg1-6/igt@i915_selftest@[email protected]

* igt@i915_selftest@live@objects:
- {bat-rpls-2}: [DMESG-WARN][14] ([i915#4391]) -> [PASS][15] +3 similar issues
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11396/bat-rpls-2/igt@i915_selftest@[email protected]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/bat-rpls-2/igt@i915_selftest@[email protected]

* igt@kms_busy@basic@modeset:
- {bat-adlp-6}: [DMESG-WARN][16] ([i915#3576]) -> [PASS][17]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11396/bat-adlp-6/igt@kms_busy@[email protected]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/bat-adlp-6/igt@kms_busy@[email protected]

{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).

[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[fdo#109315]: https://bugs.freedesktop.org/show_bug.cgi?id=109315
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072
[i915#1436]: https://gitlab.freedesktop.org/drm/intel/issues/1436
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#295]: https://gitlab.freedesktop.org/drm/intel/issues/295
[i915#3012]: https://gitlab.freedesktop.org/drm/intel/issues/3012
[i915#3282]: https://gitlab.freedesktop.org/drm/intel/issues/3282
[i915#3291]: https://gitlab.freedesktop.org/drm/intel/issues/3291
[i915#3301]: https://gitlab.freedesktop.org/drm/intel/issues/3301
[i915#3303]: https://gitlab.freedesktop.org/drm/intel/issues/3303
[i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555
[i915#3576]: https://gitlab.freedesktop.org/drm/intel/issues/3576
[i915#3708]: https://gitlab.freedesktop.org/drm/intel/issues/3708
[i915#4098]: https://gitlab.freedesktop.org/drm/intel/issues/4098
[i915#4103]: https://gitlab.freedesktop.org/drm/intel/issues/4103
[i915#4312]: https://gitlab.freedesktop.org/drm/intel/issues/4312
[i915#4391]: https://gitlab.freedesktop.org/drm/intel/issues/4391
[i915#4494]: https://gitlab.freedesktop.org/drm/intel/issues/4494
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#4957]: https://gitlab.freedesktop.org/drm/intel/issues/4957
[i915#5087]: https://gitlab.freedesktop.org/drm/intel/issues/5087
[i915#5127]: https://gitlab.freedesktop.org/drm/intel/issues/5127
[i915#533]: https://gitlab.freedesktop.org/drm/intel/issues/533
[i915#5339]: https://gitlab.freedesktop.org/drm/intel/issues/5339
[i915#5342]: https://gitlab.freedesktop.org/drm/intel/issues/5342

Build changes
-------------

* Linux: CI_DRM_11396 -> Patchwork_22644

CI-20190529: 20190529
CI_DRM_11396: 18b88414e6c9660022bb464d4d5fadb07d38cf04 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6387: 04d012b18355b53798af5a55a8915afb1a421bba @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_22644: b5d25bc040409c85d50d2fe3e3097d1e6629c45f @ git://anongit.freedesktop.org/gfx-ci/linux

== Linux commits ==

b5d25bc04040 drm/i915: Split out intel_vtd_active and run_as_guest to own header

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/index.html

#5 lore raw

[Intel-gfx] ✓ Fi.CI.IGT: success for drm/i915: Split out intel_vtd_active and run_as_guest to own header

In reply to Tvrtko Ursulin
== Series Details ==

== Series Details ==

Series: drm/i915: Split out intel_vtd_active and run_as_guest to own header
URL : https://patchwork.freedesktop.org/series/101646/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_11396_full -> Patchwork_22644_full
====================================================

Summary
-------

**SUCCESS**

No regressions found.

Participating hosts (12 -> 12)
------------------------------

No changes in participating hosts

Known issues
------------

Here are the changes found in Patchwork_22644_full that come from known issues:

### IGT changes ###

#### Issues hit ####

* igt@gem_ctx_persistence@legacy-engines-hang@blt:
- shard-skl: NOTRUN -> [SKIP][1] ([fdo#109271]) +254 similar issues
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-skl4/igt@gem_ctx_persistence@[email protected]

* igt@gem_eio@unwedge-stress:
- shard-tglb: [PASS][2] -> [FAIL][3] ([i915#232])
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11396/shard-tglb6/igt@[email protected]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-tglb8/igt@[email protected]

* igt@gem_exec_balancer@parallel-ordering:
- shard-kbl: NOTRUN -> [DMESG-FAIL][4] ([i915#5076])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-kbl4/igt@[email protected]

* igt@gem_exec_balancer@parallel-out-fence:
- shard-kbl: NOTRUN -> [DMESG-WARN][5] ([i915#5076])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-kbl7/igt@[email protected]

* igt@gem_exec_capture@pi@rcs0:
- shard-skl: [PASS][6] -> [INCOMPLETE][7] ([i915#4547])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11396/shard-skl4/igt@gem_exec_capture@[email protected]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-skl8/igt@gem_exec_capture@[email protected]

* igt@gem_exec_fair@basic-none-solo@rcs0:
- shard-apl: [PASS][8] -> [FAIL][9] ([i915#2842])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11396/shard-apl7/igt@gem_exec_fair@[email protected]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-apl7/igt@gem_exec_fair@[email protected]

* igt@gem_exec_fair@basic-pace-solo@rcs0:
- shard-kbl: NOTRUN -> [FAIL][10] ([i915#2842])
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-kbl4/igt@gem_exec_fair@[email protected]

* igt@gem_exec_fair@basic-pace@rcs0:
- shard-glk: [PASS][11] -> [FAIL][12] ([i915#2842])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11396/shard-glk5/igt@gem_exec_fair@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-glk8/igt@gem_exec_fair@[email protected]

* igt@gem_exec_fair@basic-pace@vcs0:
- shard-iclb: NOTRUN -> [FAIL][13] ([i915#2842]) +3 similar issues
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-iclb3/igt@gem_exec_fair@[email protected]

* igt@gem_huc_copy@huc-copy:
- shard-tglb: [PASS][14] -> [SKIP][15] ([i915#2190])
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11396/shard-tglb1/igt@[email protected]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-tglb7/igt@[email protected]

* igt@gem_lmem_swapping@heavy-verify-multi:
- shard-kbl: NOTRUN -> [SKIP][16] ([fdo#109271] / [i915#4613]) +1 similar issue
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-kbl3/igt@[email protected]

* igt@gem_lmem_swapping@parallel-random:
- shard-skl: NOTRUN -> [SKIP][17] ([fdo#109271] / [i915#4613]) +4 similar issues
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-skl4/igt@[email protected]

* igt@gem_lmem_swapping@parallel-random-engines:
- shard-iclb: NOTRUN -> [SKIP][18] ([i915#4613])
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-iclb3/igt@[email protected]

* igt@gem_pxp@verify-pxp-execution-after-suspend-resume:
- shard-apl: NOTRUN -> [SKIP][19] ([fdo#109271]) +54 similar issues
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-apl8/igt@[email protected]

* igt@gem_render_copy@yf-tiled-to-vebox-x-tiled:
- shard-iclb: NOTRUN -> [SKIP][20] ([i915#768])
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-iclb3/igt@[email protected]

* igt@gem_userptr_blits@dmabuf-sync:
- shard-apl: NOTRUN -> [SKIP][21] ([fdo#109271] / [i915#3323])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-apl3/igt@[email protected]

* igt@gem_workarounds@suspend-resume-context:
- shard-glk: [PASS][22] -> [SKIP][23] ([fdo#109271])
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11396/shard-glk1/igt@[email protected]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-glk4/igt@[email protected]

* igt@i915_pm_rc6_residency@rc6-fence:
- shard-iclb: NOTRUN -> [WARN][24] ([i915#1804] / [i915#2684])
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-iclb3/igt@[email protected]

* igt@i915_pm_sseu@full-enable:
- shard-iclb: NOTRUN -> [SKIP][25] ([i915#4387])
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-iclb6/igt@[email protected]

* igt@kms_addfb_basic@invalid-smem-bo-on-discrete:
- shard-iclb: NOTRUN -> [SKIP][26] ([i915#3826])
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-iclb3/igt@[email protected]

* igt@kms_addfb_basic@unused-pitches:
- shard-skl: NOTRUN -> [DMESG-WARN][27] ([i915#1982])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-skl10/igt@[email protected]

* igt@kms_atomic@test-only:
- shard-snb: [PASS][28] -> [SKIP][29] ([fdo#109271])
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11396/shard-snb2/igt@[email protected]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-snb4/igt@[email protected]

* igt@kms_big_fb@4-tiled-16bpp-rotate-270:
- shard-iclb: NOTRUN -> [SKIP][30] ([i915#5286])
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-iclb6/igt@[email protected]

* igt@kms_big_fb@linear-32bpp-rotate-0:
- shard-glk: [PASS][31] -> [DMESG-WARN][32] ([i915#118])
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11396/shard-glk3/igt@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-glk2/igt@[email protected]

* igt@kms_big_fb@x-tiled-max-hw-stride-64bpp-rotate-180-async-flip:
- shard-skl: NOTRUN -> [FAIL][33] ([i915#3743]) +2 similar issues
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-skl6/igt@kms_big_fb@x-tiled-max-hw-stride-64bpp-rotate-180-async-flip.html

* igt@kms_big_fb@y-tiled-max-hw-stride-32bpp-rotate-0-hflip-async-flip:
- shard-skl: NOTRUN -> [SKIP][34] ([fdo#109271] / [i915#3777]) +2 similar issues
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-skl4/igt@kms_big_fb@y-tiled-max-hw-stride-32bpp-rotate-0-hflip-async-flip.html

* igt@kms_big_fb@y-tiled-max-hw-stride-64bpp-rotate-0-async-flip:
- shard-skl: NOTRUN -> [FAIL][35] ([i915#3763])
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-skl1/igt@[email protected]

* igt@kms_big_fb@y-tiled-max-hw-stride-64bpp-rotate-180-hflip:
- shard-kbl: NOTRUN -> [SKIP][36] ([fdo#109271] / [i915#3777])
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-kbl3/igt@[email protected]

* igt@kms_big_fb@yf-tiled-64bpp-rotate-0:
- shard-iclb: NOTRUN -> [SKIP][37] ([fdo#110723])
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-iclb3/igt@[email protected]

* igt@kms_big_fb@yf-tiled-max-hw-stride-32bpp-rotate-0-hflip:
- shard-apl: NOTRUN -> [SKIP][38] ([fdo#109271] / [i915#3777]) +1 similar issue
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-apl8/igt@[email protected]

* igt@kms_ccs@pipe-a-ccs-on-another-bo-y_tiled_gen12_rc_ccs_cc:
- shard-skl: NOTRUN -> [SKIP][39] ([fdo#109271] / [i915#3886]) +10 similar issues
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-skl7/igt@kms_ccs@pipe-a-ccs-on-another-bo-y_tiled_gen12_rc_ccs_cc.html
- shard-kbl: NOTRUN -> [SKIP][40] ([fdo#109271] / [i915#3886]) +5 similar issues
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-kbl7/igt@kms_ccs@pipe-a-ccs-on-another-bo-y_tiled_gen12_rc_ccs_cc.html

* igt@kms_ccs@pipe-a-missing-ccs-buffer-y_tiled_gen12_rc_ccs_cc:
- shard-iclb: NOTRUN -> [SKIP][41] ([fdo#109278] / [i915#3886]) +2 similar issues
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-iclb3/igt@kms_ccs@pipe-a-missing-ccs-buffer-y_tiled_gen12_rc_ccs_cc.html

* igt@kms_ccs@pipe-b-ccs-on-another-bo-y_tiled_gen12_mc_ccs:
- shard-apl: NOTRUN -> [SKIP][42] ([fdo#109271] / [i915#3886]) +1 similar issue
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-apl8/igt@kms_ccs@pipe-b-ccs-on-another-bo-y_tiled_gen12_mc_ccs.html

* igt@kms_chamelium@dp-crc-multiple:
- shard-skl: NOTRUN -> [SKIP][43] ([fdo#109271] / [fdo#111827]) +21 similar issues
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-skl10/igt@[email protected]

* igt@kms_chamelium@dp-hpd-with-enabled-mode:
- shard-iclb: NOTRUN -> [SKIP][44] ([fdo#109284] / [fdo#111827]) +3 similar issues
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-iclb3/igt@[email protected]

* igt@kms_chamelium@hdmi-hpd-storm:
- shard-kbl: NOTRUN -> [SKIP][45] ([fdo#109271] / [fdo#111827]) +19 similar issues
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-kbl7/igt@[email protected]

* igt@kms_color@pipe-d-gamma:
- shard-iclb: NOTRUN -> [SKIP][46] ([fdo#109278] / [i915#1149])
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-iclb3/igt@[email protected]

* igt@kms_color_chamelium@pipe-b-gamma:
- shard-apl: NOTRUN -> [SKIP][47] ([fdo#109271] / [fdo#111827]) +5 similar issues
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-apl8/igt@[email protected]

* igt@kms_content_protection@atomic-dpms:
- shard-kbl: NOTRUN -> [TIMEOUT][48] ([i915#1319])
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-kbl3/igt@[email protected]

* igt@kms_cursor_crc@pipe-b-cursor-512x170-onscreen:
- shard-iclb: NOTRUN -> [SKIP][49] ([fdo#109278] / [fdo#109279])
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-iclb3/igt@[email protected]

* igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size:
- shard-glk: [PASS][50] -> [FAIL][51] ([i915#2346] / [i915#533])
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11396/shard-glk2/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-glk2/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html

* igt@kms_cursor_legacy@pipe-d-single-bo:
- shard-skl: NOTRUN -> [SKIP][52] ([fdo#109271] / [i915#533]) +1 similar issue
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-skl6/igt@[email protected]

* igt@kms_dp_tiled_display@basic-test-pattern-with-chamelium:
- shard-glk: NOTRUN -> [SKIP][53] ([fdo#109271])
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-glk7/igt@[email protected]

* igt@kms_draw_crc@draw-method-rgb565-blt-4tiled:
- shard-iclb: NOTRUN -> [SKIP][54] ([i915#5287])
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-iclb3/igt@[email protected]

* igt@kms_flip@2x-plain-flip-interruptible:
- shard-iclb: NOTRUN -> [SKIP][55] ([fdo#109274])
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-iclb3/igt@[email protected]

* igt@kms_flip@flip-vs-suspend-interruptible@c-dp1:
- shard-apl: [PASS][56] -> [DMESG-WARN][57] ([i915#180]) +3 similar issues
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11396/shard-apl3/igt@kms_flip@[email protected]
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-apl1/igt@kms_flip@[email protected]

* igt@kms_flip@flip-vs-suspend@c-dp1:
- shard-kbl: [PASS][58] -> [DMESG-WARN][59] ([i915#180]) +1 similar issue
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11396/shard-kbl1/igt@kms_flip@[email protected]
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-kbl4/igt@kms_flip@[email protected]

* igt@kms_flip@plain-flip-fb-recreate-interruptible@c-edp1:
- shard-skl: [PASS][60] -> [FAIL][61] ([i915#2122])
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11396/shard-skl2/igt@kms_flip@[email protected]
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-skl9/igt@kms_flip@[email protected]

* igt@kms_flip@plain-flip-ts-check-interruptible@c-edp1:
- shard-skl: NOTRUN -> [FAIL][62] ([i915#2122])
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-skl10/igt@kms_flip@[email protected]

* igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-32bpp-ytileccs-downscaling:
- shard-skl: NOTRUN -> [INCOMPLETE][63] ([i915#3701])
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-skl1/igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-32bpp-ytileccs-downscaling.html

* igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-spr-indfb-draw-mmap-gtt:
- shard-iclb: NOTRUN -> [SKIP][64] ([fdo#109280]) +3 similar issues
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-iclb3/igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-spr-indfb-draw-mmap-gtt.html

* igt@kms_frontbuffer_tracking@psr-rgb101010-draw-mmap-wc:
- shard-kbl: NOTRUN -> [SKIP][65] ([fdo#109271]) +193 similar issues
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-kbl4/igt@[email protected]

* igt@kms_pipe_crc_basic@disable-crc-after-crtc-pipe-d:
- shard-iclb: NOTRUN -> [SKIP][66] ([fdo#109278]) +6 similar issues
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-iclb3/igt@[email protected]

* igt@kms_plane_alpha_blend@pipe-a-coverage-7efc:
- shard-skl: [PASS][67] -> [FAIL][68] ([fdo#108145] / [i915#265])
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11396/shard-skl2/igt@[email protected]
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-skl9/igt@[email protected]

* igt@kms_plane_alpha_blend@pipe-b-alpha-opaque-fb:
- shard-skl: NOTRUN -> [FAIL][69] ([fdo#108145] / [i915#265]) +3 similar issues
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-skl1/igt@[email protected]

* igt@kms_plane_alpha_blend@pipe-b-alpha-transparent-fb:
- shard-skl: NOTRUN -> [FAIL][70] ([i915#265])
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-skl4/igt@[email protected]

* igt@kms_plane_alpha_blend@pipe-c-alpha-7efc:
- shard-kbl: NOTRUN -> [FAIL][71] ([fdo#108145] / [i915#265]) +1 similar issue
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-kbl3/igt@[email protected]

* igt@kms_plane_alpha_blend@pipe-c-alpha-transparent-fb:
- shard-kbl: NOTRUN -> [FAIL][72] ([i915#265])
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-kbl3/igt@[email protected]

* igt@kms_plane_alpha_blend@pipe-c-constant-alpha-max:
- shard-apl: NOTRUN -> [FAIL][73] ([fdo#108145] / [i915#265])
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-apl3/igt@[email protected]

* igt@kms_plane_lowres@pipe-c-tiling-x:
- shard-iclb: NOTRUN -> [SKIP][74] ([i915#3536])
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-iclb6/igt@[email protected]

* igt@kms_psr2_sf@overlay-plane-update-continuous-sf:
- shard-kbl: NOTRUN -> [SKIP][75] ([fdo#109271] / [i915#658])
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-kbl3/igt@[email protected]

* igt@kms_psr2_sf@overlay-plane-update-sf-dmg-area:
- shard-skl: NOTRUN -> [SKIP][76] ([fdo#109271] / [i915#658]) +2 similar issues
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-skl1/igt@[email protected]

* igt@kms_psr2_su@frontbuffer-xrgb8888:
- shard-iclb: [PASS][77] -> [SKIP][78] ([fdo#109642] / [fdo#111068] / [i915#658])
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11396/shard-iclb2/igt@[email protected]
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-iclb1/igt@[email protected]

* igt@kms_psr2_su@page_flip-p010:
- shard-apl: NOTRUN -> [SKIP][79] ([fdo#109271] / [i915#658])
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-apl8/igt@kms_psr2_su@page_flip-p010.html

* igt@kms_psr@psr2_primary_mmap_cpu:
- shard-iclb: [PASS][80] -> [SKIP][81] ([fdo#109441]) +2 similar issues
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11396/shard-iclb2/igt@kms_psr@psr2_primary_mmap_cpu.html
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-iclb1/igt@kms_psr@psr2_primary_mmap_cpu.html

* igt@kms_sysfs_edid_timing:
- shard-apl: NOTRUN -> [FAIL][82] ([IGT#2])
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-apl8/igt@kms_sysfs_edid_timing.html

* igt@kms_vblank@pipe-a-ts-continuation-suspend:
- shard-apl: NOTRUN -> [DMESG-WARN][83] ([i915#180] / [i915#295])
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-apl3/igt@[email protected]

* igt@kms_vblank@pipe-d-wait-idle:
- shard-kbl: NOTRUN -> [SKIP][84] ([fdo#109271] / [i915#533]) +2 similar issues
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-kbl3/igt@[email protected]

* igt@kms_vrr@flip-basic:
- shard-iclb: NOTRUN -> [SKIP][85] ([fdo#109502])
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-iclb3/igt@[email protected]

* igt@kms_writeback@writeback-pixel-formats:
- shard-skl: NOTRUN -> [SKIP][86] ([fdo#109271] / [i915#2437]) +1 similar issue
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-skl6/igt@[email protected]

* igt@perf_pmu@event-wait@rcs0:
- shard-iclb: NOTRUN -> [SKIP][87] ([fdo#112283])
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-iclb3/igt@perf_pmu@[email protected]

* igt@sysfs_clients@recycle-many:
- shard-skl: NOTRUN -> [SKIP][88] ([fdo#109271] / [i915#2994]) +2 similar issues
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-skl6/igt@[email protected]

* igt@sysfs_clients@sema-10:
- shard-apl: NOTRUN -> [SKIP][89] ([fdo#109271] / [i915#2994]) +1 similar issue
[89]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-apl3/igt@[email protected]

* igt@sysfs_clients@sema-50:
- shard-kbl: NOTRUN -> [SKIP][90] ([fdo#109271] / [i915#2994]) +1 similar issue
[90]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-kbl4/igt@[email protected]

#### Possible fixes ####

* igt@fbdev@write:
- {shard-rkl}: [SKIP][91] ([i915#2582]) -> [PASS][92]
[91]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11396/shard-rkl-2/igt@[email protected]
[92]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-rkl-6/igt@[email protected]

* igt@gem_ctx_persistence@many-contexts:
- {shard-rkl}: [FAIL][93] ([i915#2410]) -> [PASS][94]
[93]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11396/shard-rkl-2/igt@[email protected]
[94]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-rkl-5/igt@[email protected]

* igt@gem_exec_fair@basic-none@vcs0:
- shard-kbl: [FAIL][95] ([i915#2842]) -> [PASS][96]
[95]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11396/shard-kbl1/igt@gem_exec_fair@[email protected]
[96]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-kbl4/igt@gem_exec_fair@[email protected]

* igt@gem_exec_fair@basic-pace-share@rcs0:
- shard-tglb: [FAIL][97] ([i915#2842]) -> [PASS][98]
[97]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11396/shard-tglb5/igt@gem_exec_fair@[email protected]
[98]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-tglb2/igt@gem_exec_fair@[email protected]
- shard-glk: [FAIL][99] ([i915#2842]) -> [PASS][100] +1 similar issue
[99]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11396/shard-glk1/igt@gem_exec_fair@[email protected]
[100]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-glk4/igt@gem_exec_fair@[email protected]
- shard-apl: [FAIL][101] ([i915#2842]) -> [PASS][102]
[101]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11396/shard-apl1/igt@gem_exec_fair@[email protected]
[102]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-apl6/igt@gem_exec_fair@[email protected]

* igt@gem_exec_nop@basic-series:
- shard-glk: [DMESG-WARN][103] ([i915#118]) -> [PASS][104]
[103]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11396/shard-glk1/igt@[email protected]
[104]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-glk4/igt@[email protected]

* igt@gem_exec_whisper@basic-fds-forked-all:
- shard-glk: [DMESG-FAIL][105] -> [PASS][106]
[105]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11396/shard-glk7/igt@[email protected]
[106]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-glk7/igt@[email protected]

* igt@i915_pm_dc@dc6-psr:
- shard-iclb: [FAIL][107] ([i915#454]) -> [PASS][108]
[107]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11396/shard-iclb4/igt@[email protected]
[108]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-iclb5/igt@[email protected]

* igt@i915_pm_rpm@basic-pci-d3-state:
- shard-skl: [FAIL][109] ([i915#5290]) -> [PASS][110]
[109]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11396/shard-skl9/igt@[email protected]
[110]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-skl1/igt@[email protected]

* igt@kms_big_fb@y-tiled-max-hw-stride-32bpp-rotate-180-hflip-async-flip:
- {shard-rkl}: [SKIP][111] ([i915#1845] / [i915#4098]) -> [PASS][112] +9 similar issues
[111]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11396/shard-rkl-2/igt@kms_big_fb@y-tiled-max-hw-stride-32bpp-rotate-180-hflip-async-flip.html
[112]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-rkl-6/igt@kms_big_fb@y-tiled-max-hw-stride-32bpp-rotate-180-hflip-async-flip.html

* igt@kms_cursor_crc@pipe-a-cursor-suspend:
- shard-kbl: [DMESG-WARN][113] ([i915#180]) -> [PASS][114] +3 similar issues
[113]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11396/shard-kbl4/igt@[email protected]
[114]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-kbl3/igt@[email protected]

* igt@kms_cursor_crc@pipe-b-cursor-256x85-onscreen:
- {shard-rkl}: [SKIP][115] ([fdo#112022] / [i915#4070]) -> [PASS][116] +1 similar issue
[115]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11396/shard-rkl-2/igt@[email protected]
[116]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-rkl-6/igt@[email protected]

* igt@kms_cursor_crc@pipe-c-cursor-suspend:
- shard-apl: [DMESG-WARN][117] ([i915#180]) -> [PASS][118] +1 similar issue
[117]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11396/shard-apl8/igt@[email protected]
[118]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-apl3/igt@[email protected]

* igt@kms_cursor_legacy@pipe-c-single-move:
- {shard-rkl}: [SKIP][119] ([i915#4070]) -> [PASS][120]
[119]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11396/shard-rkl-2/igt@[email protected]
[120]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-rkl-5/igt@[email protected]

* igt@kms_cursor_legacy@short-flip-after-cursor-toggle:
- {shard-rkl}: [SKIP][121] ([fdo#111825] / [i915#4070]) -> [PASS][122]
[121]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11396/shard-rkl-2/igt@[email protected]
[122]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-rkl-6/igt@[email protected]

* igt@kms_dp_aux_dev:
- {shard-rkl}: [SKIP][123] ([i915#1257]) -> [PASS][124]
[123]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11396/shard-rkl-2/igt@kms_dp_aux_dev.html
[124]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-rkl-6/igt@kms_dp_aux_dev.html

* igt@kms_draw_crc@draw-method-rgb565-mmap-wc-ytiled:
- {shard-rkl}: [SKIP][125] ([fdo#111314] / [i915#4098] / [i915#4369]) -> [PASS][126] +1 similar issue
[125]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11396/shard-rkl-2/igt@[email protected]
[126]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-rkl-6/igt@[email protected]

* igt@kms_fbcon_fbt@fbc-suspend:
- shard-kbl: [INCOMPLETE][127] ([i915#180] / [i915#636]) -> [PASS][128]
[127]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11396/shard-kbl4/igt@[email protected]
[128]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-kbl4/igt@[email protected]

* igt@kms_fbcon_fbt@psr-suspend:
- {shard-rkl}: [SKIP][129] ([fdo#110189] / [i915#3955]) -> [PASS][130]
[129]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11396/shard-rkl-2/igt@[email protected]
[130]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-rkl-6/igt@[email protected]

* igt@kms_flip@2x-plain-flip-fb-recreate@ab-hdmi-a1-hdmi-a2:
- shard-glk: [FAIL][131] ([i915#2122]) -> [PASS][132]
[131]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11396/shard-glk2/igt@kms_flip@[email protected]
[132]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-glk2/igt@kms_flip@[email protected]

* igt@kms_flip@flip-vs-suspend-interruptible@b-edp1:
- shard-skl: [INCOMPLETE][133] ([i915#4839]) -> [PASS][134]
[133]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11396/shard-skl6/igt@kms_flip@[email protected]
[134]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-skl7/igt@kms_flip@[email protected]

* igt@kms_flip@plain-flip-fb-recreate-interruptible@b-edp1:
- shard-skl: [FAIL][135] ([i915#2122]) -> [PASS][136]
[135]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11396/shard-skl2/igt@kms_flip@[email protected]
[136]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-skl9/igt@kms_flip@[email protected]

* igt@kms_flip_scaled_crc@flip-64bpp-ytile-to-32bpp-ytilercccs-upscaling:
- {shard-rkl}: [INCOMPLETE][137] ([i915#3701]) -> [PASS][138]
[137]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11396/shard-rkl-2/igt@kms_flip_scaled_crc@flip-64bpp-ytile-to-32bpp-ytilercccs-upscaling.html
[138]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/shard-rkl-6/igt@kms_flip_scaled_crc@flip-64bpp-ytile-to-32bpp-ytilercccs-upscaling.html

* igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-spr-indfb-draw-mmap-gtt:
- {s

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22644/index.html

#6 lore raw
In reply to Tvrtko Ursulin
Quoted 9 lines · Tvrtko Ursulin

From: Tvrtko Ursulin <[email protected]>

...

Cc Jani Nikula <[email protected]>
Cc Lucas De Marchi <[email protected]>

---
Typed up how I see it - bash away.

So is intel_vtd_active() so performance critical that it needs to be inline?

We're passing struct drm_i915_private * everywhere we can, and it just feels silly to use struct drm_device * to avoid the include.

Static inlines considered harmful. :p

BR,
Jani.

Quoted 421 lines
---
 drivers/gpu/drm/i915/display/intel_bw.c      |  3 +-
 drivers/gpu/drm/i915/display/intel_display.c |  9 ++++-
 drivers/gpu/drm/i915/display/intel_display.h |  2 ++
 drivers/gpu/drm/i915/display/intel_fbc.c     |  3 +-
 drivers/gpu/drm/i915/gem/i915_gem_stolen.c   |  3 +-
 drivers/gpu/drm/i915/gem/i915_gemfs.c        |  3 +-
 drivers/gpu/drm/i915/gt/intel_ggtt.c         |  5 +--
 drivers/gpu/drm/i915/gt/intel_gtt.c          | 12 +++++++
 drivers/gpu/drm/i915/gt/intel_gtt.h          |  2 ++
 drivers/gpu/drm/i915/i915_debugfs.c          |  1 +
 drivers/gpu/drm/i915/i915_driver.c           |  3 +-
 drivers/gpu/drm/i915/i915_driver.h           |  4 +++
 drivers/gpu/drm/i915/i915_drv.h              | 37 --------------------
 drivers/gpu/drm/i915/i915_gpu_error.c        |  3 +-
 drivers/gpu/drm/i915/intel_device_info.c     |  4 ++-
 drivers/gpu/drm/i915/intel_pch.c             |  3 +-
 drivers/gpu/drm/i915/intel_vtd.h             | 27 ++++++++++++++
 17 files changed, 76 insertions(+), 48 deletions(-)
 create mode 100644 drivers/gpu/drm/i915/intel_vtd.h
drivers/gpu/drm/i915/display/intel_bw.c +2 -1
index ac11ff19e47d..6c9cb4f97218 100644
@@ -13,6 +13,7 @@
 #include "intel_mchbar_regs.h"
 #include "intel_pcode.h"
 #include "intel_pm.h"
+#include "intel_vtd.h"
 
 /* Parameters for Qclk Geyserville (QGV) */
 struct intel_qgv_point {
@@ -649,7 +650,7 @@ static unsigned int intel_bw_data_rate(struct drm_i915_private *dev_priv,
 	for_each_pipe(dev_priv, pipe)
 		data_rate += bw_state->data_rate[pipe];
 
-	if (DISPLAY_VER(dev_priv) >= 13 && intel_vtd_active(dev_priv))
+	if (DISPLAY_VER(dev_priv) >= 13 && intel_vtd_active(dev_priv->drm.dev))
 		data_rate = DIV_ROUND_UP(data_rate * 105, 100);
 
 	return data_rate;
drivers/gpu/drm/i915/display/intel_display.c +8 -1
index dc6e21e4ef0b..e80f3ca3ee4e 100644
@@ -110,6 +110,7 @@
 #include "intel_quirks.h"
 #include "intel_sprite.h"
 #include "intel_tc.h"
+#include "intel_vtd.h"
 #include "intel_vga.h"
 #include "i9xx_plane.h"
 #include "skl_scaler.h"
@@ -1197,7 +1198,7 @@ static bool needs_async_flip_vtd_wa(const struct intel_crtc_state *crtc_state)
 {
 	struct drm_i915_private *i915 = to_i915(crtc_state->uapi.crtc->dev);
 
-	return crtc_state->uapi.async_flip && intel_vtd_active(i915) &&
+	return crtc_state->uapi.async_flip && intel_vtd_active(i915->drm.dev) &&
 		(DISPLAY_VER(i915) == 9 || IS_BROADWELL(i915) || IS_HASWELL(i915));
 }
 
@@ -10699,3 +10700,9 @@ void intel_display_driver_unregister(struct drm_i915_private *i915)
 	acpi_video_unregister();
 	intel_opregion_unregister(i915);
 }
+
+bool intel_scanout_needs_vtd_wa(struct drm_i915_private *dev_priv)
+{
+	return DISPLAY_VER(dev_priv) >= 6 &&
+	       intel_vtd_active(dev_priv->drm.dev);
+}
drivers/gpu/drm/i915/display/intel_display.h +2 -0
index 8513703086b7..d69587c76e71 100644
@@ -694,4 +694,6 @@ void assert_transcoder(struct drm_i915_private *dev_priv,
 #define I915_STATE_WARN_ON(x)						\
 	I915_STATE_WARN((x), "%s", "WARN_ON(" __stringify(x) ")")
 
+bool intel_scanout_needs_vtd_wa(struct drm_i915_private *dev_priv);
+
 #endif
drivers/gpu/drm/i915/display/intel_fbc.c +2 -1
index 142280b6ce6d..00a3e30587a5 100644
@@ -50,6 +50,7 @@
 #include "intel_display_types.h"
 #include "intel_fbc.h"
 #include "intel_frontbuffer.h"
+#include "intel_vtd.h"
 
 #define for_each_fbc_id(__dev_priv, __fbc_id) \
 	for ((__fbc_id) = INTEL_FBC_A; (__fbc_id) < I915_MAX_FBCS; (__fbc_id)++) \
@@ -1643,7 +1644,7 @@ static int intel_sanitize_fbc_option(struct drm_i915_private *i915)
 static bool need_fbc_vtd_wa(struct drm_i915_private *i915)
 {
 	/* WaFbcTurnOffFbcWhenHyperVisorIsUsed:skl,bxt */
-	if (intel_vtd_active(i915) &&
+	if (intel_vtd_active(i915->drm.dev) &&
 	    (IS_SKYLAKE(i915) || IS_BROXTON(i915))) {
 		drm_info(&i915->drm,
 			 "Disabling framebuffer compression (FBC) to prevent screen flicker with VT-d enabled\n");
drivers/gpu/drm/i915/gem/i915_gem_stolen.c +2 -1
index 143f61aaa867..9b986b1b0b60 100644
@@ -19,6 +19,7 @@
 #include "i915_reg.h"
 #include "i915_vgpu.h"
 #include "intel_mchbar_regs.h"
+#include "intel_vtd.h"
 
 /*
  * The BIOS typically reserves some of the system's memory for the exclusive
@@ -403,7 +404,7 @@ static int i915_gem_init_stolen(struct intel_memory_region *mem)
 		return 0;
 	}
 
-	if (intel_vtd_active(i915) && GRAPHICS_VER(i915) < 8) {
+	if (intel_vtd_active(i915->drm.dev) && GRAPHICS_VER(i915) < 8) {
 		drm_notice(&i915->drm,
 			   "%s, disabling use of stolen memory\n",
 			   "DMAR active");
drivers/gpu/drm/i915/gem/i915_gemfs.c +2 -1
index 7271fbf813fa..271826642bd4 100644
@@ -9,6 +9,7 @@
 
 #include "i915_drv.h"
 #include "i915_gemfs.h"
+#include "intel_vtd.h"
 
 int i915_gemfs_init(struct drm_i915_private *i915)
 {
@@ -32,7 +33,7 @@ int i915_gemfs_init(struct drm_i915_private *i915)
 	 */
 
 	opts = NULL;
-	if (intel_vtd_active(i915)) {
+	if (intel_vtd_active(i915->drm.dev)) {
 		if (IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE)) {
 			opts = huge_opt;
 			drm_info(&i915->drm,
drivers/gpu/drm/i915/gt/intel_ggtt.c +3 -2
index 04191fe2ee34..386181cec300 100644
@@ -21,6 +21,7 @@
 #include "i915_vgpu.h"
 
 #include "intel_gtt.h"
+#include "intel_vtd.h"
 #include "gen8_ppgtt.h"
 
 static void i915_ggtt_color_adjust(const struct drm_mm_node *node,
@@ -104,7 +105,7 @@ static bool needs_idle_maps(struct drm_i915_private *i915)
 	 * Query intel_iommu to see if we need the workaround. Presumably that
 	 * was loaded first.
 	 */
-	if (!intel_vtd_active(i915))
+	if (!intel_vtd_active(i915->drm.dev))
 		return false;
 
 	if (GRAPHICS_VER(i915) == 5 && IS_MOBILE(i915))
@@ -1258,7 +1259,7 @@ int i915_ggtt_probe_hw(struct drm_i915_private *i915)
 	if (ret)
 		return ret;
 
-	if (intel_vtd_active(i915))
+	if (intel_vtd_active(i915->drm.dev))
 		drm_info(&i915->drm, "VT-d active for gfx access\n");
 
 	return 0;
drivers/gpu/drm/i915/gt/intel_gtt.c +12 -0
index aed6de2d5a79..ee17e987cddc 100644
@@ -16,6 +16,18 @@
 #include "intel_gt.h"
 #include "intel_gt_regs.h"
 #include "intel_gtt.h"
+#include "intel_vtd.h"
+
+
+static bool intel_ggtt_update_needs_vtd_wa(struct drm_i915_private *i915)
+{
+	return IS_BROXTON(i915) && intel_vtd_active(i915->drm.dev);
+}
+
+bool intel_vm_no_concurrent_access_wa(struct drm_i915_private *i915)
+{
+	return IS_CHERRYVIEW(i915) || intel_ggtt_update_needs_vtd_wa(i915);
+}
 
 struct drm_i915_gem_object *alloc_pt_lmem(struct i915_address_space *vm, int sz)
 {
drivers/gpu/drm/i915/gt/intel_gtt.h +2 -0
index 4529b5e9f6e6..5922e2cf4d8d 100644
@@ -382,6 +382,8 @@ struct i915_ppgtt {
 #define i915_is_dpt(vm) ((vm)->is_dpt)
 #define i915_is_ggtt_or_dpt(vm) (i915_is_ggtt(vm) || i915_is_dpt(vm))
 
+bool intel_vm_no_concurrent_access_wa(struct drm_i915_private *i915);
+
 int __must_check
 i915_vm_lock_objects(struct i915_address_space *vm, struct i915_gem_ww_ctx *ww);
 
drivers/gpu/drm/i915/i915_debugfs.c +1 -0
index 2cbd1f58e754..cda71457d630 100644
@@ -48,6 +48,7 @@
 
 #include "i915_debugfs.h"
 #include "i915_debugfs_params.h"
+#include "i915_driver.h"
 #include "i915_irq.h"
 #include "i915_scheduler.h"
 #include "intel_mchbar_regs.h"
drivers/gpu/drm/i915/i915_driver.c +2 -1
index 64e6f76861f9..f03a63b57f05 100644
@@ -96,6 +96,7 @@
 #include "intel_pcode.h"
 #include "intel_pm.h"
 #include "intel_region_ttm.h"
+#include "intel_vtd.h"
 #include "vlv_suspend.h"
 
 static const struct drm_driver i915_drm_driver;
@@ -744,7 +745,7 @@ void
 i915_print_iommu_status(struct drm_i915_private *i915, struct drm_printer *p)
 {
 	drm_printf(p, "iommu: %s\n",
-		   str_enabled_disabled(intel_vtd_active(i915)));
+		   str_enabled_disabled(intel_vtd_active(i915->drm.dev)));
 }
 
 static void i915_welcome_messages(struct drm_i915_private *dev_priv)
drivers/gpu/drm/i915/i915_driver.h +4 -0
index 9d11de65daaf..44ec543d92cb 100644
@@ -11,6 +11,7 @@
 struct pci_dev;
 struct pci_device_id;
 struct drm_i915_private;
+struct drm_printer;
 
 #define DRIVER_NAME		"i915"
 #define DRIVER_DESC		"Intel Graphics"
@@ -26,4 +27,7 @@ void i915_driver_shutdown(struct drm_i915_private *i915);
 int i915_driver_resume_switcheroo(struct drm_i915_private *i915);
 int i915_driver_suspend_switcheroo(struct drm_i915_private *i915, pm_message_t state);
 
+void
+i915_print_iommu_status(struct drm_i915_private *i915, struct drm_printer *p);
+
 #endif /* __I915_DRIVER_H__ */
drivers/gpu/drm/i915/i915_drv.h +0 -37
index 217c09422711..799f386a7ef2 100644
@@ -32,9 +32,6 @@
 
 #include <uapi/drm/i915_drm.h>
 
-#include <asm/hypervisor.h>
-
-#include <linux/intel-iommu.h>
 #include <linux/pm_qos.h>
 
 #include <drm/drm_connector.h>
@@ -1387,43 +1384,9 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,
 #define HAS_PERCTX_PREEMPT_CTRL(i915) \
 	((GRAPHICS_VER(i915) >= 9) &&  GRAPHICS_VER_FULL(i915) < IP_VER(12, 55))
 
-static inline bool run_as_guest(void)
-{
-	return !hypervisor_is_type(X86_HYPER_NATIVE);
-}
-
 #define HAS_D12_PLANE_MINIMIZATION(dev_priv) (IS_ROCKETLAKE(dev_priv) || \
 					      IS_ALDERLAKE_S(dev_priv))
 
-static inline bool intel_vtd_active(struct drm_i915_private *i915)
-{
-	if (device_iommu_mapped(i915->drm.dev))
-		return true;
-
-	/* Running as a guest, we assume the host is enforcing VT'd */
-	return run_as_guest();
-}
-
-void
-i915_print_iommu_status(struct drm_i915_private *i915, struct drm_printer *p);
-
-static inline bool intel_scanout_needs_vtd_wa(struct drm_i915_private *dev_priv)
-{
-	return DISPLAY_VER(dev_priv) >= 6 && intel_vtd_active(dev_priv);
-}
-
-static inline bool
-intel_ggtt_update_needs_vtd_wa(struct drm_i915_private *i915)
-{
-	return IS_BROXTON(i915) && intel_vtd_active(i915);
-}
-
-static inline bool
-intel_vm_no_concurrent_access_wa(struct drm_i915_private *i915)
-{
-	return IS_CHERRYVIEW(i915) || intel_ggtt_update_needs_vtd_wa(i915);
-}
-
 /* i915_gem.c */
 void i915_gem_init_early(struct drm_i915_private *dev_priv);
 void i915_gem_cleanup_early(struct drm_i915_private *dev_priv);
drivers/gpu/drm/i915/i915_gpu_error.c +2 -1
index a8acc6fbb299..a221b19e588c 100644
@@ -48,6 +48,7 @@
 #include "gt/intel_gt.h"
 #include "gt/intel_gt_pm.h"
 #include "gt/intel_gt_regs.h"
+#include "intel_vtd.h"
 
 #include "i915_driver.h"
 #include "i915_drv.h"
@@ -1814,7 +1815,7 @@ static void capture_gen(struct i915_gpu_coredump *error)
 	error->wakelock = atomic_read(&i915->runtime_pm.wakeref_count);
 	error->suspended = i915->runtime_pm.suspended;
 
-	error->iommu = intel_vtd_active(i915);
+	error->iommu = intel_vtd_active(i915->drm.dev);
 	error->reset_count = i915_reset_count(&i915->gpu_error);
 	error->suspend_count = i915->suspend_count;
 
drivers/gpu/drm/i915/intel_device_info.c +3 -1
index 8d458226f478..21423e6eacb3 100644
@@ -30,6 +30,7 @@
 #include "display/intel_cdclk.h"
 #include "display/intel_de.h"
 #include "intel_device_info.h"
+#include "intel_vtd.h"
 #include "i915_drv.h"
 
 #define PLATFORM_NAME(x) [INTEL_##x] = #x
@@ -389,7 +390,8 @@ void intel_device_info_runtime_init(struct drm_i915_private *dev_priv)
 			info->display.has_dsc = 0;
 	}
 
-	if (GRAPHICS_VER(dev_priv) == 6 && intel_vtd_active(dev_priv)) {
+	if (GRAPHICS_VER(dev_priv) == 6 &&
+	    intel_vtd_active(dev_priv->drm.dev)) {
 		drm_info(&dev_priv->drm,
 			 "Disabling ppGTT for VT-d support\n");
 		info->ppgtt_type = INTEL_PPGTT_NONE;
drivers/gpu/drm/i915/intel_pch.c +2 -1
index 4cce044efde2..c232343d5ba7 100644
@@ -5,6 +5,7 @@
 
 #include "i915_drv.h"
 #include "intel_pch.h"
+#include "intel_vtd.h"
 
 /* Map PCH device id to PCH type, or PCH_NONE if unknown. */
 static enum intel_pch
@@ -256,7 +257,7 @@ void intel_detect_pch(struct drm_i915_private *dev_priv)
 		dev_priv->pch_type = PCH_NOP;
 		dev_priv->pch_id = 0;
 	} else if (!pch) {
-		if (run_as_guest() && HAS_DISPLAY(dev_priv)) {
+		if (intel_vtd_run_as_guest() && HAS_DISPLAY(dev_priv)) {
 			intel_virt_detect_pch(dev_priv, &id, &pch_type);
 			dev_priv->pch_type = pch_type;
 			dev_priv->pch_id = id;
drivers/gpu/drm/i915/intel_vtd.h new file +27 -0
new file mode 100644
index 000000000000..1aa5d813f002
@@ -0,0 +1,27 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright © 2022 Intel Corporation
+ */
+
+#ifndef __INTEL_VTD_H__
+#define __INTEL_VTD_H__
+
+#include <linux/device.h>
+#include <linux/types.h>
+#include <asm/hypervisor.h>
+
+static inline bool intel_vtd_run_as_guest(void)
+{
+	return !hypervisor_is_type(X86_HYPER_NATIVE);
+}
+
+static inline bool intel_vtd_active(struct device *dev)
+{
+	if (device_iommu_mapped(dev))
+		return true;
+
+	/* Running as a guest, we assume the host is enforcing VT'd */
+	return intel_vtd_run_as_guest();
+}
+
+#endif /* __INTEL_VTD_H__ */
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
Acked-by
#7 lore raw
Quoted 11 lines · Jani Nikula
Quoted 9 lines · Tvrtko Ursulin

From: Tvrtko Ursulin <[email protected]>

...

Cc Jani Nikula <[email protected]>
Cc Lucas De Marchi <[email protected]>

---
Typed up how I see it - bash away.

Quoted 7 lines

So is intel_vtd_active() so performance critical that it needs to be inline?

We're passing struct drm_i915_private * everywhere we can, and it just feels silly to use struct drm_device * to avoid the include.

Static inlines considered harmful. :p

Otherwise,

Quoted 427 lines

BR,
Jani.

Quoted 421 lines
---
 drivers/gpu/drm/i915/display/intel_bw.c      |  3 +-
 drivers/gpu/drm/i915/display/intel_display.c |  9 ++++-
 drivers/gpu/drm/i915/display/intel_display.h |  2 ++
 drivers/gpu/drm/i915/display/intel_fbc.c     |  3 +-
 drivers/gpu/drm/i915/gem/i915_gem_stolen.c   |  3 +-
 drivers/gpu/drm/i915/gem/i915_gemfs.c        |  3 +-
 drivers/gpu/drm/i915/gt/intel_ggtt.c         |  5 +--
 drivers/gpu/drm/i915/gt/intel_gtt.c          | 12 +++++++
 drivers/gpu/drm/i915/gt/intel_gtt.h          |  2 ++
 drivers/gpu/drm/i915/i915_debugfs.c          |  1 +
 drivers/gpu/drm/i915/i915_driver.c           |  3 +-
 drivers/gpu/drm/i915/i915_driver.h           |  4 +++
 drivers/gpu/drm/i915/i915_drv.h              | 37 --------------------
 drivers/gpu/drm/i915/i915_gpu_error.c        |  3 +-
 drivers/gpu/drm/i915/intel_device_info.c     |  4 ++-
 drivers/gpu/drm/i915/intel_pch.c             |  3 +-
 drivers/gpu/drm/i915/intel_vtd.h             | 27 ++++++++++++++
 17 files changed, 76 insertions(+), 48 deletions(-)
 create mode 100644 drivers/gpu/drm/i915/intel_vtd.h
drivers/gpu/drm/i915/display/intel_bw.c +2 -1
index ac11ff19e47d..6c9cb4f97218 100644
@@ -13,6 +13,7 @@
 #include "intel_mchbar_regs.h"
 #include "intel_pcode.h"
 #include "intel_pm.h"
+#include "intel_vtd.h"
 
 /* Parameters for Qclk Geyserville (QGV) */
 struct intel_qgv_point {
@@ -649,7 +650,7 @@ static unsigned int intel_bw_data_rate(struct drm_i915_private *dev_priv,
 	for_each_pipe(dev_priv, pipe)
 		data_rate += bw_state->data_rate[pipe];
 
-	if (DISPLAY_VER(dev_priv) >= 13 && intel_vtd_active(dev_priv))
+	if (DISPLAY_VER(dev_priv) >= 13 && intel_vtd_active(dev_priv->drm.dev))
 		data_rate = DIV_ROUND_UP(data_rate * 105, 100);
 
 	return data_rate;
drivers/gpu/drm/i915/display/intel_display.c +8 -1
index dc6e21e4ef0b..e80f3ca3ee4e 100644
@@ -110,6 +110,7 @@
 #include "intel_quirks.h"
 #include "intel_sprite.h"
 #include "intel_tc.h"
+#include "intel_vtd.h"
 #include "intel_vga.h"
 #include "i9xx_plane.h"
 #include "skl_scaler.h"
@@ -1197,7 +1198,7 @@ static bool needs_async_flip_vtd_wa(const struct intel_crtc_state *crtc_state)
 {
 	struct drm_i915_private *i915 = to_i915(crtc_state->uapi.crtc->dev);
 
-	return crtc_state->uapi.async_flip && intel_vtd_active(i915) &&
+	return crtc_state->uapi.async_flip && intel_vtd_active(i915->drm.dev) &&
 		(DISPLAY_VER(i915) == 9 || IS_BROADWELL(i915) || IS_HASWELL(i915));
 }
 
@@ -10699,3 +10700,9 @@ void intel_display_driver_unregister(struct drm_i915_private *i915)
 	acpi_video_unregister();
 	intel_opregion_unregister(i915);
 }
+
+bool intel_scanout_needs_vtd_wa(struct drm_i915_private *dev_priv)
+{
+	return DISPLAY_VER(dev_priv) >= 6 &&
+	       intel_vtd_active(dev_priv->drm.dev);
+}
drivers/gpu/drm/i915/display/intel_display.h +2 -0
index 8513703086b7..d69587c76e71 100644
@@ -694,4 +694,6 @@ void assert_transcoder(struct drm_i915_private *dev_priv,
 #define I915_STATE_WARN_ON(x)						\
 	I915_STATE_WARN((x), "%s", "WARN_ON(" __stringify(x) ")")
 
+bool intel_scanout_needs_vtd_wa(struct drm_i915_private *dev_priv);
+
 #endif
drivers/gpu/drm/i915/display/intel_fbc.c +2 -1
index 142280b6ce6d..00a3e30587a5 100644
@@ -50,6 +50,7 @@
 #include "intel_display_types.h"
 #include "intel_fbc.h"
 #include "intel_frontbuffer.h"
+#include "intel_vtd.h"
 
 #define for_each_fbc_id(__dev_priv, __fbc_id) \
 	for ((__fbc_id) = INTEL_FBC_A; (__fbc_id) < I915_MAX_FBCS; (__fbc_id)++) \
@@ -1643,7 +1644,7 @@ static int intel_sanitize_fbc_option(struct drm_i915_private *i915)
 static bool need_fbc_vtd_wa(struct drm_i915_private *i915)
 {
 	/* WaFbcTurnOffFbcWhenHyperVisorIsUsed:skl,bxt */
-	if (intel_vtd_active(i915) &&
+	if (intel_vtd_active(i915->drm.dev) &&
 	    (IS_SKYLAKE(i915) || IS_BROXTON(i915))) {
 		drm_info(&i915->drm,
 			 "Disabling framebuffer compression (FBC) to prevent screen flicker with VT-d enabled\n");
drivers/gpu/drm/i915/gem/i915_gem_stolen.c +2 -1
index 143f61aaa867..9b986b1b0b60 100644
@@ -19,6 +19,7 @@
 #include "i915_reg.h"
 #include "i915_vgpu.h"
 #include "intel_mchbar_regs.h"
+#include "intel_vtd.h"
 
 /*
  * The BIOS typically reserves some of the system's memory for the exclusive
@@ -403,7 +404,7 @@ static int i915_gem_init_stolen(struct intel_memory_region *mem)
 		return 0;
 	}
 
-	if (intel_vtd_active(i915) && GRAPHICS_VER(i915) < 8) {
+	if (intel_vtd_active(i915->drm.dev) && GRAPHICS_VER(i915) < 8) {
 		drm_notice(&i915->drm,
 			   "%s, disabling use of stolen memory\n",
 			   "DMAR active");
drivers/gpu/drm/i915/gem/i915_gemfs.c +2 -1
index 7271fbf813fa..271826642bd4 100644
@@ -9,6 +9,7 @@
 
 #include "i915_drv.h"
 #include "i915_gemfs.h"
+#include "intel_vtd.h"
 
 int i915_gemfs_init(struct drm_i915_private *i915)
 {
@@ -32,7 +33,7 @@ int i915_gemfs_init(struct drm_i915_private *i915)
 	 */
 
 	opts = NULL;
-	if (intel_vtd_active(i915)) {
+	if (intel_vtd_active(i915->drm.dev)) {
 		if (IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE)) {
 			opts = huge_opt;
 			drm_info(&i915->drm,
drivers/gpu/drm/i915/gt/intel_ggtt.c +3 -2
index 04191fe2ee34..386181cec300 100644
@@ -21,6 +21,7 @@
 #include "i915_vgpu.h"
 
 #include "intel_gtt.h"
+#include "intel_vtd.h"
 #include "gen8_ppgtt.h"
 
 static void i915_ggtt_color_adjust(const struct drm_mm_node *node,
@@ -104,7 +105,7 @@ static bool needs_idle_maps(struct drm_i915_private *i915)
 	 * Query intel_iommu to see if we need the workaround. Presumably that
 	 * was loaded first.
 	 */
-	if (!intel_vtd_active(i915))
+	if (!intel_vtd_active(i915->drm.dev))
 		return false;
 
 	if (GRAPHICS_VER(i915) == 5 && IS_MOBILE(i915))
@@ -1258,7 +1259,7 @@ int i915_ggtt_probe_hw(struct drm_i915_private *i915)
 	if (ret)
 		return ret;
 
-	if (intel_vtd_active(i915))
+	if (intel_vtd_active(i915->drm.dev))
 		drm_info(&i915->drm, "VT-d active for gfx access\n");
 
 	return 0;
drivers/gpu/drm/i915/gt/intel_gtt.c +12 -0
index aed6de2d5a79..ee17e987cddc 100644
@@ -16,6 +16,18 @@
 #include "intel_gt.h"
 #include "intel_gt_regs.h"
 #include "intel_gtt.h"
+#include "intel_vtd.h"
+
+
+static bool intel_ggtt_update_needs_vtd_wa(struct drm_i915_private *i915)
+{
+	return IS_BROXTON(i915) && intel_vtd_active(i915->drm.dev);
+}
+
+bool intel_vm_no_concurrent_access_wa(struct drm_i915_private *i915)
+{
+	return IS_CHERRYVIEW(i915) || intel_ggtt_update_needs_vtd_wa(i915);
+}
 
 struct drm_i915_gem_object *alloc_pt_lmem(struct i915_address_space *vm, int sz)
 {
drivers/gpu/drm/i915/gt/intel_gtt.h +2 -0
index 4529b5e9f6e6..5922e2cf4d8d 100644
@@ -382,6 +382,8 @@ struct i915_ppgtt {
 #define i915_is_dpt(vm) ((vm)->is_dpt)
 #define i915_is_ggtt_or_dpt(vm) (i915_is_ggtt(vm) || i915_is_dpt(vm))
 
+bool intel_vm_no_concurrent_access_wa(struct drm_i915_private *i915);
+
 int __must_check
 i915_vm_lock_objects(struct i915_address_space *vm, struct i915_gem_ww_ctx *ww);
 
drivers/gpu/drm/i915/i915_debugfs.c +1 -0
index 2cbd1f58e754..cda71457d630 100644
@@ -48,6 +48,7 @@
 
 #include "i915_debugfs.h"
 #include "i915_debugfs_params.h"
+#include "i915_driver.h"
 #include "i915_irq.h"
 #include "i915_scheduler.h"
 #include "intel_mchbar_regs.h"
drivers/gpu/drm/i915/i915_driver.c +2 -1
index 64e6f76861f9..f03a63b57f05 100644
@@ -96,6 +96,7 @@
 #include "intel_pcode.h"
 #include "intel_pm.h"
 #include "intel_region_ttm.h"
+#include "intel_vtd.h"
 #include "vlv_suspend.h"
 
 static const struct drm_driver i915_drm_driver;
@@ -744,7 +745,7 @@ void
 i915_print_iommu_status(struct drm_i915_private *i915, struct drm_printer *p)
 {
 	drm_printf(p, "iommu: %s\n",
-		   str_enabled_disabled(intel_vtd_active(i915)));
+		   str_enabled_disabled(intel_vtd_active(i915->drm.dev)));
 }
 
 static void i915_welcome_messages(struct drm_i915_private *dev_priv)
drivers/gpu/drm/i915/i915_driver.h +4 -0
index 9d11de65daaf..44ec543d92cb 100644
@@ -11,6 +11,7 @@
 struct pci_dev;
 struct pci_device_id;
 struct drm_i915_private;
+struct drm_printer;
 
 #define DRIVER_NAME		"i915"
 #define DRIVER_DESC		"Intel Graphics"
@@ -26,4 +27,7 @@ void i915_driver_shutdown(struct drm_i915_private *i915);
 int i915_driver_resume_switcheroo(struct drm_i915_private *i915);
 int i915_driver_suspend_switcheroo(struct drm_i915_private *i915, pm_message_t state);
 
+void
+i915_print_iommu_status(struct drm_i915_private *i915, struct drm_printer *p);
+
 #endif /* __I915_DRIVER_H__ */
drivers/gpu/drm/i915/i915_drv.h +0 -37
index 217c09422711..799f386a7ef2 100644
@@ -32,9 +32,6 @@
 
 #include <uapi/drm/i915_drm.h>
 
-#include <asm/hypervisor.h>
-
-#include <linux/intel-iommu.h>
 #include <linux/pm_qos.h>
 
 #include <drm/drm_connector.h>
@@ -1387,43 +1384,9 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,
 #define HAS_PERCTX_PREEMPT_CTRL(i915) \
 	((GRAPHICS_VER(i915) >= 9) &&  GRAPHICS_VER_FULL(i915) < IP_VER(12, 55))
 
-static inline bool run_as_guest(void)
-{
-	return !hypervisor_is_type(X86_HYPER_NATIVE);
-}
-
 #define HAS_D12_PLANE_MINIMIZATION(dev_priv) (IS_ROCKETLAKE(dev_priv) || \
 					      IS_ALDERLAKE_S(dev_priv))
 
-static inline bool intel_vtd_active(struct drm_i915_private *i915)
-{
-	if (device_iommu_mapped(i915->drm.dev))
-		return true;
-
-	/* Running as a guest, we assume the host is enforcing VT'd */
-	return run_as_guest();
-}
-
-void
-i915_print_iommu_status(struct drm_i915_private *i915, struct drm_printer *p);
-
-static inline bool intel_scanout_needs_vtd_wa(struct drm_i915_private *dev_priv)
-{
-	return DISPLAY_VER(dev_priv) >= 6 && intel_vtd_active(dev_priv);
-}
-
-static inline bool
-intel_ggtt_update_needs_vtd_wa(struct drm_i915_private *i915)
-{
-	return IS_BROXTON(i915) && intel_vtd_active(i915);
-}
-
-static inline bool
-intel_vm_no_concurrent_access_wa(struct drm_i915_private *i915)
-{
-	return IS_CHERRYVIEW(i915) || intel_ggtt_update_needs_vtd_wa(i915);
-}
-
 /* i915_gem.c */
 void i915_gem_init_early(struct drm_i915_private *dev_priv);
 void i915_gem_cleanup_early(struct drm_i915_private *dev_priv);
drivers/gpu/drm/i915/i915_gpu_error.c +2 -1
index a8acc6fbb299..a221b19e588c 100644
@@ -48,6 +48,7 @@
 #include "gt/intel_gt.h"
 #include "gt/intel_gt_pm.h"
 #include "gt/intel_gt_regs.h"
+#include "intel_vtd.h"
 
 #include "i915_driver.h"
 #include "i915_drv.h"
@@ -1814,7 +1815,7 @@ static void capture_gen(struct i915_gpu_coredump *error)
 	error->wakelock = atomic_read(&i915->runtime_pm.wakeref_count);
 	error->suspended = i915->runtime_pm.suspended;
 
-	error->iommu = intel_vtd_active(i915);
+	error->iommu = intel_vtd_active(i915->drm.dev);
 	error->reset_count = i915_reset_count(&i915->gpu_error);
 	error->suspend_count = i915->suspend_count;
 
drivers/gpu/drm/i915/intel_device_info.c +3 -1
index 8d458226f478..21423e6eacb3 100644
@@ -30,6 +30,7 @@
 #include "display/intel_cdclk.h"
 #include "display/intel_de.h"
 #include "intel_device_info.h"
+#include "intel_vtd.h"
 #include "i915_drv.h"
 
 #define PLATFORM_NAME(x) [INTEL_##x] = #x
@@ -389,7 +390,8 @@ void intel_device_info_runtime_init(struct drm_i915_private *dev_priv)
 			info->display.has_dsc = 0;
 	}
 
-	if (GRAPHICS_VER(dev_priv) == 6 && intel_vtd_active(dev_priv)) {
+	if (GRAPHICS_VER(dev_priv) == 6 &&
+	    intel_vtd_active(dev_priv->drm.dev)) {
 		drm_info(&dev_priv->drm,
 			 "Disabling ppGTT for VT-d support\n");
 		info->ppgtt_type = INTEL_PPGTT_NONE;
drivers/gpu/drm/i915/intel_pch.c +2 -1
index 4cce044efde2..c232343d5ba7 100644
@@ -5,6 +5,7 @@
 
 #include "i915_drv.h"
 #include "intel_pch.h"
+#include "intel_vtd.h"
 
 /* Map PCH device id to PCH type, or PCH_NONE if unknown. */
 static enum intel_pch
@@ -256,7 +257,7 @@ void intel_detect_pch(struct drm_i915_private *dev_priv)
 		dev_priv->pch_type = PCH_NOP;
 		dev_priv->pch_id = 0;
 	} else if (!pch) {
-		if (run_as_guest() && HAS_DISPLAY(dev_priv)) {
+		if (intel_vtd_run_as_guest() && HAS_DISPLAY(dev_priv)) {
 			intel_virt_detect_pch(dev_priv, &id, &pch_type);
 			dev_priv->pch_type = pch_type;
 			dev_priv->pch_id = id;
drivers/gpu/drm/i915/intel_vtd.h new file +27 -0
new file mode 100644
index 000000000000..1aa5d813f002
@@ -0,0 +1,27 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright © 2022 Intel Corporation
+ */
+
+#ifndef __INTEL_VTD_H__
+#define __INTEL_VTD_H__
+
+#include <linux/device.h>
+#include <linux/types.h>
+#include <asm/hypervisor.h>
+
+static inline bool intel_vtd_run_as_guest(void)
+{
+	return !hypervisor_is_type(X86_HYPER_NATIVE);
+}
+
+static inline bool intel_vtd_active(struct device *dev)
+{
+	if (device_iommu_mapped(dev))
+		return true;
+
+	/* Running as a guest, we assume the host is enforcing VT'd */
+	return intel_vtd_run_as_guest();
+}
+
+#endif /* __INTEL_VTD_H__ */
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
#8 lore raw
In reply to Jani Nikula
Quoted 11 lines · Jani Nikula
Quoted 9 lines · Tvrtko Ursulin

From: Tvrtko Ursulin <[email protected]>

...

Cc Jani Nikula <[email protected]>
Cc Lucas De Marchi <[email protected]>

---
Typed up how I see it - bash away.

Quoted 7 lines

So is intel_vtd_active() so performance critical that it needs to be inline?

We're passing struct drm_i915_private * everywhere we can, and it just feels silly to use struct drm_device * to avoid the include.

Static inlines considered harmful. :p

Same as it is ;), and gee, who was it that he said he was just trying to declutter i915_drv.h.. ;p

Regards,

Tvrtko

Quoted 427 lines

BR,
Jani.

Quoted 421 lines
---
  drivers/gpu/drm/i915/display/intel_bw.c      |  3 +-
  drivers/gpu/drm/i915/display/intel_display.c |  9 ++++-
  drivers/gpu/drm/i915/display/intel_display.h |  2 ++
  drivers/gpu/drm/i915/display/intel_fbc.c     |  3 +-
  drivers/gpu/drm/i915/gem/i915_gem_stolen.c   |  3 +-
  drivers/gpu/drm/i915/gem/i915_gemfs.c        |  3 +-
  drivers/gpu/drm/i915/gt/intel_ggtt.c         |  5 +--
  drivers/gpu/drm/i915/gt/intel_gtt.c          | 12 +++++++
  drivers/gpu/drm/i915/gt/intel_gtt.h          |  2 ++
  drivers/gpu/drm/i915/i915_debugfs.c          |  1 +
  drivers/gpu/drm/i915/i915_driver.c           |  3 +-
  drivers/gpu/drm/i915/i915_driver.h           |  4 +++
  drivers/gpu/drm/i915/i915_drv.h              | 37 --------------------
  drivers/gpu/drm/i915/i915_gpu_error.c        |  3 +-
  drivers/gpu/drm/i915/intel_device_info.c     |  4 ++-
  drivers/gpu/drm/i915/intel_pch.c             |  3 +-
  drivers/gpu/drm/i915/intel_vtd.h             | 27 ++++++++++++++
  17 files changed, 76 insertions(+), 48 deletions(-)

create mode 100644 drivers/gpu/drm/i915/intel_vtd.h

drivers/gpu/drm/i915/display/intel_bw.c +2 -1
index ac11ff19e47d..6c9cb4f97218 100644
@@ -13,6 +13,7 @@
  #include "intel_mchbar_regs.h"
  #include "intel_pcode.h"
  #include "intel_pm.h"
+#include "intel_vtd.h"
 
  /* Parameters for Qclk Geyserville (QGV) */
  struct intel_qgv_point {
@@ -649,7 +650,7 @@ static unsigned int intel_bw_data_rate(struct drm_i915_private *dev_priv,
  	for_each_pipe(dev_priv, pipe)
  		data_rate += bw_state->data_rate[pipe];
 
-	if (DISPLAY_VER(dev_priv) >= 13 && intel_vtd_active(dev_priv))
+	if (DISPLAY_VER(dev_priv) >= 13 && intel_vtd_active(dev_priv->drm.dev))
  		data_rate = DIV_ROUND_UP(data_rate * 105, 100);
 
  	return data_rate;
drivers/gpu/drm/i915/display/intel_display.c +8 -1
index dc6e21e4ef0b..e80f3ca3ee4e 100644
@@ -110,6 +110,7 @@
  #include "intel_quirks.h"
  #include "intel_sprite.h"
  #include "intel_tc.h"
+#include "intel_vtd.h"
  #include "intel_vga.h"
  #include "i9xx_plane.h"
  #include "skl_scaler.h"
@@ -1197,7 +1198,7 @@ static bool needs_async_flip_vtd_wa(const struct intel_crtc_state *crtc_state)
  {
  	struct drm_i915_private *i915 = to_i915(crtc_state->uapi.crtc->dev);
 
-	return crtc_state->uapi.async_flip && intel_vtd_active(i915) &&
+	return crtc_state->uapi.async_flip && intel_vtd_active(i915->drm.dev) &&
  		(DISPLAY_VER(i915) == 9 || IS_BROADWELL(i915) || IS_HASWELL(i915));
  }
 
@@ -10699,3 +10700,9 @@ void intel_display_driver_unregister(struct drm_i915_private *i915)
  	acpi_video_unregister();
  	intel_opregion_unregister(i915);
  }
+
+bool intel_scanout_needs_vtd_wa(struct drm_i915_private *dev_priv)
+{
+	return DISPLAY_VER(dev_priv) >= 6 &&
+	       intel_vtd_active(dev_priv->drm.dev);
+}
drivers/gpu/drm/i915/display/intel_display.h +2 -0
index 8513703086b7..d69587c76e71 100644
@@ -694,4 +694,6 @@ void assert_transcoder(struct drm_i915_private *dev_priv,
  #define I915_STATE_WARN_ON(x)						\
  	I915_STATE_WARN((x), "%s", "WARN_ON(" __stringify(x) ")")
 
+bool intel_scanout_needs_vtd_wa(struct drm_i915_private *dev_priv);
+
  #endif
drivers/gpu/drm/i915/display/intel_fbc.c +2 -1
index 142280b6ce6d..00a3e30587a5 100644
@@ -50,6 +50,7 @@
  #include "intel_display_types.h"
  #include "intel_fbc.h"
  #include "intel_frontbuffer.h"
+#include "intel_vtd.h"
 
  #define for_each_fbc_id(__dev_priv, __fbc_id) \
  	for ((__fbc_id) = INTEL_FBC_A; (__fbc_id) < I915_MAX_FBCS; (__fbc_id)++) \
@@ -1643,7 +1644,7 @@ static int intel_sanitize_fbc_option(struct drm_i915_private *i915)
  static bool need_fbc_vtd_wa(struct drm_i915_private *i915)
  {
  	/* WaFbcTurnOffFbcWhenHyperVisorIsUsed:skl,bxt */
-	if (intel_vtd_active(i915) &&
+	if (intel_vtd_active(i915->drm.dev) &&
  	    (IS_SKYLAKE(i915) || IS_BROXTON(i915))) {
  		drm_info(&i915->drm,
  			 "Disabling framebuffer compression (FBC) to prevent screen flicker with VT-d enabled\n");
drivers/gpu/drm/i915/gem/i915_gem_stolen.c +2 -1
index 143f61aaa867..9b986b1b0b60 100644
@@ -19,6 +19,7 @@
  #include "i915_reg.h"
  #include "i915_vgpu.h"
  #include "intel_mchbar_regs.h"
+#include "intel_vtd.h"
 
  /*
   * The BIOS typically reserves some of the system's memory for the exclusive
@@ -403,7 +404,7 @@ static int i915_gem_init_stolen(struct intel_memory_region *mem)
  		return 0;
  	}
 
-	if (intel_vtd_active(i915) && GRAPHICS_VER(i915) < 8) {
+	if (intel_vtd_active(i915->drm.dev) && GRAPHICS_VER(i915) < 8) {
  		drm_notice(&i915->drm,
  			   "%s, disabling use of stolen memory\n",
  			   "DMAR active");
drivers/gpu/drm/i915/gem/i915_gemfs.c +2 -1
index 7271fbf813fa..271826642bd4 100644
@@ -9,6 +9,7 @@
 
  #include "i915_drv.h"
  #include "i915_gemfs.h"
+#include "intel_vtd.h"
 
  int i915_gemfs_init(struct drm_i915_private *i915)
  {
@@ -32,7 +33,7 @@ int i915_gemfs_init(struct drm_i915_private *i915)
  	 */
 
  	opts = NULL;
-	if (intel_vtd_active(i915)) {
+	if (intel_vtd_active(i915->drm.dev)) {
  		if (IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE)) {
  			opts = huge_opt;
  			drm_info(&i915->drm,
drivers/gpu/drm/i915/gt/intel_ggtt.c +3 -2
index 04191fe2ee34..386181cec300 100644
@@ -21,6 +21,7 @@
  #include "i915_vgpu.h"
 
  #include "intel_gtt.h"
+#include "intel_vtd.h"
  #include "gen8_ppgtt.h"
 
  static void i915_ggtt_color_adjust(const struct drm_mm_node *node,
@@ -104,7 +105,7 @@ static bool needs_idle_maps(struct drm_i915_private *i915)
  	 * Query intel_iommu to see if we need the workaround. Presumably that
  	 * was loaded first.
  	 */
-	if (!intel_vtd_active(i915))
+	if (!intel_vtd_active(i915->drm.dev))
  		return false;
 
  	if (GRAPHICS_VER(i915) == 5 && IS_MOBILE(i915))
@@ -1258,7 +1259,7 @@ int i915_ggtt_probe_hw(struct drm_i915_private *i915)
  	if (ret)
  		return ret;
 
-	if (intel_vtd_active(i915))
+	if (intel_vtd_active(i915->drm.dev))
  		drm_info(&i915->drm, "VT-d active for gfx access\n");
 
  	return 0;
drivers/gpu/drm/i915/gt/intel_gtt.c +12 -0
index aed6de2d5a79..ee17e987cddc 100644
@@ -16,6 +16,18 @@
  #include "intel_gt.h"
  #include "intel_gt_regs.h"
  #include "intel_gtt.h"
+#include "intel_vtd.h"
+
+
+static bool intel_ggtt_update_needs_vtd_wa(struct drm_i915_private *i915)
+{
+	return IS_BROXTON(i915) && intel_vtd_active(i915->drm.dev);
+}
+
+bool intel_vm_no_concurrent_access_wa(struct drm_i915_private *i915)
+{
+	return IS_CHERRYVIEW(i915) || intel_ggtt_update_needs_vtd_wa(i915);
+}
 
  struct drm_i915_gem_object *alloc_pt_lmem(struct i915_address_space *vm, int sz)
  {
drivers/gpu/drm/i915/gt/intel_gtt.h +2 -0
index 4529b5e9f6e6..5922e2cf4d8d 100644
@@ -382,6 +382,8 @@ struct i915_ppgtt {
  #define i915_is_dpt(vm) ((vm)->is_dpt)
  #define i915_is_ggtt_or_dpt(vm) (i915_is_ggtt(vm) || i915_is_dpt(vm))
 
+bool intel_vm_no_concurrent_access_wa(struct drm_i915_private *i915);
+
  int __must_check
  i915_vm_lock_objects(struct i915_address_space *vm, struct i915_gem_ww_ctx *ww);
 
drivers/gpu/drm/i915/i915_debugfs.c +1 -0
index 2cbd1f58e754..cda71457d630 100644
@@ -48,6 +48,7 @@
 
  #include "i915_debugfs.h"
  #include "i915_debugfs_params.h"
+#include "i915_driver.h"
  #include "i915_irq.h"
  #include "i915_scheduler.h"
  #include "intel_mchbar_regs.h"
drivers/gpu/drm/i915/i915_driver.c +2 -1
index 64e6f76861f9..f03a63b57f05 100644
@@ -96,6 +96,7 @@
  #include "intel_pcode.h"
  #include "intel_pm.h"
  #include "intel_region_ttm.h"
+#include "intel_vtd.h"
  #include "vlv_suspend.h"
 
  static const struct drm_driver i915_drm_driver;
@@ -744,7 +745,7 @@ void
  i915_print_iommu_status(struct drm_i915_private *i915, struct drm_printer *p)
  {
  	drm_printf(p, "iommu: %s\n",
-		   str_enabled_disabled(intel_vtd_active(i915)));
+		   str_enabled_disabled(intel_vtd_active(i915->drm.dev)));
  }
 
  static void i915_welcome_messages(struct drm_i915_private *dev_priv)
drivers/gpu/drm/i915/i915_driver.h +4 -0
index 9d11de65daaf..44ec543d92cb 100644
@@ -11,6 +11,7 @@
  struct pci_dev;
  struct pci_device_id;
  struct drm_i915_private;
+struct drm_printer;
 
  #define DRIVER_NAME		"i915"
  #define DRIVER_DESC		"Intel Graphics"
@@ -26,4 +27,7 @@ void i915_driver_shutdown(struct drm_i915_private *i915);
  int i915_driver_resume_switcheroo(struct drm_i915_private *i915);
  int i915_driver_suspend_switcheroo(struct drm_i915_private *i915, pm_message_t state);
 
+void
+i915_print_iommu_status(struct drm_i915_private *i915, struct drm_printer *p);
+
  #endif /* __I915_DRIVER_H__ */
drivers/gpu/drm/i915/i915_drv.h +0 -37
index 217c09422711..799f386a7ef2 100644
@@ -32,9 +32,6 @@
 
  #include <uapi/drm/i915_drm.h>
 
-#include <asm/hypervisor.h>
-
-#include <linux/intel-iommu.h>
  #include <linux/pm_qos.h>
 
  #include <drm/drm_connector.h>
@@ -1387,43 +1384,9 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,
  #define HAS_PERCTX_PREEMPT_CTRL(i915) \
  	((GRAPHICS_VER(i915) >= 9) &&  GRAPHICS_VER_FULL(i915) < IP_VER(12, 55))
 
-static inline bool run_as_guest(void)
-{
-	return !hypervisor_is_type(X86_HYPER_NATIVE);
-}
-
  #define HAS_D12_PLANE_MINIMIZATION(dev_priv) (IS_ROCKETLAKE(dev_priv) || \
  					      IS_ALDERLAKE_S(dev_priv))
 
-static inline bool intel_vtd_active(struct drm_i915_private *i915)
-{
-	if (device_iommu_mapped(i915->drm.dev))
-		return true;
-
-	/* Running as a guest, we assume the host is enforcing VT'd */
-	return run_as_guest();
-}
-
-void
-i915_print_iommu_status(struct drm_i915_private *i915, struct drm_printer *p);
-
-static inline bool intel_scanout_needs_vtd_wa(struct drm_i915_private *dev_priv)
-{
-	return DISPLAY_VER(dev_priv) >= 6 && intel_vtd_active(dev_priv);
-}
-
-static inline bool
-intel_ggtt_update_needs_vtd_wa(struct drm_i915_private *i915)
-{
-	return IS_BROXTON(i915) && intel_vtd_active(i915);
-}
-
-static inline bool
-intel_vm_no_concurrent_access_wa(struct drm_i915_private *i915)
-{
-	return IS_CHERRYVIEW(i915) || intel_ggtt_update_needs_vtd_wa(i915);
-}
-
  /* i915_gem.c */
  void i915_gem_init_early(struct drm_i915_private *dev_priv);
  void i915_gem_cleanup_early(struct drm_i915_private *dev_priv);
drivers/gpu/drm/i915/i915_gpu_error.c +2 -1
index a8acc6fbb299..a221b19e588c 100644
@@ -48,6 +48,7 @@
  #include "gt/intel_gt.h"
  #include "gt/intel_gt_pm.h"
  #include "gt/intel_gt_regs.h"
+#include "intel_vtd.h"
 
  #include "i915_driver.h"
  #include "i915_drv.h"
@@ -1814,7 +1815,7 @@ static void capture_gen(struct i915_gpu_coredump *error)
  	error->wakelock = atomic_read(&i915->runtime_pm.wakeref_count);
  	error->suspended = i915->runtime_pm.suspended;
 
-	error->iommu = intel_vtd_active(i915);
+	error->iommu = intel_vtd_active(i915->drm.dev);
  	error->reset_count = i915_reset_count(&i915->gpu_error);
  	error->suspend_count = i915->suspend_count;
 
drivers/gpu/drm/i915/intel_device_info.c +3 -1
index 8d458226f478..21423e6eacb3 100644
@@ -30,6 +30,7 @@
  #include "display/intel_cdclk.h"
  #include "display/intel_de.h"
  #include "intel_device_info.h"
+#include "intel_vtd.h"
  #include "i915_drv.h"
 
  #define PLATFORM_NAME(x) [INTEL_##x] = #x
@@ -389,7 +390,8 @@ void intel_device_info_runtime_init(struct drm_i915_private *dev_priv)
  			info->display.has_dsc = 0;
  	}
 
-	if (GRAPHICS_VER(dev_priv) == 6 && intel_vtd_active(dev_priv)) {
+	if (GRAPHICS_VER(dev_priv) == 6 &&
+	    intel_vtd_active(dev_priv->drm.dev)) {
  		drm_info(&dev_priv->drm,
  			 "Disabling ppGTT for VT-d support\n");
  		info->ppgtt_type = INTEL_PPGTT_NONE;
drivers/gpu/drm/i915/intel_pch.c +2 -1
index 4cce044efde2..c232343d5ba7 100644
@@ -5,6 +5,7 @@
 
  #include "i915_drv.h"
  #include "intel_pch.h"
+#include "intel_vtd.h"
 
  /* Map PCH device id to PCH type, or PCH_NONE if unknown. */
  static enum intel_pch
@@ -256,7 +257,7 @@ void intel_detect_pch(struct drm_i915_private *dev_priv)
  		dev_priv->pch_type = PCH_NOP;
  		dev_priv->pch_id = 0;
  	} else if (!pch) {
-		if (run_as_guest() && HAS_DISPLAY(dev_priv)) {
+		if (intel_vtd_run_as_guest() && HAS_DISPLAY(dev_priv)) {
  			intel_virt_detect_pch(dev_priv, &id, &pch_type);
  			dev_priv->pch_type = pch_type;
  			dev_priv->pch_id = id;
drivers/gpu/drm/i915/intel_vtd.h new file +27 -0
new file mode 100644
index 000000000000..1aa5d813f002
@@ -0,0 +1,27 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright © 2022 Intel Corporation
+ */
+
+#ifndef __INTEL_VTD_H__
+#define __INTEL_VTD_H__
+
+#include <linux/device.h>
+#include <linux/types.h>
+#include <asm/hypervisor.h>
+
+static inline bool intel_vtd_run_as_guest(void)
+{
+	return !hypervisor_is_type(X86_HYPER_NATIVE);
+}
+
+static inline bool intel_vtd_active(struct device *dev)
+{
+	if (device_iommu_mapped(dev))
+		return true;
+
+	/* Running as a guest, we assume the host is enforcing VT'd */
+	return intel_vtd_run_as_guest();
+}
+
+#endif /* __INTEL_VTD_H__ */
#9 lore raw
Quoted 15 lines · Tvrtko Ursulin
Quoted 14 lines · Jani Nikula
Quoted 9 lines · Tvrtko Ursulin

From: Tvrtko Ursulin <[email protected]>

...

Cc Jani Nikula <[email protected]>
Cc Lucas De Marchi <[email protected]>

---
Typed up how I see it - bash away.

So is intel_vtd_active() so performance critical that it needs to be inline?

Quoted 7 lines
Quoted 4 lines

We're passing struct drm_i915_private * everywhere we can, and it just feels silly to use struct drm_device * to avoid the include.

Static inlines considered harmful. :p

Same as it is ;), and gee, who was it that he said he was just trying to declutter i915_drv.h.. ;p

Not at the cost of clarity elsewhere!

Quoted 432 lines

Regards,

Tvrtko

Quoted 427 lines

BR,
Jani.

Quoted 421 lines
---
  drivers/gpu/drm/i915/display/intel_bw.c      |  3 +-
  drivers/gpu/drm/i915/display/intel_display.c |  9 ++++-
  drivers/gpu/drm/i915/display/intel_display.h |  2 ++
  drivers/gpu/drm/i915/display/intel_fbc.c     |  3 +-
  drivers/gpu/drm/i915/gem/i915_gem_stolen.c   |  3 +-
  drivers/gpu/drm/i915/gem/i915_gemfs.c        |  3 +-
  drivers/gpu/drm/i915/gt/intel_ggtt.c         |  5 +--
  drivers/gpu/drm/i915/gt/intel_gtt.c          | 12 +++++++
  drivers/gpu/drm/i915/gt/intel_gtt.h          |  2 ++
  drivers/gpu/drm/i915/i915_debugfs.c          |  1 +
  drivers/gpu/drm/i915/i915_driver.c           |  3 +-
  drivers/gpu/drm/i915/i915_driver.h           |  4 +++
  drivers/gpu/drm/i915/i915_drv.h              | 37 --------------------
  drivers/gpu/drm/i915/i915_gpu_error.c        |  3 +-
  drivers/gpu/drm/i915/intel_device_info.c     |  4 ++-
  drivers/gpu/drm/i915/intel_pch.c             |  3 +-
  drivers/gpu/drm/i915/intel_vtd.h             | 27 ++++++++++++++
  17 files changed, 76 insertions(+), 48 deletions(-)

create mode 100644 drivers/gpu/drm/i915/intel_vtd.h

drivers/gpu/drm/i915/display/intel_bw.c +2 -1
index ac11ff19e47d..6c9cb4f97218 100644
@@ -13,6 +13,7 @@
  #include "intel_mchbar_regs.h"
  #include "intel_pcode.h"
  #include "intel_pm.h"
+#include "intel_vtd.h"
 
  /* Parameters for Qclk Geyserville (QGV) */
  struct intel_qgv_point {
@@ -649,7 +650,7 @@ static unsigned int intel_bw_data_rate(struct drm_i915_private *dev_priv,
  	for_each_pipe(dev_priv, pipe)
  		data_rate += bw_state->data_rate[pipe];
 
-	if (DISPLAY_VER(dev_priv) >= 13 && intel_vtd_active(dev_priv))
+	if (DISPLAY_VER(dev_priv) >= 13 && intel_vtd_active(dev_priv->drm.dev))
  		data_rate = DIV_ROUND_UP(data_rate * 105, 100);
 
  	return data_rate;
drivers/gpu/drm/i915/display/intel_display.c +8 -1
index dc6e21e4ef0b..e80f3ca3ee4e 100644
@@ -110,6 +110,7 @@
  #include "intel_quirks.h"
  #include "intel_sprite.h"
  #include "intel_tc.h"
+#include "intel_vtd.h"
  #include "intel_vga.h"
  #include "i9xx_plane.h"
  #include "skl_scaler.h"
@@ -1197,7 +1198,7 @@ static bool needs_async_flip_vtd_wa(const struct intel_crtc_state *crtc_state)
  {
  	struct drm_i915_private *i915 = to_i915(crtc_state->uapi.crtc->dev);
 
-	return crtc_state->uapi.async_flip && intel_vtd_active(i915) &&
+	return crtc_state->uapi.async_flip && intel_vtd_active(i915->drm.dev) &&
  		(DISPLAY_VER(i915) == 9 || IS_BROADWELL(i915) || IS_HASWELL(i915));
  }
 
@@ -10699,3 +10700,9 @@ void intel_display_driver_unregister(struct drm_i915_private *i915)
  	acpi_video_unregister();
  	intel_opregion_unregister(i915);
  }
+
+bool intel_scanout_needs_vtd_wa(struct drm_i915_private *dev_priv)
+{
+	return DISPLAY_VER(dev_priv) >= 6 &&
+	       intel_vtd_active(dev_priv->drm.dev);
+}
drivers/gpu/drm/i915/display/intel_display.h +2 -0
index 8513703086b7..d69587c76e71 100644
@@ -694,4 +694,6 @@ void assert_transcoder(struct drm_i915_private *dev_priv,
  #define I915_STATE_WARN_ON(x)						\
  	I915_STATE_WARN((x), "%s", "WARN_ON(" __stringify(x) ")")
 
+bool intel_scanout_needs_vtd_wa(struct drm_i915_private *dev_priv);
+
  #endif
drivers/gpu/drm/i915/display/intel_fbc.c +2 -1
index 142280b6ce6d..00a3e30587a5 100644
@@ -50,6 +50,7 @@
  #include "intel_display_types.h"
  #include "intel_fbc.h"
  #include "intel_frontbuffer.h"
+#include "intel_vtd.h"
 
  #define for_each_fbc_id(__dev_priv, __fbc_id) \
  	for ((__fbc_id) = INTEL_FBC_A; (__fbc_id) < I915_MAX_FBCS; (__fbc_id)++) \
@@ -1643,7 +1644,7 @@ static int intel_sanitize_fbc_option(struct drm_i915_private *i915)
  static bool need_fbc_vtd_wa(struct drm_i915_private *i915)
  {
  	/* WaFbcTurnOffFbcWhenHyperVisorIsUsed:skl,bxt */
-	if (intel_vtd_active(i915) &&
+	if (intel_vtd_active(i915->drm.dev) &&
  	    (IS_SKYLAKE(i915) || IS_BROXTON(i915))) {
  		drm_info(&i915->drm,
  			 "Disabling framebuffer compression (FBC) to prevent screen flicker with VT-d enabled\n");
drivers/gpu/drm/i915/gem/i915_gem_stolen.c +2 -1
index 143f61aaa867..9b986b1b0b60 100644
@@ -19,6 +19,7 @@
  #include "i915_reg.h"
  #include "i915_vgpu.h"
  #include "intel_mchbar_regs.h"
+#include "intel_vtd.h"
 
  /*
   * The BIOS typically reserves some of the system's memory for the exclusive
@@ -403,7 +404,7 @@ static int i915_gem_init_stolen(struct intel_memory_region *mem)
  		return 0;
  	}
 
-	if (intel_vtd_active(i915) && GRAPHICS_VER(i915) < 8) {
+	if (intel_vtd_active(i915->drm.dev) && GRAPHICS_VER(i915) < 8) {
  		drm_notice(&i915->drm,
  			   "%s, disabling use of stolen memory\n",
  			   "DMAR active");
drivers/gpu/drm/i915/gem/i915_gemfs.c +2 -1
index 7271fbf813fa..271826642bd4 100644
@@ -9,6 +9,7 @@
 
  #include "i915_drv.h"
  #include "i915_gemfs.h"
+#include "intel_vtd.h"
 
  int i915_gemfs_init(struct drm_i915_private *i915)
  {
@@ -32,7 +33,7 @@ int i915_gemfs_init(struct drm_i915_private *i915)
  	 */
 
  	opts = NULL;
-	if (intel_vtd_active(i915)) {
+	if (intel_vtd_active(i915->drm.dev)) {
  		if (IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE)) {
  			opts = huge_opt;
  			drm_info(&i915->drm,
drivers/gpu/drm/i915/gt/intel_ggtt.c +3 -2
index 04191fe2ee34..386181cec300 100644
@@ -21,6 +21,7 @@
  #include "i915_vgpu.h"
 
  #include "intel_gtt.h"
+#include "intel_vtd.h"
  #include "gen8_ppgtt.h"
 
  static void i915_ggtt_color_adjust(const struct drm_mm_node *node,
@@ -104,7 +105,7 @@ static bool needs_idle_maps(struct drm_i915_private *i915)
  	 * Query intel_iommu to see if we need the workaround. Presumably that
  	 * was loaded first.
  	 */
-	if (!intel_vtd_active(i915))
+	if (!intel_vtd_active(i915->drm.dev))
  		return false;
 
  	if (GRAPHICS_VER(i915) == 5 && IS_MOBILE(i915))
@@ -1258,7 +1259,7 @@ int i915_ggtt_probe_hw(struct drm_i915_private *i915)
  	if (ret)
  		return ret;
 
-	if (intel_vtd_active(i915))
+	if (intel_vtd_active(i915->drm.dev))
  		drm_info(&i915->drm, "VT-d active for gfx access\n");
 
  	return 0;
drivers/gpu/drm/i915/gt/intel_gtt.c +12 -0
index aed6de2d5a79..ee17e987cddc 100644
@@ -16,6 +16,18 @@
  #include "intel_gt.h"
  #include "intel_gt_regs.h"
  #include "intel_gtt.h"
+#include "intel_vtd.h"
+
+
+static bool intel_ggtt_update_needs_vtd_wa(struct drm_i915_private *i915)
+{
+	return IS_BROXTON(i915) && intel_vtd_active(i915->drm.dev);
+}
+
+bool intel_vm_no_concurrent_access_wa(struct drm_i915_private *i915)
+{
+	return IS_CHERRYVIEW(i915) || intel_ggtt_update_needs_vtd_wa(i915);
+}
 
  struct drm_i915_gem_object *alloc_pt_lmem(struct i915_address_space *vm, int sz)
  {
drivers/gpu/drm/i915/gt/intel_gtt.h +2 -0
index 4529b5e9f6e6..5922e2cf4d8d 100644
@@ -382,6 +382,8 @@ struct i915_ppgtt {
  #define i915_is_dpt(vm) ((vm)->is_dpt)
  #define i915_is_ggtt_or_dpt(vm) (i915_is_ggtt(vm) || i915_is_dpt(vm))
 
+bool intel_vm_no_concurrent_access_wa(struct drm_i915_private *i915);
+
  int __must_check
  i915_vm_lock_objects(struct i915_address_space *vm, struct i915_gem_ww_ctx *ww);
 
drivers/gpu/drm/i915/i915_debugfs.c +1 -0
index 2cbd1f58e754..cda71457d630 100644
@@ -48,6 +48,7 @@
 
  #include "i915_debugfs.h"
  #include "i915_debugfs_params.h"
+#include "i915_driver.h"
  #include "i915_irq.h"
  #include "i915_scheduler.h"
  #include "intel_mchbar_regs.h"
drivers/gpu/drm/i915/i915_driver.c +2 -1
index 64e6f76861f9..f03a63b57f05 100644
@@ -96,6 +96,7 @@
  #include "intel_pcode.h"
  #include "intel_pm.h"
  #include "intel_region_ttm.h"
+#include "intel_vtd.h"
  #include "vlv_suspend.h"
 
  static const struct drm_driver i915_drm_driver;
@@ -744,7 +745,7 @@ void
  i915_print_iommu_status(struct drm_i915_private *i915, struct drm_printer *p)
  {
  	drm_printf(p, "iommu: %s\n",
-		   str_enabled_disabled(intel_vtd_active(i915)));
+		   str_enabled_disabled(intel_vtd_active(i915->drm.dev)));
  }
 
  static void i915_welcome_messages(struct drm_i915_private *dev_priv)
drivers/gpu/drm/i915/i915_driver.h +4 -0
index 9d11de65daaf..44ec543d92cb 100644
@@ -11,6 +11,7 @@
  struct pci_dev;
  struct pci_device_id;
  struct drm_i915_private;
+struct drm_printer;
 
  #define DRIVER_NAME		"i915"
  #define DRIVER_DESC		"Intel Graphics"
@@ -26,4 +27,7 @@ void i915_driver_shutdown(struct drm_i915_private *i915);
  int i915_driver_resume_switcheroo(struct drm_i915_private *i915);
  int i915_driver_suspend_switcheroo(struct drm_i915_private *i915, pm_message_t state);
 
+void
+i915_print_iommu_status(struct drm_i915_private *i915, struct drm_printer *p);
+
  #endif /* __I915_DRIVER_H__ */
drivers/gpu/drm/i915/i915_drv.h +0 -37
index 217c09422711..799f386a7ef2 100644
@@ -32,9 +32,6 @@
 
  #include <uapi/drm/i915_drm.h>
 
-#include <asm/hypervisor.h>
-
-#include <linux/intel-iommu.h>
  #include <linux/pm_qos.h>
 
  #include <drm/drm_connector.h>
@@ -1387,43 +1384,9 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,
  #define HAS_PERCTX_PREEMPT_CTRL(i915) \
  	((GRAPHICS_VER(i915) >= 9) &&  GRAPHICS_VER_FULL(i915) < IP_VER(12, 55))
 
-static inline bool run_as_guest(void)
-{
-	return !hypervisor_is_type(X86_HYPER_NATIVE);
-}
-
  #define HAS_D12_PLANE_MINIMIZATION(dev_priv) (IS_ROCKETLAKE(dev_priv) || \
  					      IS_ALDERLAKE_S(dev_priv))
 
-static inline bool intel_vtd_active(struct drm_i915_private *i915)
-{
-	if (device_iommu_mapped(i915->drm.dev))
-		return true;
-
-	/* Running as a guest, we assume the host is enforcing VT'd */
-	return run_as_guest();
-}
-
-void
-i915_print_iommu_status(struct drm_i915_private *i915, struct drm_printer *p);
-
-static inline bool intel_scanout_needs_vtd_wa(struct drm_i915_private *dev_priv)
-{
-	return DISPLAY_VER(dev_priv) >= 6 && intel_vtd_active(dev_priv);
-}
-
-static inline bool
-intel_ggtt_update_needs_vtd_wa(struct drm_i915_private *i915)
-{
-	return IS_BROXTON(i915) && intel_vtd_active(i915);
-}
-
-static inline bool
-intel_vm_no_concurrent_access_wa(struct drm_i915_private *i915)
-{
-	return IS_CHERRYVIEW(i915) || intel_ggtt_update_needs_vtd_wa(i915);
-}
-
  /* i915_gem.c */
  void i915_gem_init_early(struct drm_i915_private *dev_priv);
  void i915_gem_cleanup_early(struct drm_i915_private *dev_priv);
drivers/gpu/drm/i915/i915_gpu_error.c +2 -1
index a8acc6fbb299..a221b19e588c 100644
@@ -48,6 +48,7 @@
  #include "gt/intel_gt.h"
  #include "gt/intel_gt_pm.h"
  #include "gt/intel_gt_regs.h"
+#include "intel_vtd.h"
 
  #include "i915_driver.h"
  #include "i915_drv.h"
@@ -1814,7 +1815,7 @@ static void capture_gen(struct i915_gpu_coredump *error)
  	error->wakelock = atomic_read(&i915->runtime_pm.wakeref_count);
  	error->suspended = i915->runtime_pm.suspended;
 
-	error->iommu = intel_vtd_active(i915);
+	error->iommu = intel_vtd_active(i915->drm.dev);
  	error->reset_count = i915_reset_count(&i915->gpu_error);
  	error->suspend_count = i915->suspend_count;
 
drivers/gpu/drm/i915/intel_device_info.c +3 -1
index 8d458226f478..21423e6eacb3 100644
@@ -30,6 +30,7 @@
  #include "display/intel_cdclk.h"
  #include "display/intel_de.h"
  #include "intel_device_info.h"
+#include "intel_vtd.h"
  #include "i915_drv.h"
 
  #define PLATFORM_NAME(x) [INTEL_##x] = #x
@@ -389,7 +390,8 @@ void intel_device_info_runtime_init(struct drm_i915_private *dev_priv)
  			info->display.has_dsc = 0;
  	}
 
-	if (GRAPHICS_VER(dev_priv) == 6 && intel_vtd_active(dev_priv)) {
+	if (GRAPHICS_VER(dev_priv) == 6 &&
+	    intel_vtd_active(dev_priv->drm.dev)) {
  		drm_info(&dev_priv->drm,
  			 "Disabling ppGTT for VT-d support\n");
  		info->ppgtt_type = INTEL_PPGTT_NONE;
drivers/gpu/drm/i915/intel_pch.c +2 -1
index 4cce044efde2..c232343d5ba7 100644
@@ -5,6 +5,7 @@
 
  #include "i915_drv.h"
  #include "intel_pch.h"
+#include "intel_vtd.h"
 
  /* Map PCH device id to PCH type, or PCH_NONE if unknown. */
  static enum intel_pch
@@ -256,7 +257,7 @@ void intel_detect_pch(struct drm_i915_private *dev_priv)
  		dev_priv->pch_type = PCH_NOP;
  		dev_priv->pch_id = 0;
  	} else if (!pch) {
-		if (run_as_guest() && HAS_DISPLAY(dev_priv)) {
+		if (intel_vtd_run_as_guest() && HAS_DISPLAY(dev_priv)) {
  			intel_virt_detect_pch(dev_priv, &id, &pch_type);
  			dev_priv->pch_type = pch_type;
  			dev_priv->pch_id = id;
drivers/gpu/drm/i915/intel_vtd.h new file +27 -0
new file mode 100644
index 000000000000..1aa5d813f002
@@ -0,0 +1,27 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright © 2022 Intel Corporation
+ */
+
+#ifndef __INTEL_VTD_H__
+#define __INTEL_VTD_H__
+
+#include <linux/device.h>
+#include <linux/types.h>
+#include <asm/hypervisor.h>
+
+static inline bool intel_vtd_run_as_guest(void)
+{
+	return !hypervisor_is_type(X86_HYPER_NATIVE);
+}
+
+static inline bool intel_vtd_active(struct device *dev)
+{
+	if (device_iommu_mapped(dev))
+		return true;
+
+	/* Running as a guest, we assume the host is enforcing VT'd */
+	return intel_vtd_run_as_guest();
+}
+
+#endif /* __INTEL_VTD_H__ */
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
#10 lore raw
Quoted 19 lines · Jani Nikula
Quoted 18 lines · Tvrtko Ursulin
Quoted 17 lines · Jani Nikula
Quoted 9 lines · Tvrtko Ursulin

From: Tvrtko Ursulin <[email protected]>

...

Cc Jani Nikula <[email protected]>
Cc Lucas De Marchi <[email protected]>

---
Typed up how I see it - bash away.

So is intel_vtd_active() so performance critical that it needs to be inline?

We're passing struct drm_i915_private * everywhere we can, and it just feels silly to use struct drm_device * to avoid the include.

Quoted 6 lines
Quoted 4 lines
Quoted 1 line

Static inlines considered harmful. :p

Same as it is ;), and gee, who was it that he said he was just trying to declutter i915_drv.h.. ;p

Not at the cost of clarity elsewhere!

To be clear now you oppose intel_vtd_active taking struct device? I thought you expressed general agreement when I presented the idea in the previous thread.

I don't mind hugely to go either way, but I also don't see how taking struct device makes anything unclear. (I only think intel_vtd_run_as_guest is really wrong in this story but that's old news.)

And if I make it take i915 then I would want to name it i915_vtd_active as well. But then you wouldn't like that.

Should we just stuff all this into i915_utils for now, as I think Lucas suggested? Static inline or not, I don't care.

Regards,

Tvrtko

Acked-by
#11 lore raw
Quoted 35 lines · Tvrtko Ursulin
Quoted 19 lines · Jani Nikula
Quoted 18 lines · Tvrtko Ursulin
Quoted 17 lines · Jani Nikula
Quoted 9 lines · Tvrtko Ursulin

From: Tvrtko Ursulin <[email protected]>

...

Cc Jani Nikula <[email protected]>
Cc Lucas De Marchi <[email protected]>

---
Typed up how I see it - bash away.

So is intel_vtd_active() so performance critical that it needs to be inline?

We're passing struct drm_i915_private * everywhere we can, and it just feels silly to use struct drm_device * to avoid the include.

Quoted 6 lines
Quoted 4 lines
Quoted 1 line

Static inlines considered harmful. :p

Same as it is ;), and gee, who was it that he said he was just trying to declutter i915_drv.h.. ;p

Not at the cost of clarity elsewhere!

To be clear now you oppose intel_vtd_active taking struct device? I thought you expressed general agreement when I presented the idea in the previous thread.

I don't mind hugely to go either way, but I also don't see how taking struct device makes anything unclear. (I only think intel_vtd_run_as_guest is really wrong in this story but that's old news.)

Quoted 5 lines

And if I make it take i915 then I would want to name it i915_vtd_active as well. But then you wouldn't like that.

Should we just stuff all this into i915_utils for now, as I think Lucas suggested? Static inline or not, I don't care.

Just general grumpiness.

Quoted 4 lines

Regards,

Tvrtko

Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
#12 lore raw
Quoted 39 lines · Jani Nikula
Quoted 38 lines · Tvrtko Ursulin
Quoted 19 lines · Jani Nikula
Quoted 18 lines · Tvrtko Ursulin
Quoted 17 lines · Jani Nikula
Quoted 9 lines · Tvrtko Ursulin

From: Tvrtko Ursulin <[email protected]>

...

Cc Jani Nikula <[email protected]>
Cc Lucas De Marchi <[email protected]>

---
Typed up how I see it - bash away.

So is intel_vtd_active() so performance critical that it needs to be inline?

We're passing struct drm_i915_private * everywhere we can, and it just feels silly to use struct drm_device * to avoid the include.

Quoted 6 lines
Quoted 4 lines
Quoted 1 line

Static inlines considered harmful. :p

Same as it is ;), and gee, who was it that he said he was just trying to declutter i915_drv.h.. ;p

Not at the cost of clarity elsewhere!

To be clear now you oppose intel_vtd_active taking struct device? I thought you expressed general agreement when I presented the idea in the previous thread.

I don't mind hugely to go either way, but I also don't see how taking struct device makes anything unclear. (I only think intel_vtd_run_as_guest is really wrong in this story but that's old news.)

And if I make it take i915 then I would want to name it i915_vtd_active as well. But then you wouldn't like that.

Quoted 6 lines
Quoted 2 lines

Should we just stuff all this into i915_utils for now, as I think Lucas suggested? Static inline or not, I don't care.

Just general grumpiness.

No worries. Ack is for this version or with i915_ prefixes in i915_utils.h/c?

Regards,

Tvrtko

#13 lore raw
Quoted 43 lines · Tvrtko Ursulin
Quoted 42 lines · Jani Nikula
Quoted 40 lines · Tvrtko Ursulin
Quoted 19 lines · Jani Nikula
Quoted 18 lines · Tvrtko Ursulin
Quoted 17 lines · Jani Nikula
Quoted 9 lines · Tvrtko Ursulin

From: Tvrtko Ursulin <[email protected]>

...

Cc Jani Nikula <[email protected]>
Cc Lucas De Marchi <[email protected]>

---
Typed up how I see it - bash away.

So is intel_vtd_active() so performance critical that it needs to be inline?

We're passing struct drm_i915_private * everywhere we can, and it just feels silly to use struct drm_device * to avoid the include.

Quoted 6 lines
Quoted 4 lines
Quoted 1 line

Static inlines considered harmful. :p

Same as it is ;), and gee, who was it that he said he was just trying to declutter i915_drv.h.. ;p

Not at the cost of clarity elsewhere!

To be clear now you oppose intel_vtd_active taking struct device? I thought you expressed general agreement when I presented the idea in the previous thread.

I don't mind hugely to go either way, but I also don't see how taking struct device makes anything unclear. (I only think intel_vtd_run_as_guest is really wrong in this story but that's old news.)

And if I make it take i915 then I would want to name it i915_vtd_active as well. But then you wouldn't like that.

Should we just stuff all this into i915_utils for now, as I think Lucas suggested? Static inline or not, I don't care.

Quoted 6 lines
Quoted 3 lines

Just general grumpiness.

No worries. Ack is for this version or with i915_ prefixes in i915_utils.h/c?

Both. Either. ;)

Quoted 4 lines

Regards,

Tvrtko

Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
#14 lore raw
Quoted 44 lines · Jani Nikula
Quoted 43 lines · Tvrtko Ursulin
Quoted 42 lines · Jani Nikula
Quoted 40 lines · Tvrtko Ursulin
Quoted 19 lines · Jani Nikula
Quoted 18 lines · Tvrtko Ursulin
Quoted 17 lines · Jani Nikula
Quoted 9 lines · Tvrtko Ursulin

From: Tvrtko Ursulin <[email protected]>

...

Cc Jani Nikula <[email protected]>
Cc Lucas De Marchi <[email protected]>

---
Typed up how I see it - bash away.

So is intel_vtd_active() so performance critical that it needs to be inline?

We're passing struct drm_i915_private * everywhere we can, and it just feels silly to use struct drm_device * to avoid the include.

Quoted 6 lines
Quoted 4 lines
Quoted 1 line

Static inlines considered harmful. :p

Same as it is ;), and gee, who was it that he said he was just trying to declutter i915_drv.h.. ;p

Not at the cost of clarity elsewhere!

To be clear now you oppose intel_vtd_active taking struct device? I thought you expressed general agreement when I presented the idea in the previous thread.

I don't mind hugely to go either way, but I also don't see how taking struct device makes anything unclear. (I only think intel_vtd_run_as_guest is really wrong in this story but that's old news.)

And if I make it take i915 then I would want to name it i915_vtd_active as well. But then you wouldn't like that.

Should we just stuff all this into i915_utils for now, as I think Lucas suggested? Static inline or not, I don't care.

Quoted 8 lines
Quoted 6 lines
Quoted 3 lines

Just general grumpiness.

No worries. Ack is for this version or with i915_ prefixes in i915_utils.h/c?

Both. Either. ;)

great, let's go with the one adding it to i915_util.h/c then.

thanks
Lucas De Marchi

Quoted 8 lines
Quoted 5 lines

Regards,

Tvrtko

Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center