drm/i915: Hook up GT power management
Subsystems (2)
RFC PATCH 1/1 drm/i915: Hook up GT power management
Refactor the GT power management interface to work through the GT now that it is under the control of gt/
Based on a patch by Chris Wilson.
--- drivers/gpu/drm/i915/gem/i915_gem_pm.c | 1 + drivers/gpu/drm/i915/gt/intel_gt.c | 46 ++++++++++++++++++++++++-- drivers/gpu/drm/i915/gt/intel_gt.h | 9 +++-- drivers/gpu/drm/i915/gt/intel_gt_pm.c | 36 ++++++++++++++++++++ drivers/gpu/drm/i915/gt/intel_gt_pm.h | 2 ++ drivers/gpu/drm/i915/i915_drv.c | 22 ++++-------- drivers/gpu/drm/i915/i915_gem.c | 29 +++------------- 7 files changed, 99 insertions(+), 46 deletions(-)
drivers/gpu/drm/i915/gem/i915_gem_pm.c +1 -0
@@ -137,6 +137,7 @@ static bool switch_to_kernel_context_sync(struct intel_gt *gt)bool i915_gem_load_power_context (struct drm_i915_private *i915) { +intel_gt_pm_enable (&i915->gt);return switch_to_kernel_context_sync (&i915->gt); }
drivers/gpu/drm/i915/gt/intel_gt.c +44 -2
74 lines not on this page · raw message
drivers/gpu/drm/i915/gt/intel_gt.h +6 -3
@@ -29,6 +29,12 @@ static inline struct intel_gt *huc_to_gt(struct intel_huc *huc)void intel_gt_init_early (struct intel_gt *gt,struct drm_i915_private *i915);void intel_gt_init_hw (struct drm_i915_private *i915); +int intel_gt_init (struct intel_gt *gt); +void intel_gt_driver_register (struct intel_gt *gt); + +void intel_gt_driver_unregister (struct intel_gt *gt); +void intel_gt_driver_remove (struct intel_gt *gt); +void intel_gt_driver_release (struct intel_gt *gt);void intel_gt_driver_late_release (struct intel_gt *gt);
@@ -41,9 +47,6 @@ void intel_gt_chipset_flush(struct intel_gt *gt);void intel_gt_init_hangcheck (struct intel_gt *gt); -int intel_gt_init_scratch (struct intel_gt *gt,unsigned int size); -void intel_gt_fini_scratch (struct intel_gt *gt); -static inline u32 intel_gt_scratch_offset (const struct intel_gt *gt,enum intel_gt_scratch_field field) {
drivers/gpu/drm/i915/gt/intel_gt_pm.c +36 -0
@@ -124,6 +124,42 @@ void intel_gt_sanitize(struct intel_gt *gt, bool force)__intel_engine_reset (engine, false); } +static bool is_mock_device (const struct intel_gt *gt) +{ +return I915_SELFTEST_ONLY (gt->awake ==-1 ); +} + +void intel_gt_pm_enable (struct intel_gt *gt) +{ +struct intel_engine_cs *engine; +enum intel_engine_id id; + +/* Powersaving is controlled by the host when inside a VM */ +if (intel_vgpu_active (gt->i915)) +return ; + +if (is_mock_device (gt)) +return ; + +intel_gt_pm_get (gt); + +for_each_engine (engine, gt->i915, id) { +intel_engine_pm_get (engine); + engine->serial++;/* force kernel context reload */ +intel_engine_pm_put (engine); + } + +intel_gt_pm_put (gt); +} + +void intel_gt_pm_disable (struct intel_gt *gt) +{ +if (is_mock_device (gt)) +return ; + +intel_sanitize_gt_powersave (gt->i915); +} +int intel_gt_resume (struct intel_gt *gt) {struct intel_engine_cs *engine;
drivers/gpu/drm/i915/gt/intel_gt_pm.h +2 -0
@@ -43,6 +43,8 @@ static inline int intel_gt_pm_wait_for_idle(struct intel_gt *gt) }void intel_gt_pm_init_early (struct intel_gt *gt); +void intel_gt_pm_enable (struct intel_gt *gt); +void intel_gt_pm_disable (struct intel_gt *gt);void intel_gt_sanitize (struct intel_gt *gt,bool force);int intel_gt_resume (struct intel_gt *gt);
drivers/gpu/drm/i915/i915_drv.c +6 -16
@@ -1279,9 +1279,6 @@ static int i915_driver_hw_probe(struct drm_i915_private *dev_priv)pm_qos_add_request (&dev_priv->pm_qos,PM_QOS_CPU_DMA_LATENCY ,PM_QOS_DEFAULT_VALUE ); -/* BIOS often leaves RC6 enabled, but disable it for hw init */ -intel_sanitize_gt_powersave (dev_priv); -intel_gt_init_workarounds (dev_priv);/* On the 945G/GM, the chipset reports the MSI capability on the
@@ -1387,8 +1384,7 @@ static void i915_driver_register(struct drm_i915_private *dev_priv)acpi_video_register (); } -if (IS_GEN (dev_priv,5 )) -intel_gpu_ips_init (dev_priv); +intel_gt_driver_register (&dev_priv->gt);intel_audio_init (dev_priv);
@@ -1431,7 +1427,7 @@ static void i915_driver_unregister(struct drm_i915_private *dev_priv)*/ drm_kms_helper_poll_fini (&dev_priv->drm); -intel_gpu_ips_teardown (); +intel_gt_driver_unregister (&dev_priv->gt);acpi_video_unregister ();intel_opregion_unregister (dev_priv);
@@ -1574,10 +1570,8 @@ int i915_driver_probe(struct pci_dev *pdev, const struct pci_device_id *ent) out_cleanup_hw:i915_driver_hw_remove (dev_priv); +intel_gt_driver_release (&dev_priv->gt);i915_ggtt_driver_release (dev_priv); - -/* Paranoia: make sure we have disabled everything before we exit. */ -intel_sanitize_gt_powersave (dev_priv); out_cleanup_mmio:i915_driver_mmio_release (dev_priv); out_runtime_pm_put:
@@ -1648,8 +1642,7 @@ static void i915_driver_release(struct drm_device *dev)i915_ggtt_driver_release (dev_priv); -/* Paranoia: make sure we have disabled everything before we exit. */ -intel_sanitize_gt_powersave (dev_priv); +intel_gt_driver_release (&dev_priv->gt);i915_driver_mmio_release (dev_priv);
@@ -1879,7 +1872,7 @@ static int i915_drm_resume(struct drm_device *dev)int ret;disable_rpm_wakeref_asserts (&dev_priv->runtime_pm); -intel_sanitize_gt_powersave (dev_priv); +intel_gt_pm_disable (&dev_priv->gt);i915_gem_sanitize (dev_priv);
@@ -2007,7 +2000,7 @@ static int i915_drm_resume_early(struct drm_device *dev)intel_display_power_resume_early (dev_priv); -intel_sanitize_gt_powersave (dev_priv); +intel_gt_pm_disable (&dev_priv->gt);intel_power_domains_resume (dev_priv);
@@ -2551,9 +2544,6 @@ static int intel_runtime_suspend(struct device *kdev)struct intel_runtime_pm *rpm = &dev_priv->runtime_pm;int ret =0 ; -if (WARN_ON_ONCE (!(dev_priv->gt_pm.rc6.enabled &&HAS_RC6 (dev_priv)))) -return -ENODEV ; -if (WARN_ON_ONCE (!HAS_RUNTIME_PM (dev_priv)))return -ENODEV ;
drivers/gpu/drm/i915/i915_gem.c +4 -25
@@ -1375,17 +1375,6 @@ static int __intel_engines_record_defaults(struct drm_i915_private *i915)return err; } -static int -i915_gem_init_scratch (struct drm_i915_private *i915,unsigned int size) -{ -return intel_gt_init_scratch (&i915->gt, size); -} - -static void i915_gem_fini_scratch (struct drm_i915_private *i915) -{ -intel_gt_fini_scratch (&i915->gt); -} -static int intel_engines_verify_workarounds (struct drm_i915_private *i915) {struct intel_engine_cs *engine;
@@ -1436,12 +1425,7 @@ int i915_gem_init(struct drm_i915_private *dev_priv) goto err_unlock; } - ret =i915_gem_init_scratch (dev_priv, -IS_GEN (dev_priv,2 ) ?SZ_256K :PAGE_SIZE ); -if (ret) { -GEM_BUG_ON (ret == -EIO ); - goto err_ggtt; - } +intel_gt_init (&dev_priv->gt); ret =intel_engines_setup (dev_priv);if (ret) {
@@ -1534,8 +1518,7 @@ int i915_gem_init(struct drm_i915_private *dev_priv)if (ret != -EIO )i915_gem_contexts_fini (dev_priv); err_scratch: -i915_gem_fini_scratch (dev_priv); -err_ggtt: +intel_gt_driver_release (&dev_priv->gt); err_unlock:intel_uncore_forcewake_put (&dev_priv->uncore,FORCEWAKE_ALL );mutex_unlock (&dev_priv->drm.struct_mutex);
@@ -1587,12 +1570,10 @@ void i915_gem_driver_unregister(struct drm_i915_private *i915)void i915_gem_driver_remove (struct drm_i915_private *dev_priv) { -GEM_BUG_ON (dev_priv->gt.awake); -intel_wakeref_auto_fini (&dev_priv->ggtt.userfault_wakeref);i915_gem_suspend_late (dev_priv); -intel_disable_gt_powersave (dev_priv); +intel_gt_driver_remove (&dev_priv->gt);/* Flush any outstanding unpin_work. */ i915_gem_drain_workqueue (dev_priv);
@@ -1610,13 +1591,11 @@ void i915_gem_driver_release(struct drm_i915_private *dev_priv)mutex_lock (&dev_priv->drm.struct_mutex);intel_engines_cleanup (dev_priv);i915_gem_contexts_fini (dev_priv); -i915_gem_fini_scratch (dev_priv); +intel_gt_driver_release (&dev_priv->gt);mutex_unlock (&dev_priv->drm.struct_mutex);intel_wa_list_free (&dev_priv->gt_wa_list); -intel_cleanup_gt_powersave (dev_priv); -intel_uc_cleanup_firmwares (&dev_priv->gt.uc);i915_gem_cleanup_userptr (dev_priv);intel_timelines_fini (dev_priv);
Signature · 6 lines
2.23.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.CHECKPATCH: warning for drm/i915: Hook up GT power management
== Series Details ==
== Series Details ==
Series: drm/i915: Hook up GT power management
URL : https://patchwork.freedesktop.org/series/66137/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip a6b2b3196efe drm/i915: Hook up GT power management -:58: CHECK:BRACES: Blank lines aren't necessary before a close brace '}' #58: FILE: drivers/gpu/drm/i915/gt/intel_gt.c:234: + +}
total: 0 errors, 0 warnings, 1 checks, 289 lines checked
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for drm/i915: Hook up GT power management
In reply to Andi Shyti== Series Details ==
== Series Details ==
Series: drm/i915: Hook up GT power management
URL : https://patchwork.freedesktop.org/series/66137/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_6821 -> Patchwork_14261
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_14261 absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_14261, 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_14261/
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_14261:
### IGT changes ###
#### Possible regressions ####
* igt@i915_module_load@reload-with-fault-injection:
- fi-elk-e7500: [PASS][1] -> [DMESG-WARN][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6821/fi-elk-e7500/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14261/fi-elk-e7500/igt@[email protected]
- fi-blb-e6850: [PASS][3] -> [DMESG-WARN][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6821/fi-blb-e6850/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14261/fi-blb-e6850/igt@[email protected]
- fi-bwr-2160: [PASS][5] -> [DMESG-WARN][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6821/fi-bwr-2160/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14261/fi-bwr-2160/igt@[email protected]
- fi-gdg-551: [PASS][7] -> [DMESG-WARN][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6821/fi-gdg-551/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14261/fi-gdg-551/igt@[email protected]
- fi-ilk-650: [PASS][9] -> [DMESG-WARN][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6821/fi-ilk-650/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14261/fi-ilk-650/igt@[email protected]
* igt@runner@aborted:
- fi-ilk-650: NOTRUN -> [FAIL][11]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14261/fi-ilk-650/igt@[email protected]
- fi-gdg-551: NOTRUN -> [FAIL][12]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14261/fi-gdg-551/igt@[email protected]
- fi-blb-e6850: NOTRUN -> [FAIL][13]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14261/fi-blb-e6850/igt@[email protected]
Known issues
------------
Here are the changes found in Patchwork_14261 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_render_tiled_blits@basic:
- fi-icl-u3: [PASS][14] -> [DMESG-WARN][15] ([fdo#107724])
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6821/fi-icl-u3/igt@[email protected]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14261/fi-icl-u3/igt@[email protected]
* igt@kms_frontbuffer_tracking@basic:
- fi-hsw-peppy: [PASS][16] -> [DMESG-WARN][17] ([fdo#102614])
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6821/fi-hsw-peppy/igt@[email protected]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14261/fi-hsw-peppy/igt@[email protected]
#### Possible fixes ####
* igt@gem_ringfill@basic-default:
- fi-icl-u3: [DMESG-WARN][18] ([fdo#107724]) -> [PASS][19]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6821/fi-icl-u3/igt@[email protected]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14261/fi-icl-u3/igt@[email protected]
* igt@i915_module_load@reload:
- fi-icl-u3: [DMESG-WARN][20] ([fdo#107724] / [fdo#111214]) -> [PASS][21]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6821/fi-icl-u3/igt@[email protected]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14261/fi-icl-u3/igt@[email protected]
* igt@i915_selftest@live_execlists:
- fi-skl-gvtdvm: [DMESG-FAIL][22] ([fdo#111108]) -> [PASS][23]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6821/fi-skl-gvtdvm/igt@i915_selftest@live_execlists.html
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14261/fi-skl-gvtdvm/igt@i915_selftest@live_execlists.html
* igt@kms_chamelium@dp-crc-fast:
- {fi-icl-u4}: [FAIL][24] ([fdo#111045]) -> [PASS][25]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6821/fi-icl-u4/igt@[email protected]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14261/fi-icl-u4/igt@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#102614]: https://bugs.freedesktop.org/show_bug.cgi?id=102614
[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724
[fdo#109644]: https://bugs.freedesktop.org/show_bug.cgi?id=109644
[fdo#110464]: https://bugs.freedesktop.org/show_bug.cgi?id=110464
[fdo#111045]: https://bugs.freedesktop.org/show_bug.cgi?id=111045
[fdo#111096]: https://bugs.freedesktop.org/show_bug.cgi?id=111096
[fdo#111108]: https://bugs.freedesktop.org/show_bug.cgi?id=111108
[fdo#111214]: https://bugs.freedesktop.org/show_bug.cgi?id=111214
Participating hosts (53 -> 46)
------------------------------
Missing (7): fi-ilk-m540 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_6821 -> Patchwork_14261
CI-20190529: 20190529
CI_DRM_6821: 62659d8a3af61190f79ceca1be30f0d7e7582ade @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5162: e62ea305fdba2a9cd0dadfa527b54529cb0d1438 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_14261: a6b2b3196efe95f6f8fc8f971b7a1ebbdfd20786 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
a6b2b3196efe drm/i915: Hook up GT power management
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14261/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx