* [Intel-gfx] [CI] drm/i915/dp: Track pm_qos per connector
@ 2020-12-30 19:12 Chris Wilson
2020-12-30 20:48 ` [Intel-gfx] ✗ Fi.CI.BAT: failure for " Patchwork
0 siblings, 1 reply; 2+ messages in thread
From: Chris Wilson @ 2020-12-30 19:12 UTC (permalink / raw)
To: intel-gfx
Since multiple connectors may run intel_dp_aux_xfer conncurrently, a
single global pm_qos does not suffice. (One connector may disable the
dma-latency boost prematurely while the second is still depending on
it.) Instead of a single global pm_qos, track the pm_qos request for
each intel_dp.
v2: Move the pm_qos setup/teardown to intel_dp_aux_init/fini
Fixes: 9ee32fea5fe8 ("drm/i915: irq-drive the dp aux communication")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Imre Deak <imre.deak@intel.com>
Reviewed-by: Imre Deak <imre.deak@intel.com>
---
drivers/gpu/drm/i915/display/intel_display_types.h | 3 +++
drivers/gpu/drm/i915/display/intel_dp.c | 6 ++++--
drivers/gpu/drm/i915/i915_drv.c | 5 -----
drivers/gpu/drm/i915/i915_drv.h | 3 ---
4 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h
index b86ba1bdbaa3..1067bd073c95 100644
--- a/drivers/gpu/drm/i915/display/intel_display_types.h
+++ b/drivers/gpu/drm/i915/display/intel_display_types.h
@@ -1463,6 +1463,9 @@ struct intel_dp {
bool rgb_to_ycbcr;
} dfp;
+ /* To control wakeup latency, e.g. for irq-driven dp aux transfers. */
+ struct pm_qos_request pm_qos;
+
/* Display stream compression testing */
bool force_dsc_en;
diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
index f0e8aaac413c..c23bfa9c34ca 100644
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@ -1512,7 +1512,7 @@ intel_dp_aux_xfer(struct intel_dp *intel_dp,
* lowest possible wakeup latency and so prevent the cpu from going into
* deep sleep states.
*/
- cpu_latency_qos_update_request(&i915->pm_qos, 0);
+ cpu_latency_qos_update_request(&intel_dp->pm_qos, 0);
intel_dp_check_edp(intel_dp);
@@ -1645,7 +1645,7 @@ intel_dp_aux_xfer(struct intel_dp *intel_dp,
ret = recv_bytes;
out:
- cpu_latency_qos_update_request(&i915->pm_qos, PM_QOS_DEFAULT_VALUE);
+ cpu_latency_qos_update_request(&intel_dp->pm_qos, PM_QOS_DEFAULT_VALUE);
if (vdd)
edp_panel_vdd_off(intel_dp, false);
@@ -1921,6 +1921,7 @@ static i915_reg_t tgl_aux_data_reg(struct intel_dp *intel_dp, int index)
static void
intel_dp_aux_fini(struct intel_dp *intel_dp)
{
+ cpu_latency_qos_remove_request(&intel_dp->pm_qos);
kfree(intel_dp->aux.name);
}
@@ -1973,6 +1974,7 @@ intel_dp_aux_init(struct intel_dp *intel_dp)
encoder->base.name);
intel_dp->aux.transfer = intel_dp_aux_transfer;
+ cpu_latency_qos_add_request(&intel_dp->pm_qos, PM_QOS_DEFAULT_VALUE);
}
bool intel_dp_source_supports_hbr2(struct intel_dp *intel_dp)
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 5708e11d917b..249f765993f7 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -578,8 +578,6 @@ static int i915_driver_hw_probe(struct drm_i915_private *dev_priv)
pci_set_master(pdev);
- cpu_latency_qos_add_request(&dev_priv->pm_qos, PM_QOS_DEFAULT_VALUE);
-
intel_gt_init_workarounds(dev_priv);
/* On the 945G/GM, the chipset reports the MSI capability on the
@@ -626,7 +624,6 @@ static int i915_driver_hw_probe(struct drm_i915_private *dev_priv)
err_msi:
if (pdev->msi_enabled)
pci_disable_msi(pdev);
- cpu_latency_qos_remove_request(&dev_priv->pm_qos);
err_mem_regions:
intel_memory_regions_driver_release(dev_priv);
err_ggtt:
@@ -648,8 +645,6 @@ static void i915_driver_hw_remove(struct drm_i915_private *dev_priv)
if (pdev->msi_enabled)
pci_disable_msi(pdev);
-
- cpu_latency_qos_remove_request(&dev_priv->pm_qos);
}
/**
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index e38a10d5c128..5e5bcef20e33 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -891,9 +891,6 @@ struct drm_i915_private {
bool display_irqs_enabled;
- /* To control wakeup latency, e.g. for irq-driven dp aux transfers. */
- struct pm_qos_request pm_qos;
-
/* Sideband mailbox protection */
struct mutex sb_lock;
struct pm_qos_request sb_qos;
--
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] 2+ messages in thread
* [Intel-gfx] ✗ Fi.CI.BAT: failure for drm/i915/dp: Track pm_qos per connector
2020-12-30 19:12 [Intel-gfx] [CI] drm/i915/dp: Track pm_qos per connector Chris Wilson
@ 2020-12-30 20:48 ` Patchwork
0 siblings, 0 replies; 2+ messages in thread
From: Patchwork @ 2020-12-30 20:48 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
[-- Attachment #1.1: Type: text/plain, Size: 9529 bytes --]
== Series Details ==
Series: drm/i915/dp: Track pm_qos per connector
URL : https://patchwork.freedesktop.org/series/85333/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_9534 -> Patchwork_19232
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_19232 absolutely need to be
verified manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_19232, 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_19232/index.html
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_19232:
### IGT changes ###
#### Possible regressions ####
* igt@core_hotunplug@unbind-rebind:
- fi-tgl-u2: [PASS][1] -> [DMESG-WARN][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9534/fi-tgl-u2/igt@core_hotunplug@unbind-rebind.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19232/fi-tgl-u2/igt@core_hotunplug@unbind-rebind.html
- fi-cfl-guc: [PASS][3] -> [DMESG-WARN][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9534/fi-cfl-guc/igt@core_hotunplug@unbind-rebind.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19232/fi-cfl-guc/igt@core_hotunplug@unbind-rebind.html
- fi-cml-s: [PASS][5] -> [DMESG-WARN][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9534/fi-cml-s/igt@core_hotunplug@unbind-rebind.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19232/fi-cml-s/igt@core_hotunplug@unbind-rebind.html
- fi-cfl-8700k: [PASS][7] -> [DMESG-WARN][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9534/fi-cfl-8700k/igt@core_hotunplug@unbind-rebind.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19232/fi-cfl-8700k/igt@core_hotunplug@unbind-rebind.html
- fi-icl-u2: [PASS][9] -> [DMESG-WARN][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9534/fi-icl-u2/igt@core_hotunplug@unbind-rebind.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19232/fi-icl-u2/igt@core_hotunplug@unbind-rebind.html
- fi-kbl-guc: [PASS][11] -> [DMESG-WARN][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9534/fi-kbl-guc/igt@core_hotunplug@unbind-rebind.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19232/fi-kbl-guc/igt@core_hotunplug@unbind-rebind.html
- fi-glk-dsi: [PASS][13] -> [DMESG-WARN][14]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9534/fi-glk-dsi/igt@core_hotunplug@unbind-rebind.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19232/fi-glk-dsi/igt@core_hotunplug@unbind-rebind.html
#### Warnings ####
* igt@core_hotunplug@unbind-rebind:
- fi-bdw-5557u: [WARN][15] ([i915#2283]) -> [DMESG-WARN][16]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9534/fi-bdw-5557u/igt@core_hotunplug@unbind-rebind.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19232/fi-bdw-5557u/igt@core_hotunplug@unbind-rebind.html
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses.
They do not affect the overall result.
* igt@core_hotunplug@unbind-rebind:
- {fi-ehl-1}: [PASS][17] -> [DMESG-WARN][18]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9534/fi-ehl-1/igt@core_hotunplug@unbind-rebind.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19232/fi-ehl-1/igt@core_hotunplug@unbind-rebind.html
Known issues
------------
Here are the changes found in Patchwork_19232 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@amdgpu/amd_basic@cs-gfx:
- fi-kbl-soraka: NOTRUN -> [SKIP][19] ([fdo#109271]) +15 similar issues
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19232/fi-kbl-soraka/igt@amdgpu/amd_basic@cs-gfx.html
* igt@gem_close_race@basic-threads:
- fi-tgl-y: [PASS][20] -> [DMESG-WARN][21] ([i915#402])
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9534/fi-tgl-y/igt@gem_close_race@basic-threads.html
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19232/fi-tgl-y/igt@gem_close_race@basic-threads.html
* igt@gem_exec_suspend@basic-s3:
- fi-tgl-u2: [PASS][22] -> [FAIL][23] ([i915#1888])
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9534/fi-tgl-u2/igt@gem_exec_suspend@basic-s3.html
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19232/fi-tgl-u2/igt@gem_exec_suspend@basic-s3.html
* igt@i915_selftest@live@gem:
- fi-bsw-nick: [PASS][24] -> [DMESG-WARN][25] ([i915#2826])
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9534/fi-bsw-nick/igt@i915_selftest@live@gem.html
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19232/fi-bsw-nick/igt@i915_selftest@live@gem.html
* igt@i915_selftest@live@gem_contexts:
- fi-bsw-nick: [PASS][26] -> [INCOMPLETE][27] ([i915#2369])
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9534/fi-bsw-nick/igt@i915_selftest@live@gem_contexts.html
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19232/fi-bsw-nick/igt@i915_selftest@live@gem_contexts.html
* igt@i915_selftest@live@sanitycheck:
- fi-kbl-7500u: [PASS][28] -> [DMESG-WARN][29] ([i915#2605])
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9534/fi-kbl-7500u/igt@i915_selftest@live@sanitycheck.html
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19232/fi-kbl-7500u/igt@i915_selftest@live@sanitycheck.html
* igt@runner@aborted:
- fi-cfl-8700k: NOTRUN -> [FAIL][30] ([i915#2283] / [i915#2295] / [i915#483])
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19232/fi-cfl-8700k/igt@runner@aborted.html
- fi-icl-u2: NOTRUN -> [FAIL][31] ([i915#2283] / [i915#2295] / [i915#2724])
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19232/fi-icl-u2/igt@runner@aborted.html
- fi-glk-dsi: NOTRUN -> [FAIL][32] ([i915#2283] / [i915#2295] / [k.org#202321])
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19232/fi-glk-dsi/igt@runner@aborted.html
- fi-bsw-nick: NOTRUN -> [FAIL][33] ([i915#1436] / [i915#483])
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19232/fi-bsw-nick/igt@runner@aborted.html
- fi-bdw-5557u: NOTRUN -> [FAIL][34] ([i915#483])
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19232/fi-bdw-5557u/igt@runner@aborted.html
- fi-kbl-guc: NOTRUN -> [FAIL][35] ([i915#2283] / [i915#2295])
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19232/fi-kbl-guc/igt@runner@aborted.html
- fi-cml-s: NOTRUN -> [FAIL][36] ([i915#2283] / [i915#2295])
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19232/fi-cml-s/igt@runner@aborted.html
- fi-cfl-guc: NOTRUN -> [FAIL][37] ([i915#2283] / [i915#2295] / [i915#483])
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19232/fi-cfl-guc/igt@runner@aborted.html
- fi-tgl-u2: NOTRUN -> [FAIL][38] ([i915#1602])
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19232/fi-tgl-u2/igt@runner@aborted.html
#### Possible fixes ####
* igt@gem_basic@create-fd-close:
- fi-tgl-y: [DMESG-WARN][39] ([i915#402]) -> [PASS][40] +1 similar issue
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9534/fi-tgl-y/igt@gem_basic@create-fd-close.html
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19232/fi-tgl-y/igt@gem_basic@create-fd-close.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[i915#1436]: https://gitlab.freedesktop.org/drm/intel/issues/1436
[i915#1602]: https://gitlab.freedesktop.org/drm/intel/issues/1602
[i915#1888]: https://gitlab.freedesktop.org/drm/intel/issues/1888
[i915#2283]: https://gitlab.freedesktop.org/drm/intel/issues/2283
[i915#2295]: https://gitlab.freedesktop.org/drm/intel/issues/2295
[i915#2369]: https://gitlab.freedesktop.org/drm/intel/issues/2369
[i915#2605]: https://gitlab.freedesktop.org/drm/intel/issues/2605
[i915#2724]: https://gitlab.freedesktop.org/drm/intel/issues/2724
[i915#2826]: https://gitlab.freedesktop.org/drm/intel/issues/2826
[i915#402]: https://gitlab.freedesktop.org/drm/intel/issues/402
[i915#483]: https://gitlab.freedesktop.org/drm/intel/issues/483
[k.org#202321]: https://bugzilla.kernel.org/show_bug.cgi?id=202321
Participating hosts (42 -> 37)
------------------------------
Missing (5): fi-ilk-m540 fi-hsw-4200u fi-bsw-cyan fi-ctg-p8600 fi-bdw-samus
Build changes
-------------
* Linux: CI_DRM_9534 -> Patchwork_19232
CI-20190529: 20190529
CI_DRM_9534: 797de7a6fea9a997e5b529af8994b2f251779d0a @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5930: 9efe3bfcb2b1c3613dddc8761425aa6943fa162d @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_19232: 4d8f42bb30910e0fbde64c6dee23ffcb84efe057 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
4d8f42bb3091 drm/i915/dp: Track pm_qos per connector
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19232/index.html
[-- Attachment #1.2: Type: text/html, Size: 11596 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-12-30 20:48 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-30 19:12 [Intel-gfx] [CI] drm/i915/dp: Track pm_qos per connector Chris Wilson
2020-12-30 20:48 ` [Intel-gfx] ✗ Fi.CI.BAT: failure for " Patchwork
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.