* [PATCH v4] drm/i915: Use per device iommu check
@ 2021-11-26 14:14 ` Tvrtko Ursulin
0 siblings, 0 replies; 7+ messages in thread
From: Tvrtko Ursulin @ 2021-11-26 14:14 UTC (permalink / raw)
To: Intel-gfx
Cc: Robin Murphy, Lu Baolu, Lucas De Marchi, dri-devel, Tvrtko Ursulin
From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
With both integrated and discrete Intel GPUs in a system, the current
global check of intel_iommu_gfx_mapped, as done from intel_vtd_active()
may not be completely accurate.
In this patch we add i915 parameter to intel_vtd_active() in order to
prepare it for multiple GPUs and we also change the check away from Intel
specific intel_iommu_gfx_mapped (global exported by the Intel IOMMU
driver) to probing the presence of IOMMU on a specific device using
device_iommu_mapped().
This will return true both for IOMMU pass-through and address translation
modes which matches the current behaviour. If in the future we wanted to
distinguish between these two modes we could either use
iommu_get_domain_for_dev() and check for __IOMMU_DOMAIN_PAGING bit
indicating address translation, or ask for a new API to be exported from
the IOMMU core code.
v2:
* Check for dmar translation specifically, not just iommu domain. (Baolu)
v3:
* Go back to plain "any domain" check for now, rewrite commit message.
v4:
* Use device_iommu_mapped. (Robin, Baolu)
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Lu Baolu <baolu.lu@linux.intel.com>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Cc: Robin Murphy <robin.murphy@arm.com>
Acked-by: Robin Murphy <robin.murphy@arm.com>
Reviewed-by: Lu Baolu <baolu.lu@linux.intel.com>
---
drivers/gpu/drm/i915/display/intel_bw.c | 2 +-
drivers/gpu/drm/i915/display/intel_display.c | 2 +-
drivers/gpu/drm/i915/display/intel_fbc.c | 2 +-
drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 2 +-
drivers/gpu/drm/i915/gem/i915_gemfs.c | 2 +-
drivers/gpu/drm/i915/gt/intel_ggtt.c | 4 ++--
drivers/gpu/drm/i915/i915_debugfs.c | 1 +
drivers/gpu/drm/i915/i915_driver.c | 7 +++++++
drivers/gpu/drm/i915/i915_drv.h | 13 +++++++------
drivers/gpu/drm/i915/i915_gpu_error.c | 5 +----
drivers/gpu/drm/i915/intel_device_info.c | 14 +-------------
drivers/gpu/drm/i915/intel_pm.c | 2 +-
12 files changed, 25 insertions(+), 31 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_bw.c b/drivers/gpu/drm/i915/display/intel_bw.c
index abec394f6869..2da4aacc956b 100644
--- a/drivers/gpu/drm/i915/display/intel_bw.c
+++ b/drivers/gpu/drm/i915/display/intel_bw.c
@@ -634,7 +634,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())
+ if (DISPLAY_VER(dev_priv) >= 13 && intel_vtd_active(dev_priv))
data_rate = data_rate * 105 / 100;
return data_rate;
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index b2d51cd79d6c..1ef77ba7f645 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -1293,7 +1293,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() &&
+ return crtc_state->uapi.async_flip && intel_vtd_active(i915) &&
(DISPLAY_VER(i915) == 9 || IS_BROADWELL(i915) || IS_HASWELL(i915));
}
diff --git a/drivers/gpu/drm/i915/display/intel_fbc.c b/drivers/gpu/drm/i915/display/intel_fbc.c
index d0c34bc3af6c..614e8697c068 100644
--- a/drivers/gpu/drm/i915/display/intel_fbc.c
+++ b/drivers/gpu/drm/i915/display/intel_fbc.c
@@ -1677,7 +1677,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() &&
+ if (intel_vtd_active(i915) &&
(IS_SKYLAKE(i915) || IS_BROXTON(i915))) {
drm_info(&i915->drm,
"Disabling framebuffer compression (FBC) to prevent screen flicker with VT-d enabled\n");
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_stolen.c b/drivers/gpu/drm/i915/gem/i915_gem_stolen.c
index 80680395bb3b..bce03d74a0b4 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_stolen.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_stolen.c
@@ -399,7 +399,7 @@ static int i915_gem_init_stolen(struct intel_memory_region *mem)
return 0;
}
- if (intel_vtd_active() && GRAPHICS_VER(i915) < 8) {
+ if (intel_vtd_active(i915) && GRAPHICS_VER(i915) < 8) {
drm_notice(&i915->drm,
"%s, disabling use of stolen memory\n",
"DMAR active");
diff --git a/drivers/gpu/drm/i915/gem/i915_gemfs.c b/drivers/gpu/drm/i915/gem/i915_gemfs.c
index dbdbdc344d87..11cd66d183e6 100644
--- a/drivers/gpu/drm/i915/gem/i915_gemfs.c
+++ b/drivers/gpu/drm/i915/gem/i915_gemfs.c
@@ -31,7 +31,7 @@ int i915_gemfs_init(struct drm_i915_private *i915)
*/
opts = NULL;
- if (intel_vtd_active()) {
+ if (intel_vtd_active(i915)) {
if (IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE)) {
static char huge_opt[] = "huge=within_size"; /* r/w */
diff --git a/drivers/gpu/drm/i915/gt/intel_ggtt.c b/drivers/gpu/drm/i915/gt/intel_ggtt.c
index 555111c3bee5..110d3944f9a2 100644
--- a/drivers/gpu/drm/i915/gt/intel_ggtt.c
+++ b/drivers/gpu/drm/i915/gt/intel_ggtt.c
@@ -106,7 +106,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())
+ if (!intel_vtd_active(i915))
return false;
if (GRAPHICS_VER(i915) == 5 && IS_MOBILE(i915))
@@ -1233,7 +1233,7 @@ int i915_ggtt_probe_hw(struct drm_i915_private *i915)
if (ret)
return ret;
- if (intel_vtd_active())
+ if (intel_vtd_active(i915))
drm_info(&i915->drm, "VT-d active for gfx access\n");
return 0;
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index fe638b5da7c0..390d541f64ea 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -65,6 +65,7 @@ static int i915_capabilities(struct seq_file *m, void *data)
intel_device_info_print_static(INTEL_INFO(i915), &p);
intel_device_info_print_runtime(RUNTIME_INFO(i915), &p);
+ i915_print_iommu_status(i915, &p);
intel_gt_info_print(&i915->gt.info, &p);
intel_driver_caps_print(&i915->caps, &p);
diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
index a13666627dad..bbc99fc5888f 100644
--- a/drivers/gpu/drm/i915/i915_driver.c
+++ b/drivers/gpu/drm/i915/i915_driver.c
@@ -741,6 +741,12 @@ static void i915_driver_unregister(struct drm_i915_private *dev_priv)
i915_gem_driver_unregister(dev_priv);
}
+void
+i915_print_iommu_status(struct drm_i915_private *i915, struct drm_printer *p)
+{
+ drm_printf(p, "iommu: %s\n", enableddisabled(intel_vtd_active(i915)));
+}
+
static void i915_welcome_messages(struct drm_i915_private *dev_priv)
{
if (drm_debug_enabled(DRM_UT_DRIVER)) {
@@ -756,6 +762,7 @@ static void i915_welcome_messages(struct drm_i915_private *dev_priv)
intel_device_info_print_static(INTEL_INFO(dev_priv), &p);
intel_device_info_print_runtime(RUNTIME_INFO(dev_priv), &p);
+ i915_print_iommu_status(dev_priv, &p);
intel_gt_info_print(&dev_priv->gt.info, &p);
}
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 1bfadd9127fc..d99e020773ac 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1760,26 +1760,27 @@ static inline bool run_as_guest(void)
#define HAS_D12_PLANE_MINIMIZATION(dev_priv) (IS_ROCKETLAKE(dev_priv) || \
IS_ALDERLAKE_S(dev_priv))
-static inline bool intel_vtd_active(void)
+static inline bool intel_vtd_active(struct drm_i915_private *i915)
{
-#ifdef CONFIG_INTEL_IOMMU
- if (intel_iommu_gfx_mapped)
+ if (device_iommu_mapped(i915->drm.dev))
return true;
-#endif
/* 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 GRAPHICS_VER(dev_priv) >= 6 && intel_vtd_active();
+ return GRAPHICS_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();
+ return IS_BROXTON(i915) && intel_vtd_active(i915);
}
static inline bool
diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
index b1e4ce0f798f..a485aa4ca669 100644
--- a/drivers/gpu/drm/i915/i915_gpu_error.c
+++ b/drivers/gpu/drm/i915/i915_gpu_error.c
@@ -1754,10 +1754,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 = -1;
-#ifdef CONFIG_INTEL_IOMMU
- error->iommu = intel_iommu_gfx_mapped;
-#endif
+ error->iommu = intel_vtd_active(i915);
error->reset_count = i915_reset_count(&i915->gpu_error);
error->suspend_count = i915->suspend_count;
diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c
index 6e6b317bc33c..e6605b5181a5 100644
--- a/drivers/gpu/drm/i915/intel_device_info.c
+++ b/drivers/gpu/drm/i915/intel_device_info.c
@@ -83,17 +83,6 @@ const char *intel_platform_name(enum intel_platform platform)
return platform_names[platform];
}
-static const char *iommu_name(void)
-{
- const char *msg = "n/a";
-
-#ifdef CONFIG_INTEL_IOMMU
- msg = enableddisabled(intel_iommu_gfx_mapped);
-#endif
-
- return msg;
-}
-
void intel_device_info_print_static(const struct intel_device_info *info,
struct drm_printer *p)
{
@@ -114,7 +103,6 @@ void intel_device_info_print_static(const struct intel_device_info *info,
drm_printf(p, "display version: %u\n", info->display.ver);
drm_printf(p, "gt: %d\n", info->gt);
- drm_printf(p, "iommu: %s\n", iommu_name());
drm_printf(p, "memory-regions: %x\n", info->memory_regions);
drm_printf(p, "page-sizes: %x\n", info->page_sizes);
drm_printf(p, "platform: %s\n", intel_platform_name(info->platform));
@@ -374,7 +362,7 @@ 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()) {
+ if (GRAPHICS_VER(dev_priv) == 6 && intel_vtd_active(dev_priv)) {
drm_info(&dev_priv->drm,
"Disabling ppGTT for VT-d support\n");
info->ppgtt_type = INTEL_PPGTT_NONE;
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 01fa3fac1b57..cff0f32bedc9 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -98,7 +98,7 @@ static void gen9_init_clock_gating(struct drm_i915_private *dev_priv)
* "Plane N strech max must be programmed to 11b (x1)
* when Async flips are enabled on that plane."
*/
- if (!IS_GEMINILAKE(dev_priv) && intel_vtd_active())
+ if (!IS_GEMINILAKE(dev_priv) && intel_vtd_active(dev_priv))
intel_uncore_rmw(&dev_priv->uncore, CHICKEN_PIPESL_1(pipe),
SKL_PLANE1_STRETCH_MAX_MASK, SKL_PLANE1_STRETCH_MAX_X1);
}
--
2.32.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [Intel-gfx] [PATCH v4] drm/i915: Use per device iommu check
@ 2021-11-26 14:14 ` Tvrtko Ursulin
0 siblings, 0 replies; 7+ messages in thread
From: Tvrtko Ursulin @ 2021-11-26 14:14 UTC (permalink / raw)
To: Intel-gfx; +Cc: Robin Murphy, Lu Baolu, Lucas De Marchi, dri-devel
From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
With both integrated and discrete Intel GPUs in a system, the current
global check of intel_iommu_gfx_mapped, as done from intel_vtd_active()
may not be completely accurate.
In this patch we add i915 parameter to intel_vtd_active() in order to
prepare it for multiple GPUs and we also change the check away from Intel
specific intel_iommu_gfx_mapped (global exported by the Intel IOMMU
driver) to probing the presence of IOMMU on a specific device using
device_iommu_mapped().
This will return true both for IOMMU pass-through and address translation
modes which matches the current behaviour. If in the future we wanted to
distinguish between these two modes we could either use
iommu_get_domain_for_dev() and check for __IOMMU_DOMAIN_PAGING bit
indicating address translation, or ask for a new API to be exported from
the IOMMU core code.
v2:
* Check for dmar translation specifically, not just iommu domain. (Baolu)
v3:
* Go back to plain "any domain" check for now, rewrite commit message.
v4:
* Use device_iommu_mapped. (Robin, Baolu)
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Lu Baolu <baolu.lu@linux.intel.com>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Cc: Robin Murphy <robin.murphy@arm.com>
Acked-by: Robin Murphy <robin.murphy@arm.com>
Reviewed-by: Lu Baolu <baolu.lu@linux.intel.com>
---
drivers/gpu/drm/i915/display/intel_bw.c | 2 +-
drivers/gpu/drm/i915/display/intel_display.c | 2 +-
drivers/gpu/drm/i915/display/intel_fbc.c | 2 +-
drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 2 +-
drivers/gpu/drm/i915/gem/i915_gemfs.c | 2 +-
drivers/gpu/drm/i915/gt/intel_ggtt.c | 4 ++--
drivers/gpu/drm/i915/i915_debugfs.c | 1 +
drivers/gpu/drm/i915/i915_driver.c | 7 +++++++
drivers/gpu/drm/i915/i915_drv.h | 13 +++++++------
drivers/gpu/drm/i915/i915_gpu_error.c | 5 +----
drivers/gpu/drm/i915/intel_device_info.c | 14 +-------------
drivers/gpu/drm/i915/intel_pm.c | 2 +-
12 files changed, 25 insertions(+), 31 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_bw.c b/drivers/gpu/drm/i915/display/intel_bw.c
index abec394f6869..2da4aacc956b 100644
--- a/drivers/gpu/drm/i915/display/intel_bw.c
+++ b/drivers/gpu/drm/i915/display/intel_bw.c
@@ -634,7 +634,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())
+ if (DISPLAY_VER(dev_priv) >= 13 && intel_vtd_active(dev_priv))
data_rate = data_rate * 105 / 100;
return data_rate;
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index b2d51cd79d6c..1ef77ba7f645 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -1293,7 +1293,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() &&
+ return crtc_state->uapi.async_flip && intel_vtd_active(i915) &&
(DISPLAY_VER(i915) == 9 || IS_BROADWELL(i915) || IS_HASWELL(i915));
}
diff --git a/drivers/gpu/drm/i915/display/intel_fbc.c b/drivers/gpu/drm/i915/display/intel_fbc.c
index d0c34bc3af6c..614e8697c068 100644
--- a/drivers/gpu/drm/i915/display/intel_fbc.c
+++ b/drivers/gpu/drm/i915/display/intel_fbc.c
@@ -1677,7 +1677,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() &&
+ if (intel_vtd_active(i915) &&
(IS_SKYLAKE(i915) || IS_BROXTON(i915))) {
drm_info(&i915->drm,
"Disabling framebuffer compression (FBC) to prevent screen flicker with VT-d enabled\n");
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_stolen.c b/drivers/gpu/drm/i915/gem/i915_gem_stolen.c
index 80680395bb3b..bce03d74a0b4 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_stolen.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_stolen.c
@@ -399,7 +399,7 @@ static int i915_gem_init_stolen(struct intel_memory_region *mem)
return 0;
}
- if (intel_vtd_active() && GRAPHICS_VER(i915) < 8) {
+ if (intel_vtd_active(i915) && GRAPHICS_VER(i915) < 8) {
drm_notice(&i915->drm,
"%s, disabling use of stolen memory\n",
"DMAR active");
diff --git a/drivers/gpu/drm/i915/gem/i915_gemfs.c b/drivers/gpu/drm/i915/gem/i915_gemfs.c
index dbdbdc344d87..11cd66d183e6 100644
--- a/drivers/gpu/drm/i915/gem/i915_gemfs.c
+++ b/drivers/gpu/drm/i915/gem/i915_gemfs.c
@@ -31,7 +31,7 @@ int i915_gemfs_init(struct drm_i915_private *i915)
*/
opts = NULL;
- if (intel_vtd_active()) {
+ if (intel_vtd_active(i915)) {
if (IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE)) {
static char huge_opt[] = "huge=within_size"; /* r/w */
diff --git a/drivers/gpu/drm/i915/gt/intel_ggtt.c b/drivers/gpu/drm/i915/gt/intel_ggtt.c
index 555111c3bee5..110d3944f9a2 100644
--- a/drivers/gpu/drm/i915/gt/intel_ggtt.c
+++ b/drivers/gpu/drm/i915/gt/intel_ggtt.c
@@ -106,7 +106,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())
+ if (!intel_vtd_active(i915))
return false;
if (GRAPHICS_VER(i915) == 5 && IS_MOBILE(i915))
@@ -1233,7 +1233,7 @@ int i915_ggtt_probe_hw(struct drm_i915_private *i915)
if (ret)
return ret;
- if (intel_vtd_active())
+ if (intel_vtd_active(i915))
drm_info(&i915->drm, "VT-d active for gfx access\n");
return 0;
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index fe638b5da7c0..390d541f64ea 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -65,6 +65,7 @@ static int i915_capabilities(struct seq_file *m, void *data)
intel_device_info_print_static(INTEL_INFO(i915), &p);
intel_device_info_print_runtime(RUNTIME_INFO(i915), &p);
+ i915_print_iommu_status(i915, &p);
intel_gt_info_print(&i915->gt.info, &p);
intel_driver_caps_print(&i915->caps, &p);
diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
index a13666627dad..bbc99fc5888f 100644
--- a/drivers/gpu/drm/i915/i915_driver.c
+++ b/drivers/gpu/drm/i915/i915_driver.c
@@ -741,6 +741,12 @@ static void i915_driver_unregister(struct drm_i915_private *dev_priv)
i915_gem_driver_unregister(dev_priv);
}
+void
+i915_print_iommu_status(struct drm_i915_private *i915, struct drm_printer *p)
+{
+ drm_printf(p, "iommu: %s\n", enableddisabled(intel_vtd_active(i915)));
+}
+
static void i915_welcome_messages(struct drm_i915_private *dev_priv)
{
if (drm_debug_enabled(DRM_UT_DRIVER)) {
@@ -756,6 +762,7 @@ static void i915_welcome_messages(struct drm_i915_private *dev_priv)
intel_device_info_print_static(INTEL_INFO(dev_priv), &p);
intel_device_info_print_runtime(RUNTIME_INFO(dev_priv), &p);
+ i915_print_iommu_status(dev_priv, &p);
intel_gt_info_print(&dev_priv->gt.info, &p);
}
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 1bfadd9127fc..d99e020773ac 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1760,26 +1760,27 @@ static inline bool run_as_guest(void)
#define HAS_D12_PLANE_MINIMIZATION(dev_priv) (IS_ROCKETLAKE(dev_priv) || \
IS_ALDERLAKE_S(dev_priv))
-static inline bool intel_vtd_active(void)
+static inline bool intel_vtd_active(struct drm_i915_private *i915)
{
-#ifdef CONFIG_INTEL_IOMMU
- if (intel_iommu_gfx_mapped)
+ if (device_iommu_mapped(i915->drm.dev))
return true;
-#endif
/* 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 GRAPHICS_VER(dev_priv) >= 6 && intel_vtd_active();
+ return GRAPHICS_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();
+ return IS_BROXTON(i915) && intel_vtd_active(i915);
}
static inline bool
diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
index b1e4ce0f798f..a485aa4ca669 100644
--- a/drivers/gpu/drm/i915/i915_gpu_error.c
+++ b/drivers/gpu/drm/i915/i915_gpu_error.c
@@ -1754,10 +1754,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 = -1;
-#ifdef CONFIG_INTEL_IOMMU
- error->iommu = intel_iommu_gfx_mapped;
-#endif
+ error->iommu = intel_vtd_active(i915);
error->reset_count = i915_reset_count(&i915->gpu_error);
error->suspend_count = i915->suspend_count;
diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c
index 6e6b317bc33c..e6605b5181a5 100644
--- a/drivers/gpu/drm/i915/intel_device_info.c
+++ b/drivers/gpu/drm/i915/intel_device_info.c
@@ -83,17 +83,6 @@ const char *intel_platform_name(enum intel_platform platform)
return platform_names[platform];
}
-static const char *iommu_name(void)
-{
- const char *msg = "n/a";
-
-#ifdef CONFIG_INTEL_IOMMU
- msg = enableddisabled(intel_iommu_gfx_mapped);
-#endif
-
- return msg;
-}
-
void intel_device_info_print_static(const struct intel_device_info *info,
struct drm_printer *p)
{
@@ -114,7 +103,6 @@ void intel_device_info_print_static(const struct intel_device_info *info,
drm_printf(p, "display version: %u\n", info->display.ver);
drm_printf(p, "gt: %d\n", info->gt);
- drm_printf(p, "iommu: %s\n", iommu_name());
drm_printf(p, "memory-regions: %x\n", info->memory_regions);
drm_printf(p, "page-sizes: %x\n", info->page_sizes);
drm_printf(p, "platform: %s\n", intel_platform_name(info->platform));
@@ -374,7 +362,7 @@ 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()) {
+ if (GRAPHICS_VER(dev_priv) == 6 && intel_vtd_active(dev_priv)) {
drm_info(&dev_priv->drm,
"Disabling ppGTT for VT-d support\n");
info->ppgtt_type = INTEL_PPGTT_NONE;
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 01fa3fac1b57..cff0f32bedc9 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -98,7 +98,7 @@ static void gen9_init_clock_gating(struct drm_i915_private *dev_priv)
* "Plane N strech max must be programmed to 11b (x1)
* when Async flips are enabled on that plane."
*/
- if (!IS_GEMINILAKE(dev_priv) && intel_vtd_active())
+ if (!IS_GEMINILAKE(dev_priv) && intel_vtd_active(dev_priv))
intel_uncore_rmw(&dev_priv->uncore, CHICKEN_PIPESL_1(pipe),
SKL_PLANE1_STRETCH_MAX_MASK, SKL_PLANE1_STRETCH_MAX_X1);
}
--
2.32.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [Intel-gfx] ✗ Fi.CI.SPARSE: warning for drm/i915: Use per device iommu check (rev4)
2021-11-26 14:14 ` [Intel-gfx] " Tvrtko Ursulin
(?)
@ 2021-11-26 17:13 ` Patchwork
-1 siblings, 0 replies; 7+ messages in thread
From: Patchwork @ 2021-11-26 17:13 UTC (permalink / raw)
To: Lu Baolu; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Use per device iommu check (rev4)
URL : https://patchwork.freedesktop.org/series/96715/
State : warning
== Summary ==
$ dim sparse --fast origin/drm-tip
Sparse version: v0.6.2
Fast mode used, each commit won't be checked separately.
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915: Use per device iommu check (rev4)
2021-11-26 14:14 ` [Intel-gfx] " Tvrtko Ursulin
(?)
(?)
@ 2021-11-26 17:51 ` Patchwork
-1 siblings, 0 replies; 7+ messages in thread
From: Patchwork @ 2021-11-26 17:51 UTC (permalink / raw)
To: Lu Baolu; +Cc: intel-gfx
[-- Attachment #1: Type: text/plain, Size: 6882 bytes --]
== Series Details ==
Series: drm/i915: Use per device iommu check (rev4)
URL : https://patchwork.freedesktop.org/series/96715/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_10931 -> Patchwork_21687
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/index.html
Participating hosts (33 -> 35)
------------------------------
Additional (3): fi-kbl-soraka fi-icl-u2 fi-tgl-u2
Missing (1): fi-bdw-samus
Known issues
------------
Here are the changes found in Patchwork_21687 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@amdgpu/amd_cs_nop@fork-gfx0:
- fi-icl-u2: NOTRUN -> [SKIP][1] ([fdo#109315]) +17 similar issues
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/fi-icl-u2/igt@amdgpu/amd_cs_nop@fork-gfx0.html
* igt@gem_exec_fence@basic-busy@bcs0:
- fi-kbl-soraka: NOTRUN -> [SKIP][2] ([fdo#109271]) +8 similar issues
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/fi-kbl-soraka/igt@gem_exec_fence@basic-busy@bcs0.html
* igt@gem_exec_suspend@basic-s3:
- fi-tgl-1115g4: [PASS][3] -> [FAIL][4] ([i915#1888])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10931/fi-tgl-1115g4/igt@gem_exec_suspend@basic-s3.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/fi-tgl-1115g4/igt@gem_exec_suspend@basic-s3.html
* igt@gem_huc_copy@huc-copy:
- fi-tgl-u2: NOTRUN -> [SKIP][5] ([i915#2190])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/fi-tgl-u2/igt@gem_huc_copy@huc-copy.html
- fi-kbl-soraka: NOTRUN -> [SKIP][6] ([fdo#109271] / [i915#2190])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/fi-kbl-soraka/igt@gem_huc_copy@huc-copy.html
- fi-icl-u2: NOTRUN -> [SKIP][7] ([i915#2190])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/fi-icl-u2/igt@gem_huc_copy@huc-copy.html
* igt@gem_lmem_swapping@parallel-random-engines:
- fi-icl-u2: NOTRUN -> [SKIP][8] ([i915#4613]) +3 similar issues
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/fi-icl-u2/igt@gem_lmem_swapping@parallel-random-engines.html
- fi-kbl-soraka: NOTRUN -> [SKIP][9] ([fdo#109271] / [i915#4613]) +3 similar issues
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/fi-kbl-soraka/igt@gem_lmem_swapping@parallel-random-engines.html
* igt@gem_lmem_swapping@verify-random:
- fi-tgl-u2: NOTRUN -> [SKIP][10] ([i915#4613]) +3 similar issues
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/fi-tgl-u2/igt@gem_lmem_swapping@verify-random.html
* igt@i915_selftest@live@gt_pm:
- fi-kbl-soraka: NOTRUN -> [DMESG-FAIL][11] ([i915#1886] / [i915#2291])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/fi-kbl-soraka/igt@i915_selftest@live@gt_pm.html
* igt@kms_chamelium@common-hpd-after-suspend:
- fi-tgl-u2: NOTRUN -> [SKIP][12] ([fdo#109284] / [fdo#111827]) +8 similar issues
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/fi-tgl-u2/igt@kms_chamelium@common-hpd-after-suspend.html
* igt@kms_chamelium@dp-edid-read:
- fi-kbl-soraka: NOTRUN -> [SKIP][13] ([fdo#109271] / [fdo#111827]) +8 similar issues
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/fi-kbl-soraka/igt@kms_chamelium@dp-edid-read.html
* igt@kms_chamelium@hdmi-hpd-fast:
- fi-icl-u2: NOTRUN -> [SKIP][14] ([fdo#111827]) +8 similar issues
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/fi-icl-u2/igt@kms_chamelium@hdmi-hpd-fast.html
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic:
- fi-tgl-u2: NOTRUN -> [SKIP][15] ([i915#4103]) +1 similar issue
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/fi-tgl-u2/igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic.html
- fi-icl-u2: NOTRUN -> [SKIP][16] ([fdo#109278]) +2 similar issues
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/fi-icl-u2/igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic.html
* igt@kms_force_connector_basic@force-load-detect:
- fi-tgl-u2: NOTRUN -> [SKIP][17] ([fdo#109285])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/fi-tgl-u2/igt@kms_force_connector_basic@force-load-detect.html
- fi-icl-u2: NOTRUN -> [SKIP][18] ([fdo#109285])
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/fi-icl-u2/igt@kms_force_connector_basic@force-load-detect.html
* igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-d:
- fi-kbl-soraka: NOTRUN -> [SKIP][19] ([fdo#109271] / [i915#533])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/fi-kbl-soraka/igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-d.html
* igt@prime_vgem@basic-userptr:
- fi-icl-u2: NOTRUN -> [SKIP][20] ([i915#3301])
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/fi-icl-u2/igt@prime_vgem@basic-userptr.html
- fi-tgl-u2: NOTRUN -> [SKIP][21] ([i915#3301])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/fi-tgl-u2/igt@prime_vgem@basic-userptr.html
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
[fdo#109284]: https://bugs.freedesktop.org/show_bug.cgi?id=109284
[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#1886]: https://gitlab.freedesktop.org/drm/intel/issues/1886
[i915#1888]: https://gitlab.freedesktop.org/drm/intel/issues/1888
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#2291]: https://gitlab.freedesktop.org/drm/intel/issues/2291
[i915#3301]: https://gitlab.freedesktop.org/drm/intel/issues/3301
[i915#4103]: https://gitlab.freedesktop.org/drm/intel/issues/4103
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#533]: https://gitlab.freedesktop.org/drm/intel/issues/533
Build changes
-------------
* Linux: CI_DRM_10931 -> Patchwork_21687
CI-20190529: 20190529
CI_DRM_10931: 8f98184bd66880e87ddf8bdf3110b970b46d42e0 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6293: bf11f87c27ad1cec3e60bd31c23080d19aa093f3 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_21687: 67e3cb94af2455cb2fb2a4c3af8ffd18eeee06a2 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
67e3cb94af24 drm/i915: Use per device iommu check
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/index.html
[-- Attachment #2: Type: text/html, Size: 8739 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Intel-gfx] ✗ Fi.CI.IGT: failure for drm/i915: Use per device iommu check (rev4)
2021-11-26 14:14 ` [Intel-gfx] " Tvrtko Ursulin
` (2 preceding siblings ...)
(?)
@ 2021-11-26 20:02 ` Patchwork
-1 siblings, 0 replies; 7+ messages in thread
From: Patchwork @ 2021-11-26 20:02 UTC (permalink / raw)
To: Lu Baolu; +Cc: intel-gfx
[-- Attachment #1: Type: text/plain, Size: 30266 bytes --]
== Series Details ==
Series: drm/i915: Use per device iommu check (rev4)
URL : https://patchwork.freedesktop.org/series/96715/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_10931_full -> Patchwork_21687_full
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_21687_full absolutely need to be
verified manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_21687_full, please notify your bug team to allow them
to document this new failure mode, which will reduce false positives in CI.
Participating hosts (11 -> 11)
------------------------------
No changes in participating hosts
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_21687_full:
### IGT changes ###
#### Possible regressions ####
* igt@gem_exec_schedule@reorder-wide@bcs0:
- shard-skl: [PASS][1] -> [FAIL][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10931/shard-skl4/igt@gem_exec_schedule@reorder-wide@bcs0.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-skl4/igt@gem_exec_schedule@reorder-wide@bcs0.html
Known issues
------------
Here are the changes found in Patchwork_21687_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_create@create-massive:
- shard-apl: NOTRUN -> [DMESG-WARN][3] ([i915#3002])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-apl1/igt@gem_create@create-massive.html
* igt@gem_ctx_isolation@preservation-s3@vcs0:
- shard-kbl: [PASS][4] -> [DMESG-WARN][5] ([i915#180]) +7 similar issues
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10931/shard-kbl2/igt@gem_ctx_isolation@preservation-s3@vcs0.html
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-kbl1/igt@gem_ctx_isolation@preservation-s3@vcs0.html
* igt@gem_exec_capture@pi@rcs0:
- shard-skl: NOTRUN -> [INCOMPLETE][6] ([i915#4547])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-skl1/igt@gem_exec_capture@pi@rcs0.html
* igt@gem_exec_fair@basic-flow@rcs0:
- shard-skl: NOTRUN -> [SKIP][7] ([fdo#109271]) +81 similar issues
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-skl7/igt@gem_exec_fair@basic-flow@rcs0.html
* igt@gem_exec_fair@basic-none-rrul@rcs0:
- shard-glk: [PASS][8] -> [FAIL][9] ([i915#2842]) +1 similar issue
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10931/shard-glk5/igt@gem_exec_fair@basic-none-rrul@rcs0.html
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-glk9/igt@gem_exec_fair@basic-none-rrul@rcs0.html
* igt@gem_exec_fair@basic-none-share@rcs0:
- shard-iclb: [PASS][10] -> [FAIL][11] ([i915#2842]) +1 similar issue
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10931/shard-iclb5/igt@gem_exec_fair@basic-none-share@rcs0.html
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-iclb3/igt@gem_exec_fair@basic-none-share@rcs0.html
* igt@gem_exec_fair@basic-pace-solo@rcs0:
- shard-kbl: [PASS][12] -> [FAIL][13] ([i915#2842])
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10931/shard-kbl7/igt@gem_exec_fair@basic-pace-solo@rcs0.html
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-kbl4/igt@gem_exec_fair@basic-pace-solo@rcs0.html
* igt@gem_exec_fair@basic-pace@bcs0:
- shard-tglb: [PASS][14] -> [FAIL][15] ([i915#2842]) +2 similar issues
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10931/shard-tglb8/igt@gem_exec_fair@basic-pace@bcs0.html
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-tglb3/igt@gem_exec_fair@basic-pace@bcs0.html
* igt@gem_exec_fair@basic-pace@vcs1:
- shard-kbl: [PASS][16] -> [SKIP][17] ([fdo#109271])
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10931/shard-kbl6/igt@gem_exec_fair@basic-pace@vcs1.html
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-kbl3/igt@gem_exec_fair@basic-pace@vcs1.html
* igt@gem_exec_suspend@basic-s0:
- shard-iclb: [PASS][18] -> [DMESG-WARN][19] ([i915#2867])
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10931/shard-iclb8/igt@gem_exec_suspend@basic-s0.html
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-iclb5/igt@gem_exec_suspend@basic-s0.html
* igt@gem_lmem_swapping@heavy-verify-random:
- shard-skl: NOTRUN -> [SKIP][20] ([fdo#109271] / [i915#4613])
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-skl1/igt@gem_lmem_swapping@heavy-verify-random.html
- shard-apl: NOTRUN -> [SKIP][21] ([fdo#109271] / [i915#4613])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-apl2/igt@gem_lmem_swapping@heavy-verify-random.html
* igt@gem_lmem_swapping@verify-random:
- shard-kbl: NOTRUN -> [SKIP][22] ([fdo#109271] / [i915#4613])
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-kbl6/igt@gem_lmem_swapping@verify-random.html
* igt@gem_pread@exhaustion:
- shard-kbl: NOTRUN -> [WARN][23] ([i915#2658])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-kbl6/igt@gem_pread@exhaustion.html
* igt@gem_pxp@verify-pxp-key-change-after-suspend-resume:
- shard-tglb: NOTRUN -> [SKIP][24] ([i915#4270])
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-tglb6/igt@gem_pxp@verify-pxp-key-change-after-suspend-resume.html
* igt@gem_userptr_blits@dmabuf-sync:
- shard-kbl: NOTRUN -> [SKIP][25] ([fdo#109271] / [i915#3323])
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-kbl6/igt@gem_userptr_blits@dmabuf-sync.html
* igt@gem_userptr_blits@input-checking:
- shard-kbl: NOTRUN -> [DMESG-WARN][26] ([i915#3002])
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-kbl1/igt@gem_userptr_blits@input-checking.html
* igt@gem_userptr_blits@unsync-unmap-cycles:
- shard-tglb: NOTRUN -> [SKIP][27] ([i915#3297])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-tglb5/igt@gem_userptr_blits@unsync-unmap-cycles.html
* igt@gem_userptr_blits@vma-merge:
- shard-kbl: NOTRUN -> [FAIL][28] ([i915#3318])
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-kbl6/igt@gem_userptr_blits@vma-merge.html
- shard-skl: NOTRUN -> [FAIL][29] ([i915#3318])
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-skl7/igt@gem_userptr_blits@vma-merge.html
* igt@gen7_exec_parse@cmd-crossing-page:
- shard-tglb: NOTRUN -> [SKIP][30] ([fdo#109289])
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-tglb5/igt@gen7_exec_parse@cmd-crossing-page.html
* igt@i915_selftest@live@gt_pm:
- shard-glk: [PASS][31] -> [DMESG-FAIL][32] ([i915#1886])
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10931/shard-glk1/igt@i915_selftest@live@gt_pm.html
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-glk7/igt@i915_selftest@live@gt_pm.html
* igt@kms_big_fb@x-tiled-max-hw-stride-32bpp-rotate-0-async-flip:
- shard-skl: NOTRUN -> [FAIL][33] ([i915#3743])
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-skl1/igt@kms_big_fb@x-tiled-max-hw-stride-32bpp-rotate-0-async-flip.html
* igt@kms_big_fb@x-tiled-max-hw-stride-32bpp-rotate-180-hflip:
- shard-skl: NOTRUN -> [SKIP][34] ([fdo#109271] / [i915#3777])
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-skl7/igt@kms_big_fb@x-tiled-max-hw-stride-32bpp-rotate-180-hflip.html
- shard-kbl: NOTRUN -> [SKIP][35] ([fdo#109271] / [i915#3777]) +1 similar issue
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-kbl6/igt@kms_big_fb@x-tiled-max-hw-stride-32bpp-rotate-180-hflip.html
* igt@kms_ccs@pipe-a-crc-primary-rotation-180-y_tiled_gen12_mc_ccs:
- shard-kbl: NOTRUN -> [SKIP][36] ([fdo#109271] / [i915#3886]) +1 similar issue
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-kbl1/igt@kms_ccs@pipe-a-crc-primary-rotation-180-y_tiled_gen12_mc_ccs.html
* igt@kms_ccs@pipe-b-bad-pixel-format-y_tiled_gen12_mc_ccs:
- shard-apl: NOTRUN -> [SKIP][37] ([fdo#109271] / [i915#3886]) +2 similar issues
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-apl2/igt@kms_ccs@pipe-b-bad-pixel-format-y_tiled_gen12_mc_ccs.html
* igt@kms_ccs@pipe-b-crc-primary-basic-y_tiled_gen12_mc_ccs:
- shard-tglb: NOTRUN -> [SKIP][38] ([i915#3689] / [i915#3886])
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-tglb5/igt@kms_ccs@pipe-b-crc-primary-basic-y_tiled_gen12_mc_ccs.html
* igt@kms_ccs@pipe-b-random-ccs-data-y_tiled_ccs:
- shard-tglb: NOTRUN -> [SKIP][39] ([i915#3689]) +1 similar issue
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-tglb6/igt@kms_ccs@pipe-b-random-ccs-data-y_tiled_ccs.html
* igt@kms_cdclk@plane-scaling:
- shard-tglb: NOTRUN -> [SKIP][40] ([i915#3742])
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-tglb6/igt@kms_cdclk@plane-scaling.html
* igt@kms_chamelium@dp-hpd-enable-disable-mode:
- shard-tglb: NOTRUN -> [SKIP][41] ([fdo#109284] / [fdo#111827]) +1 similar issue
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-tglb5/igt@kms_chamelium@dp-hpd-enable-disable-mode.html
* igt@kms_chamelium@hdmi-hpd-storm:
- shard-kbl: NOTRUN -> [SKIP][42] ([fdo#109271] / [fdo#111827]) +4 similar issues
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-kbl6/igt@kms_chamelium@hdmi-hpd-storm.html
* igt@kms_color_chamelium@pipe-a-ctm-green-to-red:
- shard-apl: NOTRUN -> [SKIP][43] ([fdo#109271] / [fdo#111827]) +3 similar issues
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-apl2/igt@kms_color_chamelium@pipe-a-ctm-green-to-red.html
- shard-skl: NOTRUN -> [SKIP][44] ([fdo#109271] / [fdo#111827]) +5 similar issues
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-skl1/igt@kms_color_chamelium@pipe-a-ctm-green-to-red.html
* igt@kms_content_protection@lic:
- shard-kbl: NOTRUN -> [TIMEOUT][45] ([i915#1319])
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-kbl6/igt@kms_content_protection@lic.html
* igt@kms_cursor_crc@pipe-a-cursor-32x10-offscreen:
- shard-apl: NOTRUN -> [SKIP][46] ([fdo#109271]) +33 similar issues
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-apl2/igt@kms_cursor_crc@pipe-a-cursor-32x10-offscreen.html
* igt@kms_cursor_crc@pipe-a-cursor-32x32-sliding:
- shard-tglb: NOTRUN -> [SKIP][47] ([i915#3319])
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-tglb6/igt@kms_cursor_crc@pipe-a-cursor-32x32-sliding.html
* igt@kms_cursor_crc@pipe-a-cursor-max-size-onscreen:
- shard-tglb: NOTRUN -> [SKIP][48] ([i915#3359])
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-tglb5/igt@kms_cursor_crc@pipe-a-cursor-max-size-onscreen.html
* igt@kms_cursor_crc@pipe-c-cursor-512x512-rapid-movement:
- shard-tglb: NOTRUN -> [SKIP][49] ([fdo#109279] / [i915#3359]) +1 similar issue
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-tglb5/igt@kms_cursor_crc@pipe-c-cursor-512x512-rapid-movement.html
* igt@kms_fbcon_fbt@fbc-suspend:
- shard-apl: [PASS][50] -> [INCOMPLETE][51] ([i915#180] / [i915#1982])
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10931/shard-apl1/igt@kms_fbcon_fbt@fbc-suspend.html
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-apl2/igt@kms_fbcon_fbt@fbc-suspend.html
- shard-tglb: [PASS][52] -> [INCOMPLETE][53] ([i915#456])
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10931/shard-tglb6/igt@kms_fbcon_fbt@fbc-suspend.html
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-tglb7/igt@kms_fbcon_fbt@fbc-suspend.html
* igt@kms_flip@plain-flip-ts-check-interruptible@b-edp1:
- shard-skl: [PASS][54] -> [FAIL][55] ([i915#2122])
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10931/shard-skl10/igt@kms_flip@plain-flip-ts-check-interruptible@b-edp1.html
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-skl4/igt@kms_flip@plain-flip-ts-check-interruptible@b-edp1.html
* igt@kms_frontbuffer_tracking@fbc-2p-pri-indfb-multidraw:
- shard-glk: [PASS][56] -> [FAIL][57] ([i915#1888] / [i915#2546])
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10931/shard-glk2/igt@kms_frontbuffer_tracking@fbc-2p-pri-indfb-multidraw.html
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-glk8/igt@kms_frontbuffer_tracking@fbc-2p-pri-indfb-multidraw.html
* igt@kms_frontbuffer_tracking@fbc-2p-primscrn-pri-indfb-draw-mmap-wc:
- shard-tglb: NOTRUN -> [SKIP][58] ([fdo#111825]) +9 similar issues
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-tglb5/igt@kms_frontbuffer_tracking@fbc-2p-primscrn-pri-indfb-draw-mmap-wc.html
* igt@kms_hdr@bpc-switch:
- shard-skl: [PASS][59] -> [FAIL][60] ([i915#1188])
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10931/shard-skl6/igt@kms_hdr@bpc-switch.html
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-skl8/igt@kms_hdr@bpc-switch.html
* igt@kms_pipe_crc_basic@read-crc-pipe-d-frame-sequence:
- shard-apl: NOTRUN -> [SKIP][61] ([fdo#109271] / [i915#533])
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-apl2/igt@kms_pipe_crc_basic@read-crc-pipe-d-frame-sequence.html
* igt@kms_plane@plane-panning-bottom-right-suspend@pipe-a-planes:
- shard-apl: [PASS][62] -> [DMESG-WARN][63] ([i915#180]) +2 similar issues
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10931/shard-apl3/igt@kms_plane@plane-panning-bottom-right-suspend@pipe-a-planes.html
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-apl3/igt@kms_plane@plane-panning-bottom-right-suspend@pipe-a-planes.html
* igt@kms_plane_alpha_blend@pipe-c-constant-alpha-max:
- shard-apl: NOTRUN -> [FAIL][64] ([fdo#108145] / [i915#265])
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-apl2/igt@kms_plane_alpha_blend@pipe-c-constant-alpha-max.html
* igt@kms_plane_alpha_blend@pipe-c-coverage-7efc:
- shard-skl: [PASS][65] -> [FAIL][66] ([fdo#108145] / [i915#265])
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10931/shard-skl10/igt@kms_plane_alpha_blend@pipe-c-coverage-7efc.html
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-skl4/igt@kms_plane_alpha_blend@pipe-c-coverage-7efc.html
* igt@kms_plane_lowres@pipe-d-tiling-none:
- shard-tglb: NOTRUN -> [SKIP][67] ([i915#3536])
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-tglb6/igt@kms_plane_lowres@pipe-d-tiling-none.html
* igt@kms_plane_scaling@scaler-with-clipping-clamping@pipe-c-scaler-with-clipping-clamping:
- shard-skl: NOTRUN -> [SKIP][68] ([fdo#109271] / [i915#2733])
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-skl6/igt@kms_plane_scaling@scaler-with-clipping-clamping@pipe-c-scaler-with-clipping-clamping.html
* igt@kms_psr2_sf@overlay-plane-update-sf-dmg-area-3:
- shard-apl: NOTRUN -> [SKIP][69] ([fdo#109271] / [i915#658])
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-apl2/igt@kms_psr2_sf@overlay-plane-update-sf-dmg-area-3.html
* igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area-3:
- shard-kbl: NOTRUN -> [SKIP][70] ([fdo#109271] / [i915#658]) +1 similar issue
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-kbl6/igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area-3.html
* igt@kms_psr2_sf@plane-move-sf-dmg-area-3:
- shard-tglb: NOTRUN -> [SKIP][71] ([i915#2920])
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-tglb5/igt@kms_psr2_sf@plane-move-sf-dmg-area-3.html
* igt@kms_psr2_su@frontbuffer:
- shard-skl: NOTRUN -> [SKIP][72] ([fdo#109271] / [i915#658]) +2 similar issues
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-skl7/igt@kms_psr2_su@frontbuffer.html
* igt@kms_psr@psr2_no_drrs:
- shard-iclb: [PASS][73] -> [SKIP][74] ([fdo#109441]) +2 similar issues
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10931/shard-iclb2/igt@kms_psr@psr2_no_drrs.html
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-iclb8/igt@kms_psr@psr2_no_drrs.html
- shard-tglb: NOTRUN -> [FAIL][75] ([i915#132] / [i915#3467]) +2 similar issues
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-tglb6/igt@kms_psr@psr2_no_drrs.html
* igt@kms_universal_plane@disable-primary-vs-flip-pipe-d:
- shard-kbl: NOTRUN -> [SKIP][76] ([fdo#109271]) +75 similar issues
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-kbl1/igt@kms_universal_plane@disable-primary-vs-flip-pipe-d.html
* igt@kms_writeback@writeback-pixel-formats:
- shard-apl: NOTRUN -> [SKIP][77] ([fdo#109271] / [i915#2437])
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-apl2/igt@kms_writeback@writeback-pixel-formats.html
* igt@nouveau_crc@pipe-b-source-outp-complete:
- shard-tglb: NOTRUN -> [SKIP][78] ([i915#2530])
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-tglb6/igt@nouveau_crc@pipe-b-source-outp-complete.html
* igt@perf@polling-parameterized:
- shard-glk: [PASS][79] -> [FAIL][80] ([i915#1542])
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10931/shard-glk7/igt@perf@polling-parameterized.html
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-glk7/igt@perf@polling-parameterized.html
* igt@perf_pmu@module-unload:
- shard-iclb: [PASS][81] -> [DMESG-WARN][82] ([i915#262] / [i915#2867])
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10931/shard-iclb8/igt@perf_pmu@module-unload.html
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-iclb5/igt@perf_pmu@module-unload.html
* igt@prime_nv_api@nv_self_import_to_different_fd:
- shard-tglb: NOTRUN -> [SKIP][83] ([fdo#109291])
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-tglb5/igt@prime_nv_api@nv_self_import_to_different_fd.html
* igt@sysfs_clients@recycle:
- shard-apl: NOTRUN -> [SKIP][84] ([fdo#109271] / [i915#2994])
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-apl2/igt@sysfs_clients@recycle.html
* igt@sysfs_heartbeat_interval@mixed@rcs0:
- shard-skl: [PASS][85] -> [FAIL][86] ([i915#1731])
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10931/shard-skl1/igt@sysfs_heartbeat_interval@mixed@rcs0.html
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-skl7/igt@sysfs_heartbeat_interval@mixed@rcs0.html
#### Possible fixes ####
* igt@gem_exec_fair@basic-flow@rcs0:
- shard-tglb: [FAIL][87] ([i915#2842]) -> [PASS][88] +1 similar issue
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10931/shard-tglb5/igt@gem_exec_fair@basic-flow@rcs0.html
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-tglb8/igt@gem_exec_fair@basic-flow@rcs0.html
* igt@gem_exec_fair@basic-throttle@rcs0:
- {shard-rkl}: [FAIL][89] ([i915#2842]) -> [PASS][90]
[89]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10931/shard-rkl-4/igt@gem_exec_fair@basic-throttle@rcs0.html
[90]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-rkl-4/igt@gem_exec_fair@basic-throttle@rcs0.html
* igt@gem_huc_copy@huc-copy:
- shard-tglb: [SKIP][91] ([i915#2190]) -> [PASS][92]
[91]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10931/shard-tglb6/igt@gem_huc_copy@huc-copy.html
[92]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-tglb1/igt@gem_huc_copy@huc-copy.html
* igt@gem_workarounds@suspend-resume-context:
- shard-apl: [DMESG-WARN][93] ([i915#180]) -> [PASS][94] +2 similar issues
[93]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10931/shard-apl8/igt@gem_workarounds@suspend-resume-context.html
[94]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-apl1/igt@gem_workarounds@suspend-resume-context.html
* igt@gem_workarounds@suspend-resume-fd:
- shard-skl: [INCOMPLETE][95] ([i915#198]) -> [PASS][96] +1 similar issue
[95]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10931/shard-skl1/igt@gem_workarounds@suspend-resume-fd.html
[96]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-skl7/igt@gem_workarounds@suspend-resume-fd.html
* igt@i915_module_load@reload-with-fault-injection:
- shard-skl: [DMESG-WARN][97] ([i915#1982]) -> [PASS][98]
[97]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10931/shard-skl10/igt@i915_module_load@reload-with-fault-injection.html
[98]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-skl4/igt@i915_module_load@reload-with-fault-injection.html
* igt@kms_cursor_crc@pipe-c-cursor-suspend:
- shard-tglb: [INCOMPLETE][99] ([i915#2411] / [i915#456]) -> [PASS][100]
[99]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10931/shard-tglb7/igt@kms_cursor_crc@pipe-c-cursor-suspend.html
[100]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-tglb6/igt@kms_cursor_crc@pipe-c-cursor-suspend.html
* igt@kms_cursor_crc@pipe-d-cursor-suspend:
- shard-tglb: [INCOMPLETE][101] ([i915#4211]) -> [PASS][102]
[101]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10931/shard-tglb7/igt@kms_cursor_crc@pipe-d-cursor-suspend.html
[102]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-tglb6/igt@kms_cursor_crc@pipe-d-cursor-suspend.html
* igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions:
- shard-skl: [FAIL][103] ([i915#2346]) -> [PASS][104]
[103]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10931/shard-skl7/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions.html
[104]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-skl8/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions.html
* igt@kms_flip@flip-vs-suspend@a-dp1:
- shard-kbl: [DMESG-WARN][105] ([i915#180]) -> [PASS][106] +4 similar issues
[105]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10931/shard-kbl7/igt@kms_flip@flip-vs-suspend@a-dp1.html
[106]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-kbl3/igt@kms_flip@flip-vs-suspend@a-dp1.html
* igt@kms_flip@plain-flip-fb-recreate@a-edp1:
- shard-skl: [FAIL][107] ([i915#2122]) -> [PASS][108]
[107]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10931/shard-skl7/igt@kms_flip@plain-flip-fb-recreate@a-edp1.html
[108]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-skl8/igt@kms_flip@plain-flip-fb-recreate@a-edp1.html
* igt@kms_plane_alpha_blend@pipe-a-coverage-7efc:
- shard-skl: [FAIL][109] ([fdo#108145] / [i915#265]) -> [PASS][110]
[109]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10931/shard-skl1/igt@kms_plane_alpha_blend@pipe-a-coverage-7efc.html
[110]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-skl7/igt@kms_plane_alpha_blend@pipe-a-coverage-7efc.html
* igt@kms_psr@psr2_primary_blt:
- shard-iclb: [SKIP][111] ([fdo#109441]) -> [PASS][112]
[111]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10931/shard-iclb3/igt@kms_psr@psr2_primary_blt.html
[112]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-iclb2/igt@kms_psr@psr2_primary_blt.html
* igt@kms_setmode@basic:
- shard-apl: [FAIL][113] ([i915#31]) -> [PASS][114]
[113]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10931/shard-apl1/igt@kms_setmode@basic.html
[114]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-apl8/igt@kms_setmode@basic.html
* igt@prime_vgem@coherency-blt:
- shard-tglb: [INCOMPLETE][115] -> [PASS][116]
[115]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10931/shard-tglb8/igt@prime_vgem@coherency-blt.html
[116]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-tglb5/igt@prime_vgem@coherency-blt.html
* igt@sysfs_heartbeat_interval@mixed@vcs0:
- shard-skl: [WARN][117] ([i915#4055]) -> [PASS][118]
[117]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10931/shard-skl1/igt@sysfs_heartbeat_interval@mixed@vcs0.html
[118]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-skl7/igt@sysfs_heartbeat_interval@mixed@vcs0.html
* igt@sysfs_heartbeat_interval@mixed@vecs0:
- shard-skl: [FAIL][119] ([i915#1731]) -> [PASS][120]
[119]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10931/shard-skl1/igt@sysfs_heartbeat_interval@mixed@vecs0.html
[120]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-skl7/igt@sysfs_heartbeat_interval@mixed@vecs0.html
#### Warnings ####
* igt@i915_pm_dc@dc3co-vpb-simulation:
- shard-iclb: [SKIP][121] ([i915#588]) -> [SKIP][122] ([i915#658])
[121]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10931/shard-iclb2/igt@i915_pm_dc@dc3co-vpb-simulation.html
[122]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-iclb3/igt@i915_pm_dc@dc3co-vpb-simulation.html
* igt@i915_pm_rc6_residency@rc6-fence:
- shard-iclb: [WARN][123] ([i915#2684]) -> [WARN][124] ([i915#1804] / [i915#2684])
[123]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10931/shard-iclb1/igt@i915_pm_rc6_residency@rc6-fence.html
[124]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-iclb4/igt@i915_pm_rc6_residency@rc6-fence.html
* igt@kms_flip@flip-vs-suspend@c-dp1:
- shard-kbl: [DMESG-WARN][125] ([i915#180]) -> [INCOMPLETE][126] ([i915#636])
[125]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10931/shard-kbl7/igt@kms_flip@flip-vs-suspend@c-dp1.html
[126]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-kbl3/igt@kms_flip@flip-vs-suspend@c-dp1.html
* igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-1:
- shard-iclb: [SKIP][127] ([i915#658]) -> [SKIP][128] ([i915#2920]) +3 similar issues
[127]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10931/shard-iclb3/igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-1.html
[128]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-iclb2/igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-1.html
* igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-2:
- shard-iclb: [SKIP][129] ([i915#2920]) -> [SKIP][130] ([i915#658]) +1 similar issue
[129]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10931/shard-iclb2/igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-2.html
[130]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-iclb8/igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-2.html
* igt@kms_psr2_su@page_flip:
- shard-iclb: [SKIP][131] ([fdo#109642] / [fdo#111068] / [i915#658]) -> [FAIL][132] ([i915#4148])
[131]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10931/shard-iclb4/igt@kms_psr2_su@page_flip.html
[132]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-iclb2/igt@kms_psr2_su@page_flip.html
* igt@runner@aborted:
- shard-kbl: ([FAIL][133], [FAIL][134], [FAIL][135], [FAIL][136], [FAIL][137], [FAIL][138], [FAIL][139], [FAIL][140]) ([i915#180] / [i915#1814] / [i915#3002] / [i915#3363] / [i915#4312] / [i915#602]) -> ([FAIL][141], [FAIL][142], [FAIL][143], [FAIL][144], [FAIL][145], [FAIL][146], [FAIL][147], [FAIL][148]) ([i915#1436] / [i915#180] / [i915#1814] / [i915#3002] / [i915#3363] / [i915#4312])
[133]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10931/shard-kbl7/igt@runner@aborted.html
[134]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10931/shard-kbl7/igt@runner@aborted.html
[135]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10931/shard-kbl1/igt@runner@aborted.html
[136]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10931/shard-kbl1/igt@runner@aborted.html
[137]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10931/shard-kbl2/igt@runner@aborted.html
[138]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10931/shard-kbl1/igt@runner@aborted.html
[139]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10931/shard-kbl1/igt@runner@aborted.html
[140]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10931/shard-kbl1/igt@runner@aborted.html
[141]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-kbl1/igt@runner@aborted.html
[142]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-kbl7/igt@runner@aborted.html
[143]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-kbl4/igt@runner@aborted.html
[144]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-kbl1/igt@runner@aborted.html
[145]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-kbl1/igt@runner@aborted.html
[146]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-kbl1/igt@runner@aborted.html
[147]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-kbl7/igt@runner@aborted.html
[148]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/shard-kbl1/igt@runner@aborted.html
- shard-tglb: ([FAIL][149], [FAIL][150], [FAIL][151]) ([i915#2426] / [i915#3002] / [i915#3690] / [i915#4312]) -> ([FA
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21687/index.html
[-- Attachment #2: Type: text/html, Size: 33864 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v4] drm/i915: Use per device iommu check
2021-11-26 14:14 ` [Intel-gfx] " Tvrtko Ursulin
@ 2021-11-30 19:48 ` Lucas De Marchi
-1 siblings, 0 replies; 7+ messages in thread
From: Lucas De Marchi @ 2021-11-30 19:48 UTC (permalink / raw)
To: Tvrtko Ursulin
Cc: Intel-gfx, Tvrtko Ursulin, Robin Murphy, dri-devel, Lu Baolu
On Fri, Nov 26, 2021 at 02:14:24PM +0000, Tvrtko Ursulin wrote:
>From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
>
>With both integrated and discrete Intel GPUs in a system, the current
>global check of intel_iommu_gfx_mapped, as done from intel_vtd_active()
>may not be completely accurate.
>
>In this patch we add i915 parameter to intel_vtd_active() in order to
>prepare it for multiple GPUs and we also change the check away from Intel
>specific intel_iommu_gfx_mapped (global exported by the Intel IOMMU
>driver) to probing the presence of IOMMU on a specific device using
>device_iommu_mapped().
>
>This will return true both for IOMMU pass-through and address translation
>modes which matches the current behaviour. If in the future we wanted to
>distinguish between these two modes we could either use
>iommu_get_domain_for_dev() and check for __IOMMU_DOMAIN_PAGING bit
>indicating address translation, or ask for a new API to be exported from
>the IOMMU core code.
>
>v2:
> * Check for dmar translation specifically, not just iommu domain. (Baolu)
>
>v3:
> * Go back to plain "any domain" check for now, rewrite commit message.
>
>v4:
> * Use device_iommu_mapped. (Robin, Baolu)
>
>Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
>Cc: Lu Baolu <baolu.lu@linux.intel.com>
>Cc: Lucas De Marchi <lucas.demarchi@intel.com>
>Cc: Robin Murphy <robin.murphy@arm.com>
>Acked-by: Robin Murphy <robin.murphy@arm.com>
>Reviewed-by: Lu Baolu <baolu.lu@linux.intel.com>
this last version looks pretty clean.
Also, for patches touching gem / gt we should Cc dri-devel. I'm leaving
the patch below for reference and Cc'ing it. Small nit below,
but can be ignored.
>---
> drivers/gpu/drm/i915/display/intel_bw.c | 2 +-
> drivers/gpu/drm/i915/display/intel_display.c | 2 +-
> drivers/gpu/drm/i915/display/intel_fbc.c | 2 +-
> drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 2 +-
> drivers/gpu/drm/i915/gem/i915_gemfs.c | 2 +-
> drivers/gpu/drm/i915/gt/intel_ggtt.c | 4 ++--
> drivers/gpu/drm/i915/i915_debugfs.c | 1 +
> drivers/gpu/drm/i915/i915_driver.c | 7 +++++++
> drivers/gpu/drm/i915/i915_drv.h | 13 +++++++------
> drivers/gpu/drm/i915/i915_gpu_error.c | 5 +----
> drivers/gpu/drm/i915/intel_device_info.c | 14 +-------------
> drivers/gpu/drm/i915/intel_pm.c | 2 +-
> 12 files changed, 25 insertions(+), 31 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/display/intel_bw.c b/drivers/gpu/drm/i915/display/intel_bw.c
>index abec394f6869..2da4aacc956b 100644
>--- a/drivers/gpu/drm/i915/display/intel_bw.c
>+++ b/drivers/gpu/drm/i915/display/intel_bw.c
>@@ -634,7 +634,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())
>+ if (DISPLAY_VER(dev_priv) >= 13 && intel_vtd_active(dev_priv))
> data_rate = data_rate * 105 / 100;
>
> return data_rate;
>diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
>index b2d51cd79d6c..1ef77ba7f645 100644
>--- a/drivers/gpu/drm/i915/display/intel_display.c
>+++ b/drivers/gpu/drm/i915/display/intel_display.c
>@@ -1293,7 +1293,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() &&
>+ return crtc_state->uapi.async_flip && intel_vtd_active(i915) &&
> (DISPLAY_VER(i915) == 9 || IS_BROADWELL(i915) || IS_HASWELL(i915));
> }
>
>diff --git a/drivers/gpu/drm/i915/display/intel_fbc.c b/drivers/gpu/drm/i915/display/intel_fbc.c
>index d0c34bc3af6c..614e8697c068 100644
>--- a/drivers/gpu/drm/i915/display/intel_fbc.c
>+++ b/drivers/gpu/drm/i915/display/intel_fbc.c
>@@ -1677,7 +1677,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() &&
>+ if (intel_vtd_active(i915) &&
> (IS_SKYLAKE(i915) || IS_BROXTON(i915))) {
> drm_info(&i915->drm,
> "Disabling framebuffer compression (FBC) to prevent screen flicker with VT-d enabled\n");
>diff --git a/drivers/gpu/drm/i915/gem/i915_gem_stolen.c b/drivers/gpu/drm/i915/gem/i915_gem_stolen.c
>index 80680395bb3b..bce03d74a0b4 100644
>--- a/drivers/gpu/drm/i915/gem/i915_gem_stolen.c
>+++ b/drivers/gpu/drm/i915/gem/i915_gem_stolen.c
>@@ -399,7 +399,7 @@ static int i915_gem_init_stolen(struct intel_memory_region *mem)
> return 0;
> }
>
>- if (intel_vtd_active() && GRAPHICS_VER(i915) < 8) {
>+ if (intel_vtd_active(i915) && GRAPHICS_VER(i915) < 8) {
> drm_notice(&i915->drm,
> "%s, disabling use of stolen memory\n",
> "DMAR active");
>diff --git a/drivers/gpu/drm/i915/gem/i915_gemfs.c b/drivers/gpu/drm/i915/gem/i915_gemfs.c
>index dbdbdc344d87..11cd66d183e6 100644
>--- a/drivers/gpu/drm/i915/gem/i915_gemfs.c
>+++ b/drivers/gpu/drm/i915/gem/i915_gemfs.c
>@@ -31,7 +31,7 @@ int i915_gemfs_init(struct drm_i915_private *i915)
> */
>
> opts = NULL;
>- if (intel_vtd_active()) {
>+ if (intel_vtd_active(i915)) {
> if (IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE)) {
> static char huge_opt[] = "huge=within_size"; /* r/w */
>
>diff --git a/drivers/gpu/drm/i915/gt/intel_ggtt.c b/drivers/gpu/drm/i915/gt/intel_ggtt.c
>index 555111c3bee5..110d3944f9a2 100644
>--- a/drivers/gpu/drm/i915/gt/intel_ggtt.c
>+++ b/drivers/gpu/drm/i915/gt/intel_ggtt.c
>@@ -106,7 +106,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())
>+ if (!intel_vtd_active(i915))
> return false;
>
> if (GRAPHICS_VER(i915) == 5 && IS_MOBILE(i915))
>@@ -1233,7 +1233,7 @@ int i915_ggtt_probe_hw(struct drm_i915_private *i915)
> if (ret)
> return ret;
>
>- if (intel_vtd_active())
>+ if (intel_vtd_active(i915))
> drm_info(&i915->drm, "VT-d active for gfx access\n");
>
> return 0;
>diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
>index fe638b5da7c0..390d541f64ea 100644
>--- a/drivers/gpu/drm/i915/i915_debugfs.c
>+++ b/drivers/gpu/drm/i915/i915_debugfs.c
>@@ -65,6 +65,7 @@ static int i915_capabilities(struct seq_file *m, void *data)
>
> intel_device_info_print_static(INTEL_INFO(i915), &p);
> intel_device_info_print_runtime(RUNTIME_INFO(i915), &p);
>+ i915_print_iommu_status(i915, &p);
following the surrounding code, maybe this should be
intel_driver_print_iommu_status()?
Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
thanks
Lucas De Marchi
> intel_gt_info_print(&i915->gt.info, &p);
> intel_driver_caps_print(&i915->caps, &p);
>
>diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
>index a13666627dad..bbc99fc5888f 100644
>--- a/drivers/gpu/drm/i915/i915_driver.c
>+++ b/drivers/gpu/drm/i915/i915_driver.c
>@@ -741,6 +741,12 @@ static void i915_driver_unregister(struct drm_i915_private *dev_priv)
> i915_gem_driver_unregister(dev_priv);
> }
>
>+void
>+i915_print_iommu_status(struct drm_i915_private *i915, struct drm_printer *p)
>+{
>+ drm_printf(p, "iommu: %s\n", enableddisabled(intel_vtd_active(i915)));
>+}
>+
> static void i915_welcome_messages(struct drm_i915_private *dev_priv)
> {
> if (drm_debug_enabled(DRM_UT_DRIVER)) {
>@@ -756,6 +762,7 @@ static void i915_welcome_messages(struct drm_i915_private *dev_priv)
>
> intel_device_info_print_static(INTEL_INFO(dev_priv), &p);
> intel_device_info_print_runtime(RUNTIME_INFO(dev_priv), &p);
>+ i915_print_iommu_status(dev_priv, &p);
> intel_gt_info_print(&dev_priv->gt.info, &p);
> }
>
>diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
>index 1bfadd9127fc..d99e020773ac 100644
>--- a/drivers/gpu/drm/i915/i915_drv.h
>+++ b/drivers/gpu/drm/i915/i915_drv.h
>@@ -1760,26 +1760,27 @@ static inline bool run_as_guest(void)
> #define HAS_D12_PLANE_MINIMIZATION(dev_priv) (IS_ROCKETLAKE(dev_priv) || \
> IS_ALDERLAKE_S(dev_priv))
>
>-static inline bool intel_vtd_active(void)
>+static inline bool intel_vtd_active(struct drm_i915_private *i915)
> {
>-#ifdef CONFIG_INTEL_IOMMU
>- if (intel_iommu_gfx_mapped)
>+ if (device_iommu_mapped(i915->drm.dev))
> return true;
>-#endif
>
> /* 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 GRAPHICS_VER(dev_priv) >= 6 && intel_vtd_active();
>+ return GRAPHICS_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();
>+ return IS_BROXTON(i915) && intel_vtd_active(i915);
> }
>
> static inline bool
>diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
>index b1e4ce0f798f..a485aa4ca669 100644
>--- a/drivers/gpu/drm/i915/i915_gpu_error.c
>+++ b/drivers/gpu/drm/i915/i915_gpu_error.c
>@@ -1754,10 +1754,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 = -1;
>-#ifdef CONFIG_INTEL_IOMMU
>- error->iommu = intel_iommu_gfx_mapped;
>-#endif
>+ error->iommu = intel_vtd_active(i915);
> error->reset_count = i915_reset_count(&i915->gpu_error);
> error->suspend_count = i915->suspend_count;
>
>diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c
>index 6e6b317bc33c..e6605b5181a5 100644
>--- a/drivers/gpu/drm/i915/intel_device_info.c
>+++ b/drivers/gpu/drm/i915/intel_device_info.c
>@@ -83,17 +83,6 @@ const char *intel_platform_name(enum intel_platform platform)
> return platform_names[platform];
> }
>
>-static const char *iommu_name(void)
>-{
>- const char *msg = "n/a";
>-
>-#ifdef CONFIG_INTEL_IOMMU
>- msg = enableddisabled(intel_iommu_gfx_mapped);
>-#endif
>-
>- return msg;
>-}
>-
> void intel_device_info_print_static(const struct intel_device_info *info,
> struct drm_printer *p)
> {
>@@ -114,7 +103,6 @@ void intel_device_info_print_static(const struct intel_device_info *info,
> drm_printf(p, "display version: %u\n", info->display.ver);
>
> drm_printf(p, "gt: %d\n", info->gt);
>- drm_printf(p, "iommu: %s\n", iommu_name());
> drm_printf(p, "memory-regions: %x\n", info->memory_regions);
> drm_printf(p, "page-sizes: %x\n", info->page_sizes);
> drm_printf(p, "platform: %s\n", intel_platform_name(info->platform));
>@@ -374,7 +362,7 @@ 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()) {
>+ if (GRAPHICS_VER(dev_priv) == 6 && intel_vtd_active(dev_priv)) {
> drm_info(&dev_priv->drm,
> "Disabling ppGTT for VT-d support\n");
> info->ppgtt_type = INTEL_PPGTT_NONE;
>diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
>index 01fa3fac1b57..cff0f32bedc9 100644
>--- a/drivers/gpu/drm/i915/intel_pm.c
>+++ b/drivers/gpu/drm/i915/intel_pm.c
>@@ -98,7 +98,7 @@ static void gen9_init_clock_gating(struct drm_i915_private *dev_priv)
> * "Plane N strech max must be programmed to 11b (x1)
> * when Async flips are enabled on that plane."
> */
>- if (!IS_GEMINILAKE(dev_priv) && intel_vtd_active())
>+ if (!IS_GEMINILAKE(dev_priv) && intel_vtd_active(dev_priv))
> intel_uncore_rmw(&dev_priv->uncore, CHICKEN_PIPESL_1(pipe),
> SKL_PLANE1_STRETCH_MAX_MASK, SKL_PLANE1_STRETCH_MAX_X1);
> }
>--
>2.32.0
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Intel-gfx] [PATCH v4] drm/i915: Use per device iommu check
@ 2021-11-30 19:48 ` Lucas De Marchi
0 siblings, 0 replies; 7+ messages in thread
From: Lucas De Marchi @ 2021-11-30 19:48 UTC (permalink / raw)
To: Tvrtko Ursulin; +Cc: Intel-gfx, Robin Murphy, dri-devel, Lu Baolu
On Fri, Nov 26, 2021 at 02:14:24PM +0000, Tvrtko Ursulin wrote:
>From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
>
>With both integrated and discrete Intel GPUs in a system, the current
>global check of intel_iommu_gfx_mapped, as done from intel_vtd_active()
>may not be completely accurate.
>
>In this patch we add i915 parameter to intel_vtd_active() in order to
>prepare it for multiple GPUs and we also change the check away from Intel
>specific intel_iommu_gfx_mapped (global exported by the Intel IOMMU
>driver) to probing the presence of IOMMU on a specific device using
>device_iommu_mapped().
>
>This will return true both for IOMMU pass-through and address translation
>modes which matches the current behaviour. If in the future we wanted to
>distinguish between these two modes we could either use
>iommu_get_domain_for_dev() and check for __IOMMU_DOMAIN_PAGING bit
>indicating address translation, or ask for a new API to be exported from
>the IOMMU core code.
>
>v2:
> * Check for dmar translation specifically, not just iommu domain. (Baolu)
>
>v3:
> * Go back to plain "any domain" check for now, rewrite commit message.
>
>v4:
> * Use device_iommu_mapped. (Robin, Baolu)
>
>Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
>Cc: Lu Baolu <baolu.lu@linux.intel.com>
>Cc: Lucas De Marchi <lucas.demarchi@intel.com>
>Cc: Robin Murphy <robin.murphy@arm.com>
>Acked-by: Robin Murphy <robin.murphy@arm.com>
>Reviewed-by: Lu Baolu <baolu.lu@linux.intel.com>
this last version looks pretty clean.
Also, for patches touching gem / gt we should Cc dri-devel. I'm leaving
the patch below for reference and Cc'ing it. Small nit below,
but can be ignored.
>---
> drivers/gpu/drm/i915/display/intel_bw.c | 2 +-
> drivers/gpu/drm/i915/display/intel_display.c | 2 +-
> drivers/gpu/drm/i915/display/intel_fbc.c | 2 +-
> drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 2 +-
> drivers/gpu/drm/i915/gem/i915_gemfs.c | 2 +-
> drivers/gpu/drm/i915/gt/intel_ggtt.c | 4 ++--
> drivers/gpu/drm/i915/i915_debugfs.c | 1 +
> drivers/gpu/drm/i915/i915_driver.c | 7 +++++++
> drivers/gpu/drm/i915/i915_drv.h | 13 +++++++------
> drivers/gpu/drm/i915/i915_gpu_error.c | 5 +----
> drivers/gpu/drm/i915/intel_device_info.c | 14 +-------------
> drivers/gpu/drm/i915/intel_pm.c | 2 +-
> 12 files changed, 25 insertions(+), 31 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/display/intel_bw.c b/drivers/gpu/drm/i915/display/intel_bw.c
>index abec394f6869..2da4aacc956b 100644
>--- a/drivers/gpu/drm/i915/display/intel_bw.c
>+++ b/drivers/gpu/drm/i915/display/intel_bw.c
>@@ -634,7 +634,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())
>+ if (DISPLAY_VER(dev_priv) >= 13 && intel_vtd_active(dev_priv))
> data_rate = data_rate * 105 / 100;
>
> return data_rate;
>diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
>index b2d51cd79d6c..1ef77ba7f645 100644
>--- a/drivers/gpu/drm/i915/display/intel_display.c
>+++ b/drivers/gpu/drm/i915/display/intel_display.c
>@@ -1293,7 +1293,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() &&
>+ return crtc_state->uapi.async_flip && intel_vtd_active(i915) &&
> (DISPLAY_VER(i915) == 9 || IS_BROADWELL(i915) || IS_HASWELL(i915));
> }
>
>diff --git a/drivers/gpu/drm/i915/display/intel_fbc.c b/drivers/gpu/drm/i915/display/intel_fbc.c
>index d0c34bc3af6c..614e8697c068 100644
>--- a/drivers/gpu/drm/i915/display/intel_fbc.c
>+++ b/drivers/gpu/drm/i915/display/intel_fbc.c
>@@ -1677,7 +1677,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() &&
>+ if (intel_vtd_active(i915) &&
> (IS_SKYLAKE(i915) || IS_BROXTON(i915))) {
> drm_info(&i915->drm,
> "Disabling framebuffer compression (FBC) to prevent screen flicker with VT-d enabled\n");
>diff --git a/drivers/gpu/drm/i915/gem/i915_gem_stolen.c b/drivers/gpu/drm/i915/gem/i915_gem_stolen.c
>index 80680395bb3b..bce03d74a0b4 100644
>--- a/drivers/gpu/drm/i915/gem/i915_gem_stolen.c
>+++ b/drivers/gpu/drm/i915/gem/i915_gem_stolen.c
>@@ -399,7 +399,7 @@ static int i915_gem_init_stolen(struct intel_memory_region *mem)
> return 0;
> }
>
>- if (intel_vtd_active() && GRAPHICS_VER(i915) < 8) {
>+ if (intel_vtd_active(i915) && GRAPHICS_VER(i915) < 8) {
> drm_notice(&i915->drm,
> "%s, disabling use of stolen memory\n",
> "DMAR active");
>diff --git a/drivers/gpu/drm/i915/gem/i915_gemfs.c b/drivers/gpu/drm/i915/gem/i915_gemfs.c
>index dbdbdc344d87..11cd66d183e6 100644
>--- a/drivers/gpu/drm/i915/gem/i915_gemfs.c
>+++ b/drivers/gpu/drm/i915/gem/i915_gemfs.c
>@@ -31,7 +31,7 @@ int i915_gemfs_init(struct drm_i915_private *i915)
> */
>
> opts = NULL;
>- if (intel_vtd_active()) {
>+ if (intel_vtd_active(i915)) {
> if (IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE)) {
> static char huge_opt[] = "huge=within_size"; /* r/w */
>
>diff --git a/drivers/gpu/drm/i915/gt/intel_ggtt.c b/drivers/gpu/drm/i915/gt/intel_ggtt.c
>index 555111c3bee5..110d3944f9a2 100644
>--- a/drivers/gpu/drm/i915/gt/intel_ggtt.c
>+++ b/drivers/gpu/drm/i915/gt/intel_ggtt.c
>@@ -106,7 +106,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())
>+ if (!intel_vtd_active(i915))
> return false;
>
> if (GRAPHICS_VER(i915) == 5 && IS_MOBILE(i915))
>@@ -1233,7 +1233,7 @@ int i915_ggtt_probe_hw(struct drm_i915_private *i915)
> if (ret)
> return ret;
>
>- if (intel_vtd_active())
>+ if (intel_vtd_active(i915))
> drm_info(&i915->drm, "VT-d active for gfx access\n");
>
> return 0;
>diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
>index fe638b5da7c0..390d541f64ea 100644
>--- a/drivers/gpu/drm/i915/i915_debugfs.c
>+++ b/drivers/gpu/drm/i915/i915_debugfs.c
>@@ -65,6 +65,7 @@ static int i915_capabilities(struct seq_file *m, void *data)
>
> intel_device_info_print_static(INTEL_INFO(i915), &p);
> intel_device_info_print_runtime(RUNTIME_INFO(i915), &p);
>+ i915_print_iommu_status(i915, &p);
following the surrounding code, maybe this should be
intel_driver_print_iommu_status()?
Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
thanks
Lucas De Marchi
> intel_gt_info_print(&i915->gt.info, &p);
> intel_driver_caps_print(&i915->caps, &p);
>
>diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
>index a13666627dad..bbc99fc5888f 100644
>--- a/drivers/gpu/drm/i915/i915_driver.c
>+++ b/drivers/gpu/drm/i915/i915_driver.c
>@@ -741,6 +741,12 @@ static void i915_driver_unregister(struct drm_i915_private *dev_priv)
> i915_gem_driver_unregister(dev_priv);
> }
>
>+void
>+i915_print_iommu_status(struct drm_i915_private *i915, struct drm_printer *p)
>+{
>+ drm_printf(p, "iommu: %s\n", enableddisabled(intel_vtd_active(i915)));
>+}
>+
> static void i915_welcome_messages(struct drm_i915_private *dev_priv)
> {
> if (drm_debug_enabled(DRM_UT_DRIVER)) {
>@@ -756,6 +762,7 @@ static void i915_welcome_messages(struct drm_i915_private *dev_priv)
>
> intel_device_info_print_static(INTEL_INFO(dev_priv), &p);
> intel_device_info_print_runtime(RUNTIME_INFO(dev_priv), &p);
>+ i915_print_iommu_status(dev_priv, &p);
> intel_gt_info_print(&dev_priv->gt.info, &p);
> }
>
>diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
>index 1bfadd9127fc..d99e020773ac 100644
>--- a/drivers/gpu/drm/i915/i915_drv.h
>+++ b/drivers/gpu/drm/i915/i915_drv.h
>@@ -1760,26 +1760,27 @@ static inline bool run_as_guest(void)
> #define HAS_D12_PLANE_MINIMIZATION(dev_priv) (IS_ROCKETLAKE(dev_priv) || \
> IS_ALDERLAKE_S(dev_priv))
>
>-static inline bool intel_vtd_active(void)
>+static inline bool intel_vtd_active(struct drm_i915_private *i915)
> {
>-#ifdef CONFIG_INTEL_IOMMU
>- if (intel_iommu_gfx_mapped)
>+ if (device_iommu_mapped(i915->drm.dev))
> return true;
>-#endif
>
> /* 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 GRAPHICS_VER(dev_priv) >= 6 && intel_vtd_active();
>+ return GRAPHICS_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();
>+ return IS_BROXTON(i915) && intel_vtd_active(i915);
> }
>
> static inline bool
>diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
>index b1e4ce0f798f..a485aa4ca669 100644
>--- a/drivers/gpu/drm/i915/i915_gpu_error.c
>+++ b/drivers/gpu/drm/i915/i915_gpu_error.c
>@@ -1754,10 +1754,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 = -1;
>-#ifdef CONFIG_INTEL_IOMMU
>- error->iommu = intel_iommu_gfx_mapped;
>-#endif
>+ error->iommu = intel_vtd_active(i915);
> error->reset_count = i915_reset_count(&i915->gpu_error);
> error->suspend_count = i915->suspend_count;
>
>diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c
>index 6e6b317bc33c..e6605b5181a5 100644
>--- a/drivers/gpu/drm/i915/intel_device_info.c
>+++ b/drivers/gpu/drm/i915/intel_device_info.c
>@@ -83,17 +83,6 @@ const char *intel_platform_name(enum intel_platform platform)
> return platform_names[platform];
> }
>
>-static const char *iommu_name(void)
>-{
>- const char *msg = "n/a";
>-
>-#ifdef CONFIG_INTEL_IOMMU
>- msg = enableddisabled(intel_iommu_gfx_mapped);
>-#endif
>-
>- return msg;
>-}
>-
> void intel_device_info_print_static(const struct intel_device_info *info,
> struct drm_printer *p)
> {
>@@ -114,7 +103,6 @@ void intel_device_info_print_static(const struct intel_device_info *info,
> drm_printf(p, "display version: %u\n", info->display.ver);
>
> drm_printf(p, "gt: %d\n", info->gt);
>- drm_printf(p, "iommu: %s\n", iommu_name());
> drm_printf(p, "memory-regions: %x\n", info->memory_regions);
> drm_printf(p, "page-sizes: %x\n", info->page_sizes);
> drm_printf(p, "platform: %s\n", intel_platform_name(info->platform));
>@@ -374,7 +362,7 @@ 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()) {
>+ if (GRAPHICS_VER(dev_priv) == 6 && intel_vtd_active(dev_priv)) {
> drm_info(&dev_priv->drm,
> "Disabling ppGTT for VT-d support\n");
> info->ppgtt_type = INTEL_PPGTT_NONE;
>diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
>index 01fa3fac1b57..cff0f32bedc9 100644
>--- a/drivers/gpu/drm/i915/intel_pm.c
>+++ b/drivers/gpu/drm/i915/intel_pm.c
>@@ -98,7 +98,7 @@ static void gen9_init_clock_gating(struct drm_i915_private *dev_priv)
> * "Plane N strech max must be programmed to 11b (x1)
> * when Async flips are enabled on that plane."
> */
>- if (!IS_GEMINILAKE(dev_priv) && intel_vtd_active())
>+ if (!IS_GEMINILAKE(dev_priv) && intel_vtd_active(dev_priv))
> intel_uncore_rmw(&dev_priv->uncore, CHICKEN_PIPESL_1(pipe),
> SKL_PLANE1_STRETCH_MAX_MASK, SKL_PLANE1_STRETCH_MAX_X1);
> }
>--
>2.32.0
>
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2021-11-30 19:49 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-26 14:14 [PATCH v4] drm/i915: Use per device iommu check Tvrtko Ursulin
2021-11-26 14:14 ` [Intel-gfx] " Tvrtko Ursulin
2021-11-26 17:13 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for drm/i915: Use per device iommu check (rev4) Patchwork
2021-11-26 17:51 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2021-11-26 20:02 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
2021-11-30 19:48 ` [PATCH v4] drm/i915: Use per device iommu check Lucas De Marchi
2021-11-30 19:48 ` [Intel-gfx] " Lucas De Marchi
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.