* [PATCH] drm/i915: We don't need display's suspend/resume operations when !HAS_DISPLAY @ 2019-05-20 4:56 Rodrigo Vivi 2019-05-20 8:01 ` ✗ Fi.CI.CHECKPATCH: warning for " Patchwork ` (3 more replies) 0 siblings, 4 replies; 5+ messages in thread From: Rodrigo Vivi @ 2019-05-20 4:56 UTC (permalink / raw) To: intel-gfx Suspend resume is broken if we try to enable/disable dc9 on cases with disabled displays. Cc: José Roberto de Souza <jose.souza@intel.com> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com> --- drivers/gpu/drm/i915/i915_drv.c | 103 ++++++++++++++++++++++---------- 1 file changed, 71 insertions(+), 32 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 2c7a4318d13c..90693327065a 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -2117,6 +2117,15 @@ get_suspend_mode(struct drm_i915_private *dev_priv, bool hibernate) return I915_DRM_SUSPEND_MEM; } +static void intel_display_suspend_late(struct drm_i915_private *dev_priv) +{ + if (!HAS_DISPLAY(dev_priv)) + return; + + if (INTEL_GEN(dev_priv) >= 11 || IS_GEN9_LP(dev_priv)) + bxt_enable_dc9(dev_priv); +} + static int i915_drm_suspend_late(struct drm_device *dev, bool hibernation) { struct drm_i915_private *dev_priv = to_i915(dev); @@ -2132,10 +2141,10 @@ static int i915_drm_suspend_late(struct drm_device *dev, bool hibernation) intel_power_domains_suspend(dev_priv, get_suspend_mode(dev_priv, hibernation)); + intel_display_suspend_late(dev_priv); + ret = 0; - if (INTEL_GEN(dev_priv) >= 11 || IS_GEN9_LP(dev_priv)) - bxt_enable_dc9(dev_priv); - else if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv)) + if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv)) hsw_enable_pc8(dev_priv); else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) ret = vlv_suspend_complete(dev_priv); @@ -2265,6 +2274,17 @@ static int i915_drm_resume(struct drm_device *dev) return 0; } +static void intel_display_resume_early(struct drm_i915_private *dev_priv) +{ + if (!HAS_DISPLAY(dev_priv)) + return; + + if (INTEL_GEN(dev_priv) >= 11 || IS_GEN9_LP(dev_priv)) { + gen9_sanitize_dc_state(dev_priv); + bxt_disable_dc9(dev_priv); + } +} + static int i915_drm_resume_early(struct drm_device *dev) { struct drm_i915_private *dev_priv = to_i915(dev); @@ -2327,10 +2347,9 @@ static int i915_drm_resume_early(struct drm_device *dev) i915_check_and_clear_faults(dev_priv); - if (INTEL_GEN(dev_priv) >= 11 || IS_GEN9_LP(dev_priv)) { - gen9_sanitize_dc_state(dev_priv); - bxt_disable_dc9(dev_priv); - } else if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv)) { + intel_display_resume_early(dev_priv); + + if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv)) { hsw_disable_pc8(dev_priv); } @@ -2868,6 +2887,20 @@ static int vlv_resume_prepare(struct drm_i915_private *dev_priv, return ret; } +static void intel_runtime_display_suspend(struct drm_i915_private *dev_priv) +{ + if (!HAS_DISPLAY(dev_priv)) + return; + + if (INTEL_GEN(dev_priv) >= 11) { + icl_display_core_uninit(dev_priv); + bxt_enable_dc9(dev_priv); + } else if (IS_GEN9_LP(dev_priv)) { + bxt_display_core_uninit(dev_priv); + bxt_enable_dc9(dev_priv); + } +} + static int intel_runtime_suspend(struct device *kdev) { struct pci_dev *pdev = to_pci_dev(kdev); @@ -2897,14 +2930,10 @@ static int intel_runtime_suspend(struct device *kdev) intel_uncore_suspend(&dev_priv->uncore); + intel_runtime_display_suspend(dev_priv); + ret = 0; - if (INTEL_GEN(dev_priv) >= 11) { - icl_display_core_uninit(dev_priv); - bxt_enable_dc9(dev_priv); - } else if (IS_GEN9_LP(dev_priv)) { - bxt_display_core_uninit(dev_priv); - bxt_enable_dc9(dev_priv); - } else if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv)) { + if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv)) { hsw_enable_pc8(dev_priv); } else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) { ret = vlv_suspend_complete(dev_priv); @@ -2966,6 +2995,31 @@ static int intel_runtime_suspend(struct device *kdev) return 0; } +static void intel_runtime_display_resume(struct drm_i915_private *dev_priv) +{ + if (!HAS_DISPLAY(dev_priv)) + return; + + if (INTEL_GEN(dev_priv) >= 11) { + bxt_disable_dc9(dev_priv); + icl_display_core_init(dev_priv, true); + if (dev_priv->csr.dmc_payload) { + if (dev_priv->csr.allowed_dc_mask & + DC_STATE_EN_UPTO_DC6) + skl_enable_dc6(dev_priv); + else if (dev_priv->csr.allowed_dc_mask & + DC_STATE_EN_UPTO_DC5) + gen9_enable_dc5(dev_priv); + } + } else if (IS_GEN9_LP(dev_priv)) { + bxt_disable_dc9(dev_priv); + bxt_display_core_init(dev_priv, true); + if (dev_priv->csr.dmc_payload && + (dev_priv->csr.allowed_dc_mask & DC_STATE_EN_UPTO_DC5)) + gen9_enable_dc5(dev_priv); + } +} + static int intel_runtime_resume(struct device *kdev) { struct pci_dev *pdev = to_pci_dev(kdev); @@ -2986,24 +3040,9 @@ static int intel_runtime_resume(struct device *kdev) if (intel_uncore_unclaimed_mmio(&dev_priv->uncore)) DRM_DEBUG_DRIVER("Unclaimed access during suspend, bios?\n"); - if (INTEL_GEN(dev_priv) >= 11) { - bxt_disable_dc9(dev_priv); - icl_display_core_init(dev_priv, true); - if (dev_priv->csr.dmc_payload) { - if (dev_priv->csr.allowed_dc_mask & - DC_STATE_EN_UPTO_DC6) - skl_enable_dc6(dev_priv); - else if (dev_priv->csr.allowed_dc_mask & - DC_STATE_EN_UPTO_DC5) - gen9_enable_dc5(dev_priv); - } - } else if (IS_GEN9_LP(dev_priv)) { - bxt_disable_dc9(dev_priv); - bxt_display_core_init(dev_priv, true); - if (dev_priv->csr.dmc_payload && - (dev_priv->csr.allowed_dc_mask & DC_STATE_EN_UPTO_DC5)) - gen9_enable_dc5(dev_priv); - } else if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv)) { + intel_runtime_display_resume(dev_priv); + + if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv)) { hsw_disable_pc8(dev_priv); } else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) { ret = vlv_resume_prepare(dev_priv, true); -- 2.20.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply related [flat|nested] 5+ messages in thread
* ✗ Fi.CI.CHECKPATCH: warning for drm/i915: We don't need display's suspend/resume operations when !HAS_DISPLAY 2019-05-20 4:56 [PATCH] drm/i915: We don't need display's suspend/resume operations when !HAS_DISPLAY Rodrigo Vivi @ 2019-05-20 8:01 ` Patchwork 2019-05-20 8:21 ` ✓ Fi.CI.BAT: success " Patchwork ` (2 subsequent siblings) 3 siblings, 0 replies; 5+ messages in thread From: Patchwork @ 2019-05-20 8:01 UTC (permalink / raw) To: Rodrigo Vivi; +Cc: intel-gfx == Series Details == Series: drm/i915: We don't need display's suspend/resume operations when !HAS_DISPLAY URL : https://patchwork.freedesktop.org/series/60839/ State : warning == Summary == $ dim checkpatch origin/drm-tip 810402289a3a drm/i915: We don't need display's suspend/resume operations when !HAS_DISPLAY -:78: WARNING:BRACES: braces {} are not necessary for single statement blocks #78: FILE: drivers/gpu/drm/i915/i915_drv.c:2352: + if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv)) { hsw_disable_pc8(dev_priv); } total: 0 errors, 1 warnings, 0 checks, 153 lines checked _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 5+ messages in thread
* ✓ Fi.CI.BAT: success for drm/i915: We don't need display's suspend/resume operations when !HAS_DISPLAY 2019-05-20 4:56 [PATCH] drm/i915: We don't need display's suspend/resume operations when !HAS_DISPLAY Rodrigo Vivi 2019-05-20 8:01 ` ✗ Fi.CI.CHECKPATCH: warning for " Patchwork @ 2019-05-20 8:21 ` Patchwork 2019-05-20 9:47 ` ✓ Fi.CI.IGT: " Patchwork 2019-05-20 21:35 ` [PATCH] " Souza, Jose 3 siblings, 0 replies; 5+ messages in thread From: Patchwork @ 2019-05-20 8:21 UTC (permalink / raw) To: Rodrigo Vivi; +Cc: intel-gfx == Series Details == Series: drm/i915: We don't need display's suspend/resume operations when !HAS_DISPLAY URL : https://patchwork.freedesktop.org/series/60839/ State : success == Summary == CI Bug Log - changes from CI_DRM_6097 -> Patchwork_13040 ==================================================== Summary ------- **SUCCESS** No regressions found. External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13040/ Known issues ------------ Here are the changes found in Patchwork_13040 that come from known issues: ### IGT changes ### #### Issues hit #### * igt@gem_exec_suspend@basic-s4-devices: - fi-kbl-7500u: [PASS][1] -> [DMESG-WARN][2] ([fdo#105128] / [fdo#107139]) [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/fi-kbl-7500u/igt@gem_exec_suspend@basic-s4-devices.html [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13040/fi-kbl-7500u/igt@gem_exec_suspend@basic-s4-devices.html - fi-blb-e6850: [PASS][3] -> [INCOMPLETE][4] ([fdo#107718]) [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/fi-blb-e6850/igt@gem_exec_suspend@basic-s4-devices.html [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13040/fi-blb-e6850/igt@gem_exec_suspend@basic-s4-devices.html * igt@i915_selftest@live_evict: - fi-bsw-kefka: [PASS][5] -> [DMESG-WARN][6] ([fdo#107709]) [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/fi-bsw-kefka/igt@i915_selftest@live_evict.html [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13040/fi-bsw-kefka/igt@i915_selftest@live_evict.html * igt@i915_selftest@live_execlists: - fi-apl-guc: [PASS][7] -> [INCOMPLETE][8] ([fdo#103927] / [fdo#109720]) [7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/fi-apl-guc/igt@i915_selftest@live_execlists.html [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13040/fi-apl-guc/igt@i915_selftest@live_execlists.html #### Possible fixes #### * igt@amdgpu/amd_basic@userptr: - fi-kbl-8809g: [DMESG-WARN][9] ([fdo#108965]) -> [PASS][10] [9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/fi-kbl-8809g/igt@amdgpu/amd_basic@userptr.html [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13040/fi-kbl-8809g/igt@amdgpu/amd_basic@userptr.html * igt@i915_selftest@live_hangcheck: - fi-skl-iommu: [INCOMPLETE][11] ([fdo#108602] / [fdo#108744]) -> [PASS][12] [11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/fi-skl-iommu/igt@i915_selftest@live_hangcheck.html [12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13040/fi-skl-iommu/igt@i915_selftest@live_hangcheck.html - fi-apl-guc: [FAIL][13] ([fdo#110623]) -> [PASS][14] [13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/fi-apl-guc/igt@i915_selftest@live_hangcheck.html [14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13040/fi-apl-guc/igt@i915_selftest@live_hangcheck.html #### Warnings #### * igt@runner@aborted: - fi-apl-guc: [FAIL][15] ([fdo#110622]) -> [FAIL][16] ([fdo#108622] / [fdo#109720]) [15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/fi-apl-guc/igt@runner@aborted.html [16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13040/fi-apl-guc/igt@runner@aborted.html {name}: This element is suppressed. This means it is ignored when computing the status of the difference (SUCCESS, WARNING, or FAILURE). [fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927 [fdo#105128]: https://bugs.freedesktop.org/show_bug.cgi?id=105128 [fdo#107139]: https://bugs.freedesktop.org/show_bug.cgi?id=107139 [fdo#107709]: https://bugs.freedesktop.org/show_bug.cgi?id=107709 [fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713 [fdo#107718]: https://bugs.freedesktop.org/show_bug.cgi?id=107718 [fdo#108602]: https://bugs.freedesktop.org/show_bug.cgi?id=108602 [fdo#108622]: https://bugs.freedesktop.org/show_bug.cgi?id=108622 [fdo#108744]: https://bugs.freedesktop.org/show_bug.cgi?id=108744 [fdo#108965]: https://bugs.freedesktop.org/show_bug.cgi?id=108965 [fdo#109720]: https://bugs.freedesktop.org/show_bug.cgi?id=109720 [fdo#110622]: https://bugs.freedesktop.org/show_bug.cgi?id=110622 [fdo#110623]: https://bugs.freedesktop.org/show_bug.cgi?id=110623 Participating hosts (52 -> 43) ------------------------------ Missing (9): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-gdg-551 fi-icl-u3 fi-byt-clapper fi-bdw-samus Build changes ------------- * Linux: CI_DRM_6097 -> Patchwork_13040 CI_DRM_6097: 3f2d6a47d9eec66594887b1e9718bc1a29aa6a77 @ git://anongit.freedesktop.org/gfx-ci/linux IGT_4996: 6fe5d254ec1b9b47d61408e1b49a7339876bf1e7 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools Patchwork_13040: 810402289a3aba3bb84f19c666a1413bc5140ebf @ git://anongit.freedesktop.org/gfx-ci/linux == Linux commits == 810402289a3a drm/i915: We don't need display's suspend/resume operations when !HAS_DISPLAY == Logs == For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13040/ _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 5+ messages in thread
* ✓ Fi.CI.IGT: success for drm/i915: We don't need display's suspend/resume operations when !HAS_DISPLAY 2019-05-20 4:56 [PATCH] drm/i915: We don't need display's suspend/resume operations when !HAS_DISPLAY Rodrigo Vivi 2019-05-20 8:01 ` ✗ Fi.CI.CHECKPATCH: warning for " Patchwork 2019-05-20 8:21 ` ✓ Fi.CI.BAT: success " Patchwork @ 2019-05-20 9:47 ` Patchwork 2019-05-20 21:35 ` [PATCH] " Souza, Jose 3 siblings, 0 replies; 5+ messages in thread From: Patchwork @ 2019-05-20 9:47 UTC (permalink / raw) To: Rodrigo Vivi; +Cc: intel-gfx == Series Details == Series: drm/i915: We don't need display's suspend/resume operations when !HAS_DISPLAY URL : https://patchwork.freedesktop.org/series/60839/ State : success == Summary == CI Bug Log - changes from CI_DRM_6097_full -> Patchwork_13040_full ==================================================== Summary ------- **SUCCESS** No regressions found. Known issues ------------ Here are the changes found in Patchwork_13040_full that come from known issues: ### IGT changes ### #### Issues hit #### * igt@i915_pm_rpm@debugfs-forcewake-user: - shard-skl: [PASS][1] -> [INCOMPLETE][2] ([fdo#107807]) [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/shard-skl2/igt@i915_pm_rpm@debugfs-forcewake-user.html [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13040/shard-skl5/igt@i915_pm_rpm@debugfs-forcewake-user.html * igt@kms_flip@flip-vs-suspend-interruptible: - shard-skl: [PASS][3] -> [INCOMPLETE][4] ([fdo#109507]) [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/shard-skl8/igt@kms_flip@flip-vs-suspend-interruptible.html [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13040/shard-skl10/igt@kms_flip@flip-vs-suspend-interruptible.html * igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-mmap-gtt: - shard-iclb: [PASS][5] -> [FAIL][6] ([fdo#103167]) +5 similar issues [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/shard-iclb8/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-mmap-gtt.html [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13040/shard-iclb7/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-mmap-gtt.html * igt@kms_lease@setcrtc_implicit_plane: - shard-snb: [PASS][7] -> [SKIP][8] ([fdo#109271]) [7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/shard-snb5/igt@kms_lease@setcrtc_implicit_plane.html [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13040/shard-snb4/igt@kms_lease@setcrtc_implicit_plane.html * igt@kms_plane@plane-panning-bottom-right-suspend-pipe-c-planes: - shard-apl: [PASS][9] -> [DMESG-WARN][10] ([fdo#108566]) +3 similar issues [9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/shard-apl6/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-c-planes.html [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13040/shard-apl4/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-c-planes.html * igt@kms_plane_lowres@pipe-a-tiling-x: - shard-iclb: [PASS][11] -> [FAIL][12] ([fdo#103166]) [11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/shard-iclb6/igt@kms_plane_lowres@pipe-a-tiling-x.html [12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13040/shard-iclb6/igt@kms_plane_lowres@pipe-a-tiling-x.html * igt@kms_psr@psr2_dpms: - shard-iclb: [PASS][13] -> [SKIP][14] ([fdo#109441]) +1 similar issue [13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/shard-iclb2/igt@kms_psr@psr2_dpms.html [14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13040/shard-iclb4/igt@kms_psr@psr2_dpms.html * igt@perf_pmu@rc6: - shard-kbl: [PASS][15] -> [SKIP][16] ([fdo#109271]) [15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/shard-kbl1/igt@perf_pmu@rc6.html [16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13040/shard-kbl7/igt@perf_pmu@rc6.html #### Possible fixes #### * igt@gem_tiled_swapping@non-threaded: - shard-glk: [DMESG-WARN][17] ([fdo#108686]) -> [PASS][18] [17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/shard-glk7/igt@gem_tiled_swapping@non-threaded.html [18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13040/shard-glk6/igt@gem_tiled_swapping@non-threaded.html * igt@i915_pm_rpm@debugfs-read: - shard-skl: [INCOMPLETE][19] ([fdo#107807]) -> [PASS][20] [19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/shard-skl3/igt@i915_pm_rpm@debugfs-read.html [20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13040/shard-skl4/igt@i915_pm_rpm@debugfs-read.html * igt@i915_pm_rpm@gem-execbuf: - shard-skl: [INCOMPLETE][21] ([fdo#107803] / [fdo#107807]) -> [PASS][22] [21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/shard-skl4/igt@i915_pm_rpm@gem-execbuf.html [22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13040/shard-skl5/igt@i915_pm_rpm@gem-execbuf.html * igt@kms_cursor_legacy@2x-long-cursor-vs-flip-atomic: - shard-hsw: [FAIL][23] ([fdo#105767]) -> [PASS][24] [23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/shard-hsw1/igt@kms_cursor_legacy@2x-long-cursor-vs-flip-atomic.html [24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13040/shard-hsw4/igt@kms_cursor_legacy@2x-long-cursor-vs-flip-atomic.html * igt@kms_flip@2x-flip-vs-expired-vblank: - shard-glk: [FAIL][25] ([fdo#102887]) -> [PASS][26] [25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/shard-glk8/igt@kms_flip@2x-flip-vs-expired-vblank.html [26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13040/shard-glk7/igt@kms_flip@2x-flip-vs-expired-vblank.html * igt@kms_flip@flip-vs-suspend: - shard-apl: [DMESG-WARN][27] ([fdo#108566]) -> [PASS][28] +2 similar issues [27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/shard-apl7/igt@kms_flip@flip-vs-suspend.html [28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13040/shard-apl1/igt@kms_flip@flip-vs-suspend.html * igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-render: - shard-iclb: [FAIL][29] ([fdo#103167]) -> [PASS][30] +2 similar issues [29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/shard-iclb8/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-render.html [30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13040/shard-iclb6/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-render.html * igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min: - shard-skl: [FAIL][31] ([fdo#108145]) -> [PASS][32] [31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/shard-skl5/igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min.html [32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13040/shard-skl2/igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min.html * igt@kms_plane_lowres@pipe-a-tiling-y: - shard-iclb: [FAIL][33] ([fdo#103166]) -> [PASS][34] [33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/shard-iclb5/igt@kms_plane_lowres@pipe-a-tiling-y.html [34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13040/shard-iclb3/igt@kms_plane_lowres@pipe-a-tiling-y.html * igt@kms_psr@psr2_sprite_plane_move: - shard-iclb: [SKIP][35] ([fdo#109441]) -> [PASS][36] [35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/shard-iclb1/igt@kms_psr@psr2_sprite_plane_move.html [36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13040/shard-iclb2/igt@kms_psr@psr2_sprite_plane_move.html * igt@kms_setmode@basic: - shard-kbl: [FAIL][37] ([fdo#99912]) -> [PASS][38] [37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/shard-kbl7/igt@kms_setmode@basic.html [38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13040/shard-kbl2/igt@kms_setmode@basic.html * igt@kms_sysfs_edid_timing: - shard-iclb: [FAIL][39] ([fdo#100047]) -> [PASS][40] [39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/shard-iclb2/igt@kms_sysfs_edid_timing.html [40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13040/shard-iclb4/igt@kms_sysfs_edid_timing.html * igt@syncobj_wait@invalid-signal-illegal-handle: - shard-iclb: [INCOMPLETE][41] ([fdo#107713]) -> [PASS][42] [41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/shard-iclb7/igt@syncobj_wait@invalid-signal-illegal-handle.html [42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13040/shard-iclb2/igt@syncobj_wait@invalid-signal-illegal-handle.html #### Warnings #### * igt@gem_mmap_gtt@forked-big-copy-xy: - shard-iclb: [INCOMPLETE][43] ([fdo#107713] / [fdo#109100]) -> [TIMEOUT][44] ([fdo#109673]) [43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/shard-iclb3/igt@gem_mmap_gtt@forked-big-copy-xy.html [44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13040/shard-iclb5/igt@gem_mmap_gtt@forked-big-copy-xy.html * igt@i915_pm_rpm@pc8-residency: - shard-skl: [INCOMPLETE][45] ([fdo#107807]) -> [SKIP][46] ([fdo#109271]) [45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/shard-skl4/igt@i915_pm_rpm@pc8-residency.html [46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13040/shard-skl3/igt@i915_pm_rpm@pc8-residency.html {name}: This element is suppressed. This means it is ignored when computing the status of the difference (SUCCESS, WARNING, or FAILURE). [fdo#100047]: https://bugs.freedesktop.org/show_bug.cgi?id=100047 [fdo#102887]: https://bugs.freedesktop.org/show_bug.cgi?id=102887 [fdo#103166]: https://bugs.freedesktop.org/show_bug.cgi?id=103166 [fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167 [fdo#105767]: https://bugs.freedesktop.org/show_bug.cgi?id=105767 [fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713 [fdo#107803]: https://bugs.freedesktop.org/show_bug.cgi?id=107803 [fdo#107807]: https://bugs.freedesktop.org/show_bug.cgi?id=107807 [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#109100]: https://bugs.freedesktop.org/show_bug.cgi?id=109100 [fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271 [fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441 [fdo#109507]: https://bugs.freedesktop.org/show_bug.cgi?id=109507 [fdo#109673]: https://bugs.freedesktop.org/show_bug.cgi?id=109673 [fdo#99912]: https://bugs.freedesktop.org/show_bug.cgi?id=99912 Participating hosts (10 -> 10) ------------------------------ No changes in participating hosts Build changes ------------- * Linux: CI_DRM_6097 -> Patchwork_13040 CI_DRM_6097: 3f2d6a47d9eec66594887b1e9718bc1a29aa6a77 @ git://anongit.freedesktop.org/gfx-ci/linux IGT_4996: 6fe5d254ec1b9b47d61408e1b49a7339876bf1e7 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools Patchwork_13040: 810402289a3aba3bb84f19c666a1413bc5140ebf @ 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_13040/ _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] drm/i915: We don't need display's suspend/resume operations when !HAS_DISPLAY 2019-05-20 4:56 [PATCH] drm/i915: We don't need display's suspend/resume operations when !HAS_DISPLAY Rodrigo Vivi ` (2 preceding siblings ...) 2019-05-20 9:47 ` ✓ Fi.CI.IGT: " Patchwork @ 2019-05-20 21:35 ` Souza, Jose 3 siblings, 0 replies; 5+ messages in thread From: Souza, Jose @ 2019-05-20 21:35 UTC (permalink / raw) To: Vivi, Rodrigo, intel-gfx [-- Attachment #1.1: Type: text/plain, Size: 6382 bytes --] On Sun, 2019-05-19 at 21:56 -0700, Rodrigo Vivi wrote: > Suspend resume is broken if we try to enable/disable dc9 on > cases with disabled displays. > Reviewed-by: José Roberto de Souza <jose.souza@intel.com> > Cc: José Roberto de Souza <jose.souza@intel.com> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com> > --- > drivers/gpu/drm/i915/i915_drv.c | 103 ++++++++++++++++++++++------ > ---- > 1 file changed, 71 insertions(+), 32 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_drv.c > b/drivers/gpu/drm/i915/i915_drv.c > index 2c7a4318d13c..90693327065a 100644 > --- a/drivers/gpu/drm/i915/i915_drv.c > +++ b/drivers/gpu/drm/i915/i915_drv.c > @@ -2117,6 +2117,15 @@ get_suspend_mode(struct drm_i915_private > *dev_priv, bool hibernate) > return I915_DRM_SUSPEND_MEM; > } > > +static void intel_display_suspend_late(struct drm_i915_private > *dev_priv) > +{ > + if (!HAS_DISPLAY(dev_priv)) > + return; > + > + if (INTEL_GEN(dev_priv) >= 11 || IS_GEN9_LP(dev_priv)) > + bxt_enable_dc9(dev_priv); > +} > + > static int i915_drm_suspend_late(struct drm_device *dev, bool > hibernation) > { > struct drm_i915_private *dev_priv = to_i915(dev); > @@ -2132,10 +2141,10 @@ static int i915_drm_suspend_late(struct > drm_device *dev, bool hibernation) > intel_power_domains_suspend(dev_priv, > get_suspend_mode(dev_priv, > hibernation)); > > + intel_display_suspend_late(dev_priv); > + > ret = 0; > - if (INTEL_GEN(dev_priv) >= 11 || IS_GEN9_LP(dev_priv)) > - bxt_enable_dc9(dev_priv); > - else if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv)) > + if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv)) > hsw_enable_pc8(dev_priv); > else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) > ret = vlv_suspend_complete(dev_priv); > @@ -2265,6 +2274,17 @@ static int i915_drm_resume(struct drm_device > *dev) > return 0; > } > > +static void intel_display_resume_early(struct drm_i915_private > *dev_priv) > +{ > + if (!HAS_DISPLAY(dev_priv)) > + return; > + > + if (INTEL_GEN(dev_priv) >= 11 || IS_GEN9_LP(dev_priv)) { > + gen9_sanitize_dc_state(dev_priv); > + bxt_disable_dc9(dev_priv); > + } > +} > + > static int i915_drm_resume_early(struct drm_device *dev) > { > struct drm_i915_private *dev_priv = to_i915(dev); > @@ -2327,10 +2347,9 @@ static int i915_drm_resume_early(struct > drm_device *dev) > > i915_check_and_clear_faults(dev_priv); > > - if (INTEL_GEN(dev_priv) >= 11 || IS_GEN9_LP(dev_priv)) { > - gen9_sanitize_dc_state(dev_priv); > - bxt_disable_dc9(dev_priv); > - } else if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv)) { > + intel_display_resume_early(dev_priv); > + > + if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv)) { > hsw_disable_pc8(dev_priv); > } > > @@ -2868,6 +2887,20 @@ static int vlv_resume_prepare(struct > drm_i915_private *dev_priv, > return ret; > } > > +static void intel_runtime_display_suspend(struct drm_i915_private > *dev_priv) > +{ > + if (!HAS_DISPLAY(dev_priv)) > + return; > + > + if (INTEL_GEN(dev_priv) >= 11) { > + icl_display_core_uninit(dev_priv); > + bxt_enable_dc9(dev_priv); > + } else if (IS_GEN9_LP(dev_priv)) { > + bxt_display_core_uninit(dev_priv); > + bxt_enable_dc9(dev_priv); > + } > +} > + > static int intel_runtime_suspend(struct device *kdev) > { > struct pci_dev *pdev = to_pci_dev(kdev); > @@ -2897,14 +2930,10 @@ static int intel_runtime_suspend(struct > device *kdev) > > intel_uncore_suspend(&dev_priv->uncore); > > + intel_runtime_display_suspend(dev_priv); > + > ret = 0; > - if (INTEL_GEN(dev_priv) >= 11) { > - icl_display_core_uninit(dev_priv); > - bxt_enable_dc9(dev_priv); > - } else if (IS_GEN9_LP(dev_priv)) { > - bxt_display_core_uninit(dev_priv); > - bxt_enable_dc9(dev_priv); > - } else if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv)) { > + if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv)) { > hsw_enable_pc8(dev_priv); > } else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) > { > ret = vlv_suspend_complete(dev_priv); > @@ -2966,6 +2995,31 @@ static int intel_runtime_suspend(struct device > *kdev) > return 0; > } > > +static void intel_runtime_display_resume(struct drm_i915_private > *dev_priv) > +{ > + if (!HAS_DISPLAY(dev_priv)) > + return; > + > + if (INTEL_GEN(dev_priv) >= 11) { > + bxt_disable_dc9(dev_priv); > + icl_display_core_init(dev_priv, true); > + if (dev_priv->csr.dmc_payload) { > + if (dev_priv->csr.allowed_dc_mask & > + DC_STATE_EN_UPTO_DC6) > + skl_enable_dc6(dev_priv); > + else if (dev_priv->csr.allowed_dc_mask & > + DC_STATE_EN_UPTO_DC5) > + gen9_enable_dc5(dev_priv); > + } > + } else if (IS_GEN9_LP(dev_priv)) { > + bxt_disable_dc9(dev_priv); > + bxt_display_core_init(dev_priv, true); > + if (dev_priv->csr.dmc_payload && > + (dev_priv->csr.allowed_dc_mask & > DC_STATE_EN_UPTO_DC5)) > + gen9_enable_dc5(dev_priv); > + } > +} > + > static int intel_runtime_resume(struct device *kdev) > { > struct pci_dev *pdev = to_pci_dev(kdev); > @@ -2986,24 +3040,9 @@ static int intel_runtime_resume(struct device > *kdev) > if (intel_uncore_unclaimed_mmio(&dev_priv->uncore)) > DRM_DEBUG_DRIVER("Unclaimed access during suspend, > bios?\n"); > > - if (INTEL_GEN(dev_priv) >= 11) { > - bxt_disable_dc9(dev_priv); > - icl_display_core_init(dev_priv, true); > - if (dev_priv->csr.dmc_payload) { > - if (dev_priv->csr.allowed_dc_mask & > - DC_STATE_EN_UPTO_DC6) > - skl_enable_dc6(dev_priv); > - else if (dev_priv->csr.allowed_dc_mask & > - DC_STATE_EN_UPTO_DC5) > - gen9_enable_dc5(dev_priv); > - } > - } else if (IS_GEN9_LP(dev_priv)) { > - bxt_disable_dc9(dev_priv); > - bxt_display_core_init(dev_priv, true); > - if (dev_priv->csr.dmc_payload && > - (dev_priv->csr.allowed_dc_mask & > DC_STATE_EN_UPTO_DC5)) > - gen9_enable_dc5(dev_priv); > - } else if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv)) { > + intel_runtime_display_resume(dev_priv); > + > + if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv)) { > hsw_disable_pc8(dev_priv); > } else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) > { > ret = vlv_resume_prepare(dev_priv, true); [-- Attachment #1.2: This is a digitally signed message part --] [-- Type: application/pgp-signature, Size: 488 bytes --] [-- Attachment #2: Type: text/plain, Size: 159 bytes --] _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-05-20 21:35 UTC | newest] Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-05-20 4:56 [PATCH] drm/i915: We don't need display's suspend/resume operations when !HAS_DISPLAY Rodrigo Vivi 2019-05-20 8:01 ` ✗ Fi.CI.CHECKPATCH: warning for " Patchwork 2019-05-20 8:21 ` ✓ Fi.CI.BAT: success " Patchwork 2019-05-20 9:47 ` ✓ Fi.CI.IGT: " Patchwork 2019-05-20 21:35 ` [PATCH] " Souza, Jose
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.