All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] drm/i915: Perform GGTT restore much earlier during resume
@ 2019-09-07  8:35 Chris Wilson
  2019-09-07  8:57 ` [PATCH v2] " Chris Wilson
                   ` (5 more replies)
  0 siblings, 6 replies; 7+ messages in thread
From: Chris Wilson @ 2019-09-07  8:35 UTC (permalink / raw)
  To: intel-gfx
  Cc: Chris Wilson, Mika Kuoppala, Martin Peres, Joonas Lahtinen,
	stable

As soon as we re-enable the various functions within the HW, they may go
off and read data via a GGTT offset. Hence, if we have not yet restored
the GGTT PTE before then, they may read and even *write* random locations
in memory.

Detected by DMAR faults during resume.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Cc: Martin Peres <martin.peres@linux.intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: stable@vger.kernel.org
---
 drivers/gpu/drm/i915/gem/i915_gem_pm.c | 3 ---
 drivers/gpu/drm/i915/i915_drv.c        | 5 +++++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_pm.c b/drivers/gpu/drm/i915/gem/i915_gem_pm.c
index b3993d24b83d..9b1129aaacfe 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_pm.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_pm.c
@@ -242,9 +242,6 @@ void i915_gem_resume(struct drm_i915_private *i915)
 	mutex_lock(&i915->drm.struct_mutex);
 	intel_uncore_forcewake_get(&i915->uncore, FORCEWAKE_ALL);
 
-	i915_gem_restore_gtt_mappings(i915);
-	i915_gem_restore_fences(i915);
-
 	if (i915_gem_init_hw(i915))
 		goto err_wedged;
 
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 7b2c81a8bbaa..1af4eba968c0 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -1877,6 +1877,11 @@ static int i915_drm_resume(struct drm_device *dev)
 	if (ret)
 		DRM_ERROR("failed to re-enable GGTT\n");
 
+	mutex_lock(&dev_priv->drm.struct_mutex);
+	i915_gem_restore_gtt_mappings(dev_priv);
+	i915_gem_restore_fences(dev_priv);
+	mutex_unlock(&dev_priv->drm.struct_mutex);
+
 	intel_csr_ucode_resume(dev_priv);
 
 	i915_restore_state(dev_priv);
-- 
2.23.0

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [PATCH v2] drm/i915: Perform GGTT restore much earlier during resume
  2019-09-07  8:35 [PATCH] drm/i915: Perform GGTT restore much earlier during resume Chris Wilson
@ 2019-09-07  8:57 ` Chris Wilson
  2019-09-07 10:08 ` ✗ Fi.CI.BAT: failure for drm/i915: Perform GGTT restore much earlier during resume (rev2) Patchwork
                   ` (4 subsequent siblings)
  5 siblings, 0 replies; 7+ messages in thread
From: Chris Wilson @ 2019-09-07  8:57 UTC (permalink / raw)
  To: intel-gfx
  Cc: Chris Wilson, Mika Kuoppala, Martin Peres, Joonas Lahtinen,
	stable

As soon as we re-enable the various functions within the HW, they may go
off and read data via a GGTT offset. Hence, if we have not yet restored
the GGTT PTE before then, they may read and even *write* random locations
in memory.

Detected by DMAR faults during resume.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Cc: Martin Peres <martin.peres@linux.intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: stable@vger.kernel.org
---
Don't forget the selftest!
---
 drivers/gpu/drm/i915/gem/i915_gem_pm.c    | 3 ---
 drivers/gpu/drm/i915/i915_drv.c           | 5 +++++
 drivers/gpu/drm/i915/selftests/i915_gem.c | 2 ++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_pm.c b/drivers/gpu/drm/i915/gem/i915_gem_pm.c
index b3993d24b83d..9b1129aaacfe 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_pm.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_pm.c
@@ -242,9 +242,6 @@ void i915_gem_resume(struct drm_i915_private *i915)
 	mutex_lock(&i915->drm.struct_mutex);
 	intel_uncore_forcewake_get(&i915->uncore, FORCEWAKE_ALL);
 
-	i915_gem_restore_gtt_mappings(i915);
-	i915_gem_restore_fences(i915);
-
 	if (i915_gem_init_hw(i915))
 		goto err_wedged;
 
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 7b2c81a8bbaa..1af4eba968c0 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -1877,6 +1877,11 @@ static int i915_drm_resume(struct drm_device *dev)
 	if (ret)
 		DRM_ERROR("failed to re-enable GGTT\n");
 
+	mutex_lock(&dev_priv->drm.struct_mutex);
+	i915_gem_restore_gtt_mappings(dev_priv);
+	i915_gem_restore_fences(dev_priv);
+	mutex_unlock(&dev_priv->drm.struct_mutex);
+
 	intel_csr_ucode_resume(dev_priv);
 
 	i915_restore_state(dev_priv);
diff --git a/drivers/gpu/drm/i915/selftests/i915_gem.c b/drivers/gpu/drm/i915/selftests/i915_gem.c
index bb6dd54a6ff3..9fba902b8aad 100644
--- a/drivers/gpu/drm/i915/selftests/i915_gem.c
+++ b/drivers/gpu/drm/i915/selftests/i915_gem.c
@@ -118,6 +118,8 @@ static void pm_resume(struct drm_i915_private *i915)
 	with_intel_runtime_pm(&i915->runtime_pm, wakeref) {
 		intel_gt_sanitize(&i915->gt, false);
 		i915_gem_sanitize(i915);
+		i915_gem_restore_gtt_mappings(i915);
+		i915_gem_restore_fences(i915);
 		i915_gem_resume(i915);
 	}
 }
-- 
2.23.0

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* ✗ Fi.CI.BAT: failure for drm/i915: Perform GGTT restore much earlier during resume (rev2)
  2019-09-07  8:35 [PATCH] drm/i915: Perform GGTT restore much earlier during resume Chris Wilson
  2019-09-07  8:57 ` [PATCH v2] " Chris Wilson
@ 2019-09-07 10:08 ` Patchwork
  2019-09-07 10:18 ` [PATCH v3] drm/i915: Perform GGTT restore much earlier during resume Chris Wilson
                   ` (3 subsequent siblings)
  5 siblings, 0 replies; 7+ messages in thread
From: Patchwork @ 2019-09-07 10:08 UTC (permalink / raw)
  To: Chris Wilson; +Cc: intel-gfx

== Series Details ==

Series: drm/i915: Perform GGTT restore much earlier during resume (rev2)
URL   : https://patchwork.freedesktop.org/series/66369/
State : failure

== Summary ==

CI Bug Log - changes from CI_DRM_6848 -> Patchwork_14311
====================================================

Summary
-------

  **FAILURE**

  Serious unknown changes coming with Patchwork_14311 absolutely need to be
  verified manually.
  
  If you think the reported changes have nothing to do with the changes
  introduced in Patchwork_14311, please notify your bug team to allow them
  to document this new failure mode, which will reduce false positives in CI.

  External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14311/

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

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

### IGT changes ###

#### Possible regressions ####

  * igt@i915_selftest@live_gem:
    - fi-snb-2600:        [PASS][1] -> [DMESG-WARN][2]
   [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6848/fi-snb-2600/igt@i915_selftest@live_gem.html
   [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14311/fi-snb-2600/igt@i915_selftest@live_gem.html
    - fi-skl-6260u:       [PASS][3] -> [DMESG-WARN][4]
   [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6848/fi-skl-6260u/igt@i915_selftest@live_gem.html
   [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14311/fi-skl-6260u/igt@i915_selftest@live_gem.html
    - fi-hsw-4770r:       [PASS][5] -> [DMESG-WARN][6]
   [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6848/fi-hsw-4770r/igt@i915_selftest@live_gem.html
   [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14311/fi-hsw-4770r/igt@i915_selftest@live_gem.html
    - fi-skl-gvtdvm:      [PASS][7] -> [DMESG-WARN][8]
   [7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6848/fi-skl-gvtdvm/igt@i915_selftest@live_gem.html
   [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14311/fi-skl-gvtdvm/igt@i915_selftest@live_gem.html
    - fi-kbl-x1275:       [PASS][9] -> [DMESG-WARN][10]
   [9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6848/fi-kbl-x1275/igt@i915_selftest@live_gem.html
   [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14311/fi-kbl-x1275/igt@i915_selftest@live_gem.html
    - fi-kbl-r:           [PASS][11] -> [DMESG-WARN][12]
   [11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6848/fi-kbl-r/igt@i915_selftest@live_gem.html
   [12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14311/fi-kbl-r/igt@i915_selftest@live_gem.html
    - fi-bwr-2160:        [PASS][13] -> [DMESG-WARN][14]
   [13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6848/fi-bwr-2160/igt@i915_selftest@live_gem.html
   [14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14311/fi-bwr-2160/igt@i915_selftest@live_gem.html
    - fi-bdw-5557u:       [PASS][15] -> [DMESG-WARN][16]
   [15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6848/fi-bdw-5557u/igt@i915_selftest@live_gem.html
   [16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14311/fi-bdw-5557u/igt@i915_selftest@live_gem.html
    - fi-skl-guc:         [PASS][17] -> [DMESG-WARN][18]
   [17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6848/fi-skl-guc/igt@i915_selftest@live_gem.html
   [18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14311/fi-skl-guc/igt@i915_selftest@live_gem.html
    - fi-kbl-8809g:       [PASS][19] -> [DMESG-WARN][20]
   [19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6848/fi-kbl-8809g/igt@i915_selftest@live_gem.html
   [20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14311/fi-kbl-8809g/igt@i915_selftest@live_gem.html
    - fi-kbl-guc:         [PASS][21] -> [DMESG-WARN][22]
   [21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6848/fi-kbl-guc/igt@i915_selftest@live_gem.html
   [22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14311/fi-kbl-guc/igt@i915_selftest@live_gem.html
    - fi-skl-6600u:       [PASS][23] -> [DMESG-WARN][24]
   [23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6848/fi-skl-6600u/igt@i915_selftest@live_gem.html
   [24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14311/fi-skl-6600u/igt@i915_selftest@live_gem.html
    - fi-hsw-4770:        [PASS][25] -> [DMESG-WARN][26]
   [25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6848/fi-hsw-4770/igt@i915_selftest@live_gem.html
   [26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14311/fi-hsw-4770/igt@i915_selftest@live_gem.html
    - fi-byt-j1900:       [PASS][27] -> [DMESG-WARN][28]
   [27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6848/fi-byt-j1900/igt@i915_selftest@live_gem.html
   [28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14311/fi-byt-j1900/igt@i915_selftest@live_gem.html
    - fi-cfl-8700k:       [PASS][29] -> [DMESG-WARN][30]
   [29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6848/fi-cfl-8700k/igt@i915_selftest@live_gem.html
   [30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14311/fi-cfl-8700k/igt@i915_selftest@live_gem.html
    - fi-whl-u:           [PASS][31] -> [DMESG-WARN][32]
   [31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6848/fi-whl-u/igt@i915_selftest@live_gem.html
   [32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14311/fi-whl-u/igt@i915_selftest@live_gem.html
    - fi-apl-guc:         [PASS][33] -> [DMESG-WARN][34]
   [33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6848/fi-apl-guc/igt@i915_selftest@live_gem.html
   [34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14311/fi-apl-guc/igt@i915_selftest@live_gem.html
    - fi-cml-u2:          [PASS][35] -> [DMESG-WARN][36]
   [35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6848/fi-cml-u2/igt@i915_selftest@live_gem.html
   [36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14311/fi-cml-u2/igt@i915_selftest@live_gem.html
    - fi-ivb-3770:        [PASS][37] -> [DMESG-WARN][38]
   [37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6848/fi-ivb-3770/igt@i915_selftest@live_gem.html
   [38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14311/fi-ivb-3770/igt@i915_selftest@live_gem.html
    - fi-bxt-dsi:         [PASS][39] -> [DMESG-WARN][40]
   [39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6848/fi-bxt-dsi/igt@i915_selftest@live_gem.html
   [40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14311/fi-bxt-dsi/igt@i915_selftest@live_gem.html
    - fi-skl-iommu:       [PASS][41] -> [DMESG-WARN][42]
   [41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6848/fi-skl-iommu/igt@i915_selftest@live_gem.html
   [42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14311/fi-skl-iommu/igt@i915_selftest@live_gem.html
    - fi-cfl-guc:         [PASS][43] -> [DMESG-WARN][44]
   [43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6848/fi-cfl-guc/igt@i915_selftest@live_gem.html
   [44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14311/fi-cfl-guc/igt@i915_selftest@live_gem.html
    - fi-bsw-n3050:       [PASS][45] -> [DMESG-WARN][46]
   [45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6848/fi-bsw-n3050/igt@i915_selftest@live_gem.html
   [46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14311/fi-bsw-n3050/igt@i915_selftest@live_gem.html
    - fi-hsw-peppy:       [PASS][47] -> [DMESG-WARN][48]
   [47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6848/fi-hsw-peppy/igt@i915_selftest@live_gem.html
   [48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14311/fi-hsw-peppy/igt@i915_selftest@live_gem.html
    - fi-icl-u3:          NOTRUN -> [DMESG-WARN][49]
   [49]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14311/fi-icl-u3/igt@i915_selftest@live_gem.html
    - fi-gdg-551:         [PASS][50] -> [DMESG-WARN][51]
   [50]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6848/fi-gdg-551/igt@i915_selftest@live_gem.html
   [51]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14311/fi-gdg-551/igt@i915_selftest@live_gem.html
    - fi-glk-dsi:         [PASS][52] -> [DMESG-WARN][53]
   [52]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6848/fi-glk-dsi/igt@i915_selftest@live_gem.html
   [53]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14311/fi-glk-dsi/igt@i915_selftest@live_gem.html
    - fi-cfl-8109u:       [PASS][54] -> [DMESG-WARN][55]
   [54]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6848/fi-cfl-8109u/igt@i915_selftest@live_gem.html
   [55]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14311/fi-cfl-8109u/igt@i915_selftest@live_gem.html
    - fi-bdw-gvtdvm:      [PASS][56] -> [DMESG-WARN][57]
   [56]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6848/fi-bdw-gvtdvm/igt@i915_selftest@live_gem.html
   [57]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14311/fi-bdw-gvtdvm/igt@i915_selftest@live_gem.html
    - fi-pnv-d510:        [PASS][58] -> [DMESG-WARN][59]
   [58]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6848/fi-pnv-d510/igt@i915_selftest@live_gem.html
   [59]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14311/fi-pnv-d510/igt@i915_selftest@live_gem.html
    - fi-snb-2520m:       [PASS][60] -> [DMESG-WARN][61]
   [60]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6848/fi-snb-2520m/igt@i915_selftest@live_gem.html
   [61]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14311/fi-snb-2520m/igt@i915_selftest@live_gem.html
    - fi-skl-lmem:        [PASS][62] -> [DMESG-WARN][63]
   [62]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6848/fi-skl-lmem/igt@i915_selftest@live_gem.html
   [63]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14311/fi-skl-lmem/igt@i915_selftest@live_gem.html
    - fi-byt-n2820:       [PASS][64] -> [DMESG-WARN][65]
   [64]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6848/fi-byt-n2820/igt@i915_selftest@live_gem.html
   [65]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14311/fi-byt-n2820/igt@i915_selftest@live_gem.html
    - fi-elk-e7500:       [PASS][66] -> [DMESG-WARN][67]
   [66]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6848/fi-elk-e7500/igt@i915_selftest@live_gem.html
   [67]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14311/fi-elk-e7500/igt@i915_selftest@live_gem.html
    - fi-ilk-650:         [PASS][68] -> [DMESG-WARN][69]
   [68]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6848/fi-ilk-650/igt@i915_selftest@live_gem.html
   [69]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14311/fi-ilk-650/igt@i915_selftest@live_gem.html
    - fi-bsw-kefka:       [PASS][70] -> [DMESG-WARN][71]
   [70]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6848/fi-bsw-kefka/igt@i915_selftest@live_gem.html
   [71]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14311/fi-bsw-kefka/igt@i915_selftest@live_gem.html

  * igt@runner@aborted:
    - fi-ilk-650:         NOTRUN -> [FAIL][72]
   [72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14311/fi-ilk-650/igt@runner@aborted.html
    - fi-pnv-d510:        NOTRUN -> [FAIL][73]
   [73]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14311/fi-pnv-d510/igt@runner@aborted.html
    - fi-bdw-gvtdvm:      NOTRUN -> [FAIL][74]
   [74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14311/fi-bdw-gvtdvm/igt@runner@aborted.html
    - fi-cfl-8109u:       NOTRUN -> [FAIL][75]
   [75]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14311/fi-cfl-8109u/igt@runner@aborted.html
    - fi-gdg-551:         NOTRUN -> [FAIL][76]
   [76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14311/fi-gdg-551/igt@runner@aborted.html
    - fi-whl-u:           NOTRUN -> [FAIL][77]
   [77]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14311/fi-whl-u/igt@runner@aborted.html
    - fi-cml-u2:          NOTRUN -> [FAIL][78]
   [78]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14311/fi-cml-u2/igt@runner@aborted.html
    - fi-bxt-dsi:         NOTRUN -> [FAIL][79]
   [79]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14311/fi-bxt-dsi/igt@runner@aborted.html
    - fi-kbl-x1275:       NOTRUN -> [FAIL][80]
   [80]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14311/fi-kbl-x1275/igt@runner@aborted.html
    - fi-cfl-8700k:       NOTRUN -> [FAIL][81]
   [81]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14311/fi-cfl-8700k/igt@runner@aborted.html
    - fi-kbl-8809g:       NOTRUN -> [FAIL][82]
   [82]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14311/fi-kbl-8809g/igt@runner@aborted.html
    - fi-kbl-r:           NOTRUN -> [FAIL][83]
   [83]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14311/fi-kbl-r/igt@runner@aborted.html
    - fi-bdw-5557u:       NOTRUN -> [FAIL][84]
   [84]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14311/fi-bdw-5557u/igt@runner@aborted.html

  
#### Suppressed ####

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

  * igt@gem_exec_gttfill@basic:
    - {fi-tgl-u}:         NOTRUN -> [INCOMPLETE][85]
   [85]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14311/fi-tgl-u/igt@gem_exec_gttfill@basic.html

  * igt@i915_selftest@live_gem:
    - {fi-icl-u4}:        [PASS][86] -> [DMESG-WARN][87]
   [86]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6848/fi-icl-u4/igt@i915_selftest@live_gem.html
   [87]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14311/fi-icl-u4/igt@i915_selftest@live_gem.html
    - {fi-icl-dsi}:       [PASS][88] -> [DMESG-WARN][89]
   [88]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6848/fi-icl-dsi/igt@i915_selftest@live_gem.html
   [89]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14311/fi-icl-dsi/igt@i915_selftest@live_gem.html
    - {fi-icl-guc}:       [PASS][90] -> [DMESG-WARN][91]
   [90]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6848/fi-icl-guc/igt@i915_selftest@live_gem.html
   [91]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14311/fi-icl-guc/igt@i915_selftest@live_gem.html
    - {fi-kbl-soraka}:    NOTRUN -> [DMESG-WARN][92]
   [92]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14311/fi-kbl-soraka/igt@i915_selftest@live_gem.html

  * igt@runner@aborted:
    - {fi-kbl-soraka}:    NOTRUN -> [FAIL][93]
   [93]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14311/fi-kbl-soraka/igt@runner@aborted.html

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

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

### IGT changes ###

#### Issues hit ####

  * igt@gem_ctx_switch@rcs0:
    - fi-icl-u2:          [PASS][94] -> [INCOMPLETE][95] ([fdo#107713])
   [94]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6848/fi-icl-u2/igt@gem_ctx_switch@rcs0.html
   [95]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14311/fi-icl-u2/igt@gem_ctx_switch@rcs0.html

  * igt@i915_module_load@reload:
    - fi-blb-e6850:       [PASS][96] -> [INCOMPLETE][97] ([fdo#107718])
   [96]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6848/fi-blb-e6850/igt@i915_module_load@reload.html
   [97]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14311/fi-blb-e6850/igt@i915_module_load@reload.html

  
#### Possible fixes ####

  * igt@gem_ctx_create@basic-files:
    - fi-icl-u3:          [INCOMPLETE][98] ([fdo#107713] / [fdo#109100]) -> [PASS][99]
   [98]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6848/fi-icl-u3/igt@gem_ctx_create@basic-files.html
   [99]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14311/fi-icl-u3/igt@gem_ctx_create@basic-files.html

  * igt@kms_busy@basic-flip-c:
    - {fi-icl-u4}:        [DMESG-WARN][100] ([fdo#105602]) -> [PASS][101] +5 similar issues
   [100]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6848/fi-icl-u4/igt@kms_busy@basic-flip-c.html
   [101]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14311/fi-icl-u4/igt@kms_busy@basic-flip-c.html

  * igt@kms_chamelium@hdmi-edid-read:
    - {fi-icl-u4}:        [FAIL][102] ([fdo#111045]) -> [PASS][103] +1 similar issue
   [102]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6848/fi-icl-u4/igt@kms_chamelium@hdmi-edid-read.html
   [103]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14311/fi-icl-u4/igt@kms_chamelium@hdmi-edid-read.html

  * igt@prime_vgem@basic-fence-flip:
    - fi-ilk-650:         [DMESG-WARN][104] ([fdo#106387]) -> [PASS][105] +1 similar issue
   [104]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6848/fi-ilk-650/igt@prime_vgem@basic-fence-flip.html
   [105]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14311/fi-ilk-650/igt@prime_vgem@basic-fence-flip.html

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

  [fdo#102505]: https://bugs.freedesktop.org/show_bug.cgi?id=102505
  [fdo#105602]: https://bugs.freedesktop.org/show_bug.cgi?id=105602
  [fdo#106107]: https://bugs.freedesktop.org/show_bug.cgi?id=106107
  [fdo#106387]: https://bugs.freedesktop.org/show_bug.cgi?id=106387
  [fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
  [fdo#107718]: https://bugs.freedesktop.org/show_bug.cgi?id=107718
  [fdo#109100]: https://bugs.freedesktop.org/show_bug.cgi?id=109100
  [fdo#111045]: https://bugs.freedesktop.org/show_bug.cgi?id=111045
  [fdo#111049]: https://bugs.freedesktop.org/show_bug.cgi?id=111049


Participating hosts (50 -> 44)
------------------------------

  Additional (2): fi-kbl-soraka fi-tgl-u 
  Missing    (8): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-kbl-7500u fi-icl-y fi-byt-clapper fi-bdw-samus 


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

  * CI: CI-20190529 -> None
  * Linux: CI_DRM_6848 -> Patchwork_14311

  CI-20190529: 20190529
  CI_DRM_6848: a1769d05ffa7fe6e4481131e97215f37b8f5ed4e @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_5172: 073caf4acb7cac63abe7a5e1409ea27a764db5fd @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
  Patchwork_14311: a1f8db0ad6457127a01b4cd827cf9f9d6b06bf2a @ git://anongit.freedesktop.org/gfx-ci/linux


== Linux commits ==

a1f8db0ad645 drm/i915: Perform GGTT restore much earlier during resume

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14311/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH v3] drm/i915: Perform GGTT restore much earlier during resume
  2019-09-07  8:35 [PATCH] drm/i915: Perform GGTT restore much earlier during resume Chris Wilson
  2019-09-07  8:57 ` [PATCH v2] " Chris Wilson
  2019-09-07 10:08 ` ✗ Fi.CI.BAT: failure for drm/i915: Perform GGTT restore much earlier during resume (rev2) Patchwork
@ 2019-09-07 10:18 ` Chris Wilson
  2019-09-07 11:02 ` ✓ Fi.CI.BAT: success for drm/i915: Perform GGTT restore much earlier during resume (rev3) Patchwork
                   ` (2 subsequent siblings)
  5 siblings, 0 replies; 7+ messages in thread
From: Chris Wilson @ 2019-09-07 10:18 UTC (permalink / raw)
  To: intel-gfx
  Cc: Chris Wilson, Mika Kuoppala, Martin Peres, Joonas Lahtinen,
	stable

As soon as we re-enable the various functions within the HW, they may go
off and read data via a GGTT offset. Hence, if we have not yet restored
the GGTT PTE before then, they may read and even *write* random locations
in memory.

Detected by DMAR faults during resume.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Cc: Martin Peres <martin.peres@linux.intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: stable@vger.kernel.org
---
I assumed the selftest had struct_mutex already, it did not.
---
 drivers/gpu/drm/i915/gem/i915_gem_pm.c    | 3 ---
 drivers/gpu/drm/i915/i915_drv.c           | 5 +++++
 drivers/gpu/drm/i915/selftests/i915_gem.c | 6 ++++++
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_pm.c b/drivers/gpu/drm/i915/gem/i915_gem_pm.c
index b3993d24b83d..9b1129aaacfe 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_pm.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_pm.c
@@ -242,9 +242,6 @@ void i915_gem_resume(struct drm_i915_private *i915)
 	mutex_lock(&i915->drm.struct_mutex);
 	intel_uncore_forcewake_get(&i915->uncore, FORCEWAKE_ALL);
 
-	i915_gem_restore_gtt_mappings(i915);
-	i915_gem_restore_fences(i915);
-
 	if (i915_gem_init_hw(i915))
 		goto err_wedged;
 
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 7b2c81a8bbaa..1af4eba968c0 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -1877,6 +1877,11 @@ static int i915_drm_resume(struct drm_device *dev)
 	if (ret)
 		DRM_ERROR("failed to re-enable GGTT\n");
 
+	mutex_lock(&dev_priv->drm.struct_mutex);
+	i915_gem_restore_gtt_mappings(dev_priv);
+	i915_gem_restore_fences(dev_priv);
+	mutex_unlock(&dev_priv->drm.struct_mutex);
+
 	intel_csr_ucode_resume(dev_priv);
 
 	i915_restore_state(dev_priv);
diff --git a/drivers/gpu/drm/i915/selftests/i915_gem.c b/drivers/gpu/drm/i915/selftests/i915_gem.c
index bb6dd54a6ff3..37593831b539 100644
--- a/drivers/gpu/drm/i915/selftests/i915_gem.c
+++ b/drivers/gpu/drm/i915/selftests/i915_gem.c
@@ -118,6 +118,12 @@ static void pm_resume(struct drm_i915_private *i915)
 	with_intel_runtime_pm(&i915->runtime_pm, wakeref) {
 		intel_gt_sanitize(&i915->gt, false);
 		i915_gem_sanitize(i915);
+
+		mutex_lock(&i915->drm.struct_mutex);
+		i915_gem_restore_gtt_mappings(i915);
+		i915_gem_restore_fences(i915);
+		mutex_unlock(&i915->drm.struct_mutex);
+
 		i915_gem_resume(i915);
 	}
 }
-- 
2.23.0

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* ✓ Fi.CI.BAT: success for drm/i915: Perform GGTT restore much earlier during resume (rev3)
  2019-09-07  8:35 [PATCH] drm/i915: Perform GGTT restore much earlier during resume Chris Wilson
                   ` (2 preceding siblings ...)
  2019-09-07 10:18 ` [PATCH v3] drm/i915: Perform GGTT restore much earlier during resume Chris Wilson
@ 2019-09-07 11:02 ` Patchwork
  2019-09-07 13:13 ` ✓ Fi.CI.IGT: " Patchwork
  2019-09-07 21:44 ` [PATCH] drm/i915: Perform GGTT restore much earlier during resume Sasha Levin
  5 siblings, 0 replies; 7+ messages in thread
From: Patchwork @ 2019-09-07 11:02 UTC (permalink / raw)
  To: Chris Wilson; +Cc: intel-gfx

== Series Details ==

Series: drm/i915: Perform GGTT restore much earlier during resume (rev3)
URL   : https://patchwork.freedesktop.org/series/66369/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_6849 -> Patchwork_14312
====================================================

Summary
-------

  **SUCCESS**

  No regressions found.

  External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14312/

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

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

### IGT changes ###

#### Possible fixes ####

  * igt@gem_exec_suspend@basic-s3:
    - fi-blb-e6850:       [INCOMPLETE][1] ([fdo#107718]) -> [PASS][2]
   [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6849/fi-blb-e6850/igt@gem_exec_suspend@basic-s3.html
   [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14312/fi-blb-e6850/igt@gem_exec_suspend@basic-s3.html

  * igt@i915_module_load@reload-no-display:
    - fi-icl-u3:          [DMESG-WARN][3] ([fdo#107724]) -> [PASS][4]
   [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6849/fi-icl-u3/igt@i915_module_load@reload-no-display.html
   [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14312/fi-icl-u3/igt@i915_module_load@reload-no-display.html

  
#### Warnings ####

  * igt@kms_chamelium@hdmi-hpd-fast:
    - fi-kbl-7500u:       [FAIL][5] ([fdo#111096]) -> [FAIL][6] ([fdo#111407])
   [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6849/fi-kbl-7500u/igt@kms_chamelium@hdmi-hpd-fast.html
   [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14312/fi-kbl-7500u/igt@kms_chamelium@hdmi-hpd-fast.html

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

  [fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
  [fdo#107718]: https://bugs.freedesktop.org/show_bug.cgi?id=107718
  [fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724
  [fdo#109100]: https://bugs.freedesktop.org/show_bug.cgi?id=109100
  [fdo#111096]: https://bugs.freedesktop.org/show_bug.cgi?id=111096
  [fdo#111407]: https://bugs.freedesktop.org/show_bug.cgi?id=111407


Participating hosts (52 -> 44)
------------------------------

  Missing    (8): fi-ilk-m540 fi-bxt-dsi fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-icl-y fi-byt-clapper fi-bdw-samus 


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

  * CI: CI-20190529 -> None
  * Linux: CI_DRM_6849 -> Patchwork_14312

  CI-20190529: 20190529
  CI_DRM_6849: d4111d3dd34455068de02ce18b796a631c7fe3a9 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_5173: 3fb0f227d8856008f89a797879e27094745ce97e @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
  Patchwork_14312: 1658dc0cfed23566771c68b212403e7cedca0e0d @ git://anongit.freedesktop.org/gfx-ci/linux


== Linux commits ==

1658dc0cfed2 drm/i915: Perform GGTT restore much earlier during resume

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14312/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 7+ messages in thread

* ✓ Fi.CI.IGT: success for drm/i915: Perform GGTT restore much earlier during resume (rev3)
  2019-09-07  8:35 [PATCH] drm/i915: Perform GGTT restore much earlier during resume Chris Wilson
                   ` (3 preceding siblings ...)
  2019-09-07 11:02 ` ✓ Fi.CI.BAT: success for drm/i915: Perform GGTT restore much earlier during resume (rev3) Patchwork
@ 2019-09-07 13:13 ` Patchwork
  2019-09-07 21:44 ` [PATCH] drm/i915: Perform GGTT restore much earlier during resume Sasha Levin
  5 siblings, 0 replies; 7+ messages in thread
From: Patchwork @ 2019-09-07 13:13 UTC (permalink / raw)
  To: Chris Wilson; +Cc: intel-gfx

== Series Details ==

Series: drm/i915: Perform GGTT restore much earlier during resume (rev3)
URL   : https://patchwork.freedesktop.org/series/66369/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_6849_full -> Patchwork_14312_full
====================================================

Summary
-------

  **SUCCESS**

  No regressions found.

  

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

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

### IGT changes ###

#### Issues hit ####

  * igt@gem_ctx_shared@exec-single-timeline-bsd:
    - shard-iclb:         [PASS][1] -> [SKIP][2] ([fdo#110841])
   [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6849/shard-iclb7/igt@gem_ctx_shared@exec-single-timeline-bsd.html
   [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14312/shard-iclb4/igt@gem_ctx_shared@exec-single-timeline-bsd.html

  * igt@gem_ctx_shared@q-smoketest-bsd2:
    - shard-iclb:         [PASS][3] -> [SKIP][4] ([fdo#109276]) +10 similar issues
   [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6849/shard-iclb1/igt@gem_ctx_shared@q-smoketest-bsd2.html
   [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14312/shard-iclb8/igt@gem_ctx_shared@q-smoketest-bsd2.html

  * igt@gem_exec_schedule@promotion-bsd:
    - shard-iclb:         [PASS][5] -> [SKIP][6] ([fdo#111325]) +3 similar issues
   [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6849/shard-iclb6/igt@gem_exec_schedule@promotion-bsd.html
   [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14312/shard-iclb2/igt@gem_exec_schedule@promotion-bsd.html

  * igt@gem_softpin@noreloc-s3:
    - shard-kbl:          [PASS][7] -> [DMESG-WARN][8] ([fdo#103313])
   [7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6849/shard-kbl6/igt@gem_softpin@noreloc-s3.html
   [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14312/shard-kbl6/igt@gem_softpin@noreloc-s3.html

  * igt@gem_workarounds@suspend-resume-context:
    - shard-apl:          [PASS][9] -> [DMESG-WARN][10] ([fdo#108566]) +3 similar issues
   [9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6849/shard-apl7/igt@gem_workarounds@suspend-resume-context.html
   [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14312/shard-apl6/igt@gem_workarounds@suspend-resume-context.html

  * igt@kms_fbcon_fbt@psr-suspend:
    - shard-skl:          [PASS][11] -> [INCOMPLETE][12] ([fdo#104108])
   [11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6849/shard-skl9/igt@kms_fbcon_fbt@psr-suspend.html
   [12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14312/shard-skl2/igt@kms_fbcon_fbt@psr-suspend.html

  * igt@kms_flip@flip-vs-expired-vblank-interruptible:
    - shard-skl:          [PASS][13] -> [FAIL][14] ([fdo#105363])
   [13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6849/shard-skl3/igt@kms_flip@flip-vs-expired-vblank-interruptible.html
   [14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14312/shard-skl1/igt@kms_flip@flip-vs-expired-vblank-interruptible.html
    - shard-glk:          [PASS][15] -> [FAIL][16] ([fdo#105363]) +1 similar issue
   [15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6849/shard-glk3/igt@kms_flip@flip-vs-expired-vblank-interruptible.html
   [16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14312/shard-glk3/igt@kms_flip@flip-vs-expired-vblank-interruptible.html

  * igt@kms_flip@flip-vs-suspend:
    - shard-hsw:          [PASS][17] -> [INCOMPLETE][18] ([fdo#103540])
   [17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6849/shard-hsw7/igt@kms_flip@flip-vs-suspend.html
   [18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14312/shard-hsw4/igt@kms_flip@flip-vs-suspend.html

  * igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-indfb-draw-render:
    - shard-iclb:         [PASS][19] -> [FAIL][20] ([fdo#103167]) +3 similar issues
   [19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6849/shard-iclb5/igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-indfb-draw-render.html
   [20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14312/shard-iclb2/igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-indfb-draw-render.html

  * igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a:
    - shard-kbl:          [PASS][21] -> [INCOMPLETE][22] ([fdo#103665])
   [21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6849/shard-kbl6/igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a.html
   [22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14312/shard-kbl3/igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a.html

  * igt@kms_psr@psr2_cursor_plane_move:
    - shard-iclb:         [PASS][23] -> [SKIP][24] ([fdo#109441]) +1 similar issue
   [23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6849/shard-iclb2/igt@kms_psr@psr2_cursor_plane_move.html
   [24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14312/shard-iclb4/igt@kms_psr@psr2_cursor_plane_move.html

  * igt@kms_setmode@basic:
    - shard-hsw:          [PASS][25] -> [FAIL][26] ([fdo#99912])
   [25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6849/shard-hsw4/igt@kms_setmode@basic.html
   [26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14312/shard-hsw1/igt@kms_setmode@basic.html

  * igt@perf@blocking:
    - shard-skl:          [PASS][27] -> [FAIL][28] ([fdo#110728])
   [27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6849/shard-skl7/igt@perf@blocking.html
   [28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14312/shard-skl7/igt@perf@blocking.html

  
#### Possible fixes ####

  * igt@gem_ctx_isolation@bcs0-s3:
    - shard-kbl:          [DMESG-WARN][29] ([fdo#103313]) -> [PASS][30]
   [29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6849/shard-kbl6/igt@gem_ctx_isolation@bcs0-s3.html
   [30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14312/shard-kbl2/igt@gem_ctx_isolation@bcs0-s3.html

  * igt@gem_ctx_shared@exec-single-timeline-bsd1:
    - shard-iclb:         [SKIP][31] ([fdo#109276]) -> [PASS][32] +9 similar issues
   [31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6849/shard-iclb5/igt@gem_ctx_shared@exec-single-timeline-bsd1.html
   [32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14312/shard-iclb1/igt@gem_ctx_shared@exec-single-timeline-bsd1.html

  * igt@gem_exec_schedule@wide-bsd:
    - shard-iclb:         [SKIP][33] ([fdo#111325]) -> [PASS][34] +7 similar issues
   [33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6849/shard-iclb1/igt@gem_exec_schedule@wide-bsd.html
   [34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14312/shard-iclb3/igt@gem_exec_schedule@wide-bsd.html

  * igt@gem_exec_suspend@basic-s3:
    - shard-kbl:          [INCOMPLETE][35] ([fdo#103665]) -> [PASS][36]
   [35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6849/shard-kbl3/igt@gem_exec_suspend@basic-s3.html
   [36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14312/shard-kbl2/igt@gem_exec_suspend@basic-s3.html

  * igt@gem_softpin@noreloc-s3:
    - shard-skl:          [INCOMPLETE][37] ([fdo#104108]) -> [PASS][38] +1 similar issue
   [37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6849/shard-skl4/igt@gem_softpin@noreloc-s3.html
   [38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14312/shard-skl10/igt@gem_softpin@noreloc-s3.html

  * igt@gem_tiled_swapping@non-threaded:
    - shard-apl:          [DMESG-WARN][39] ([fdo#108686]) -> [PASS][40]
   [39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6849/shard-apl4/igt@gem_tiled_swapping@non-threaded.html
   [40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14312/shard-apl1/igt@gem_tiled_swapping@non-threaded.html

  * igt@gem_wait@basic-wait-write-all:
    - shard-skl:          [DMESG-WARN][41] ([fdo#106107]) -> [PASS][42]
   [41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6849/shard-skl5/igt@gem_wait@basic-wait-write-all.html
   [42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14312/shard-skl1/igt@gem_wait@basic-wait-write-all.html

  * igt@i915_suspend@sysfs-reader:
    - shard-apl:          [DMESG-WARN][43] ([fdo#108566]) -> [PASS][44] +6 similar issues
   [43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6849/shard-apl7/igt@i915_suspend@sysfs-reader.html
   [44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14312/shard-apl6/igt@i915_suspend@sysfs-reader.html

  * igt@kms_cursor_crc@pipe-b-cursor-suspend:
    - shard-skl:          [INCOMPLETE][45] ([fdo#110741]) -> [PASS][46]
   [45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6849/shard-skl1/igt@kms_cursor_crc@pipe-b-cursor-suspend.html
   [46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14312/shard-skl7/igt@kms_cursor_crc@pipe-b-cursor-suspend.html

  * igt@kms_cursor_legacy@2x-long-cursor-vs-flip-legacy:
    - shard-hsw:          [FAIL][47] ([fdo#105767]) -> [PASS][48]
   [47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6849/shard-hsw1/igt@kms_cursor_legacy@2x-long-cursor-vs-flip-legacy.html
   [48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14312/shard-hsw2/igt@kms_cursor_legacy@2x-long-cursor-vs-flip-legacy.html

  * igt@kms_flip@flip-vs-suspend-interruptible:
    - shard-skl:          [INCOMPLETE][49] ([fdo#109507]) -> [PASS][50]
   [49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6849/shard-skl8/igt@kms_flip@flip-vs-suspend-interruptible.html
   [50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14312/shard-skl9/igt@kms_flip@flip-vs-suspend-interruptible.html

  * igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-render:
    - shard-iclb:         [FAIL][51] ([fdo#103167]) -> [PASS][52] +5 similar issues
   [51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6849/shard-iclb5/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-render.html
   [52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14312/shard-iclb2/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-render.html

  * igt@kms_plane_alpha_blend@pipe-b-coverage-7efc:
    - shard-skl:          [FAIL][53] ([fdo#108145] / [fdo#110403]) -> [PASS][54]
   [53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6849/shard-skl2/igt@kms_plane_alpha_blend@pipe-b-coverage-7efc.html
   [54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14312/shard-skl9/igt@kms_plane_alpha_blend@pipe-b-coverage-7efc.html

  * igt@kms_psr@psr2_cursor_mmap_cpu:
    - shard-iclb:         [SKIP][55] ([fdo#109441]) -> [PASS][56] +2 similar issues
   [55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6849/shard-iclb7/igt@kms_psr@psr2_cursor_mmap_cpu.html
   [56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14312/shard-iclb2/igt@kms_psr@psr2_cursor_mmap_cpu.html

  
#### Warnings ####

  * igt@gem_ctx_isolation@vcs1-nonpriv:
    - shard-iclb:         [SKIP][57] ([fdo#109276]) -> [FAIL][58] ([fdo#111329])
   [57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6849/shard-iclb7/igt@gem_ctx_isolation@vcs1-nonpriv.html
   [58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14312/shard-iclb2/igt@gem_ctx_isolation@vcs1-nonpriv.html

  * igt@kms_frontbuffer_tracking@psr-1p-primscrn-spr-indfb-draw-blt:
    - shard-apl:          [INCOMPLETE][59] ([fdo#103927]) -> [SKIP][60] ([fdo#109271])
   [59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6849/shard-apl2/igt@kms_frontbuffer_tracking@psr-1p-primscrn-spr-indfb-draw-blt.html
   [60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14312/shard-apl5/igt@kms_frontbuffer_tracking@psr-1p-primscrn-spr-indfb-draw-blt.html

  
  [fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
  [fdo#103313]: https://bugs.freedesktop.org/show_bug.cgi?id=103313
  [fdo#103540]: https://bugs.freedesktop.org/show_bug.cgi?id=103540
  [fdo#103665]: https://bugs.freedesktop.org/show_bug.cgi?id=103665
  [fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
  [fdo#104108]: https://bugs.freedesktop.org/show_bug.cgi?id=104108
  [fdo#105363]: https://bugs.freedesktop.org/show_bug.cgi?id=105363
  [fdo#105767]: https://bugs.freedesktop.org/show_bug.cgi?id=105767
  [fdo#106107]: https://bugs.freedesktop.org/show_bug.cgi?id=106107
  [fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
  [fdo#108566]: https://bugs.freedesktop.org/show_bug.cgi?id=108566
  [fdo#108686]: https://bugs.freedesktop.org/show_bug.cgi?id=108686
  [fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
  [fdo#109276]: https://bugs.freedesktop.org/show_bug.cgi?id=109276
  [fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
  [fdo#109507]: https://bugs.freedesktop.org/show_bug.cgi?id=109507
  [fdo#110403]: https://bugs.freedesktop.org/show_bug.cgi?id=110403
  [fdo#110728]: https://bugs.freedesktop.org/show_bug.cgi?id=110728
  [fdo#110741]: https://bugs.freedesktop.org/show_bug.cgi?id=110741
  [fdo#110841]: https://bugs.freedesktop.org/show_bug.cgi?id=110841
  [fdo#111325]: https://bugs.freedesktop.org/show_bug.cgi?id=111325
  [fdo#111329]: https://bugs.freedesktop.org/show_bug.cgi?id=111329
  [fdo#99912]: https://bugs.freedesktop.org/show_bug.cgi?id=99912


Participating hosts (10 -> 10)
------------------------------

  No changes in participating hosts


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

  * CI: CI-20190529 -> None
  * Linux: CI_DRM_6849 -> Patchwork_14312

  CI-20190529: 20190529
  CI_DRM_6849: d4111d3dd34455068de02ce18b796a631c7fe3a9 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_5173: 3fb0f227d8856008f89a797879e27094745ce97e @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
  Patchwork_14312: 1658dc0cfed23566771c68b212403e7cedca0e0d @ git://anongit.freedesktop.org/gfx-ci/linux
  piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14312/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH] drm/i915: Perform GGTT restore much earlier during resume
  2019-09-07  8:35 [PATCH] drm/i915: Perform GGTT restore much earlier during resume Chris Wilson
                   ` (4 preceding siblings ...)
  2019-09-07 13:13 ` ✓ Fi.CI.IGT: " Patchwork
@ 2019-09-07 21:44 ` Sasha Levin
  5 siblings, 0 replies; 7+ messages in thread
From: Sasha Levin @ 2019-09-07 21:44 UTC (permalink / raw)
  To: Sasha Levin, Chris Wilson, intel-gfx; +Cc: stable

Hi,

[This is an automated email]

This commit has been processed because it contains a -stable tag.
The stable tag indicates that it's relevant for the following trees: all

The bot has tested the following trees: v5.2.13, v4.19.71, v4.14.142, v4.9.191, v4.4.191.

v5.2.13: Failed to apply! Possible dependencies:
    09407579abf5 ("drm/i915: Store the default sseu setup on the engine")
    0de50e40fc68 ("drm/i915: Lift intel_engines_resume() to callers")
    112ed2d31a46 ("drm/i915: Move GraphicsTechnology files under gt/")
    23c3c3d04fa7 ("drm/i915: Pull the GEM powermangement coupling into its own file")
    79ffac8599c4 ("drm/i915: Invert the GEM wakeref hierarchy")

v4.19.71: Failed to apply! Possible dependencies:
    0e39037b3165 ("drm/i915: Cache the error string")
    16e4dd0342a8 ("drm/i915: Markup paired operations on wakerefs")
    23c3c3d04fa7 ("drm/i915: Pull the GEM powermangement coupling into its own file")
    39e2f501c1b4 ("drm/i915: Split struct intel_context definition to its own header")
    52c0fdb25c7c ("drm/i915: Replace global breadcrumbs with per-context interrupt tracking")
    538ef96b9dae ("drm/i915/gem: Track the rpm wakerefs")
    6b048706f407 ("drm/i915: Forcibly flush unwanted requests in drop-caches")
    87f1ef225242 ("drm/i915: Record the sseu configuration per-context & engine")
    95fd94a645f7 ("drm/i915: avoid rebuilding i915_gpu_error.o on version string updates")
    c0a6aa7ec2c3 ("drm/i915: Show actual alongside requested frequency in debugfs/i915_rps_boost_info")
    c2400ec3b6d1 ("drm/i915: add Makefile magic for testing headers are self-contained")
    c44301fce614 ("drm/i915: Allow control of PSR at runtime through debugfs, v6")
    cab870b7fdf3 ("drm/i915/ilk: Fix warning when reading emon_status with no output")
    e6154e4cb8b0 ("drm/i915: Skip the ERR_PTR error state")
    eb8d0f5af4ec ("drm/i915: Remove GPU reset dependence on struct_mutex")
    fb6f0b64e455 ("drm/i915: Prevent machine hang from Broxton's vtd w/a and error capture")

v4.14.142: Failed to apply! Possible dependencies:
    08dd3e1acc16 ("drm/i915/execlists: Move insert_request()")
    23c3c3d04fa7 ("drm/i915: Pull the GEM powermangement coupling into its own file")
    27a5f61b377b ("drm/i915: Cancel all ready but queued requests when wedging")
    39e2f501c1b4 ("drm/i915: Split struct intel_context definition to its own header")
    45ec5bc8774b ("drm/i915/guc: Remove obsolete comments and remove unused variable")
    52c0fdb25c7c ("drm/i915: Replace global breadcrumbs with per-context interrupt tracking")
    52d7f16e5543 ("drm/i915: Stop tracking timeline->inflight_seqnos")
    5427f207852d ("drm/i915: Bump wait-times for the final CS interrupt before parking")
    62b5ed1f35d7 ("drm/i915: Fix i915_gem_context.h header")
    6d2cb5aa383b ("drm/i915/execlists: Read the context-status buffer from the HWSP")
    767a983ab255 ("drm/i915/execlists: Read the context-status HEAD from the HWSP")
    85e2fe679e05 ("drm/i915/guc: Submit GuC workitems containing coalesced requests")
    87f1ef225242 ("drm/i915: Record the sseu configuration per-context & engine")
    aba5e278586b ("drm/i915: Add a hook for making the engines idle (parking) and unparking")
    b620e870218e ("drm/i915: Make own struct for execlist items")
    c2400ec3b6d1 ("drm/i915: add Makefile magic for testing headers are self-contained")
    c5d1f5562ea7 ("drm/i915: Include i915_scheduler.h from i915_gem_context.h")
    e4d2006f8f04 ("drm/i915: Split out parking from the idle worker for reuse")
    eb8d0f5af4ec ("drm/i915: Remove GPU reset dependence on struct_mutex")
    ff320d6e72ff ("drm/i915: Synchronize irq before parking each engine")

v4.9.191: Failed to apply! Possible dependencies:
    0031fb96859c ("drm/i915: Assorted dev_priv cleanups")
    03cdc1d4f795 ("drm/i915: Store port enum in intel_encoder")
    23c3c3d04fa7 ("drm/i915: Pull the GEM powermangement coupling into its own file")
    4f8036a28112 ("drm/i915: Make HAS_DDI and HAS_PCH_LPT_LP only take dev_priv")
    50a0bc905416 ("drm/i915: Make INTEL_DEVID only take dev_priv")
    6e266956a57f ("drm/i915: Make INTEL_PCH_TYPE & co only take dev_priv")
    8652744b647e ("drm/i915: Make IS_BROADWELL only take dev_priv")
    b8f55be64453 ("drm/i915: Split obj->cache_coherent to track r/w")
    e59dc1721180 ("drm/i915: Move cpu_cache_is_coherent() to header")

v4.4.191: Failed to apply! Possible dependencies:
    0673ad472b98 ("drm/i915: Merge i915_dma.c into i915_drv.c")
    0a9d2bed5557 ("drm/i915/skl: Making DC6 entry is the last call in suspend flow.")
    0ad35fed618c ("drm/i915: gvt: Introduce the basic architecture of GVT-g")
    0b1de5d58e19 ("drm/i915: Use SSE4.1 movntdqa to accelerate reads from WC memory")
    1f814daca43a ("drm/i915: add support for checking if we hold an RPM reference")
    23c3c3d04fa7 ("drm/i915: Pull the GEM powermangement coupling into its own file")
    2f693e28b8df ("drm/i915: Make turning on/off PW1 and Misc I/O part of the init/fini sequences")
    399bb5b6db02 ("drm/i915: Move allocation of various workqueues earlier during init")
    414b7999b8be ("drm/i915/gen9: Remove csr.state, csr_lock and related code.")
    5d7a6eefc3b0 ("drm/i915: Split out load time early initialization")
    643a24b6ecdc ("drm/i915: Kconfig for extra driver debugging")
    666a45379e2c ("drm/i915: Separate cherryview from valleyview")
    73dfc227ff5c ("drm/i915/skl: init/uninit display core as part of the HW power domain state")
    755412e29c77 ("drm/i915: Add an optional selection from i915 of CONFIG_MMU_NOTIFIER")
    9c5308ea1cd4 ("drm/i915/skl: Refuse to load outdated dmc firmware")
    b6e7d894c3d2 ("drm/i915/skl: Store and print the DMC firmware version we load")
    b8f55be64453 ("drm/i915: Split obj->cache_coherent to track r/w")
    bc87229f323e ("drm/i915/skl: enable PC9/10 power states during suspend-to-idle")
    c58305af1835 ("drm/i915: Use remap_io_mapping() to prefault all PTE in a single pass")
    c73666f394fc ("drm/i915/skl: If needed sanitize bios programmed cdclk")
    ebae38d061df ("drm/i915/gen9: csr_init after runtime pm enable")
    f4448375467d ("drm/i915/gen9: Use dev_priv in csr functions")
    f514c2d84285 ("drm/i915/gen9: flush DMC fw loading work during system suspend")


NOTE: The patch will not be queued to stable trees until it is upstream.

How should we proceed with this patch?

--
Thanks,
Sasha
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2019-09-07 21:44 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-09-07  8:35 [PATCH] drm/i915: Perform GGTT restore much earlier during resume Chris Wilson
2019-09-07  8:57 ` [PATCH v2] " Chris Wilson
2019-09-07 10:08 ` ✗ Fi.CI.BAT: failure for drm/i915: Perform GGTT restore much earlier during resume (rev2) Patchwork
2019-09-07 10:18 ` [PATCH v3] drm/i915: Perform GGTT restore much earlier during resume Chris Wilson
2019-09-07 11:02 ` ✓ Fi.CI.BAT: success for drm/i915: Perform GGTT restore much earlier during resume (rev3) Patchwork
2019-09-07 13:13 ` ✓ Fi.CI.IGT: " Patchwork
2019-09-07 21:44 ` [PATCH] drm/i915: Perform GGTT restore much earlier during resume Sasha Levin

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.