drm/i915/psr: Fix warning in intel_psr_activate()
Subsystems (2)
PATCH 1/1 drm/i915/psr: Fix warning in intel_psr_activate()
commit 5422b37c907e ("drm/i915/psr: Kill delays when activating psr back.") removed the call to cancel a scheduled psr_work from psr_disable() and instead added an early return in the work function. But, if the scheduled work item is executed after psr_enable(), we end up printing warnings as PSR is already enabled and active. So, put the cancel_work call back in psr_disable().
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=106948
--- drivers/gpu/drm/i915/intel_psr.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/i915/intel_psr.c +1 -0
@@ -754,6 +754,7 @@ void intel_psr_disable(struct intel_dp *intel_dp, dev_priv->psr.enabled =NULL ;mutex_unlock (&dev_priv->psr.lock); +cancel_work_sync (&dev_priv->psr.work); }static bool psr_wait_for_idle (struct drm_i915_private *dev_priv)
Signature · 6 lines
2.14.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915/psr: Fix warning in intel_psr_activate()
== Series Details ==
== Series Details ==
Series: drm/i915/psr: Fix warning in intel_psr_activate()
URL : https://patchwork.freedesktop.org/series/44978/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4338 -> Patchwork_9357 =
== Summary - WARNING ==
Minor unknown changes coming with Patchwork_9357 need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_9357, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
External URL: https://patchwork.freedesktop.org/api/1.0/series/44978/revisions/1/mbox/
== Possible new issues ==
Here are the unknown changes that may have been introduced in Patchwork_9357:
=== IGT changes ===
==== Warnings ====
igt@gem_exec_gttfill@basic:
fi-pnv-d510: SKIP -> PASS== Known issues ==
Here are the changes found in Patchwork_9357 that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@kms_flip@basic-flip-vs-dpms:
fi-glk-j4005: PASS -> DMESG-WARN (fdo#106000)
==== Possible fixes ====
igt@kms_flip@basic-flip-vs-dpms:
fi-skl-6700hq: DMESG-WARN (fdo#105998) -> PASS
igt@kms_flip@basic-flip-vs-modeset:
fi-glk-j4005: DMESG-WARN (fdo#106097, fdo#106000) -> PASS
igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b:
fi-snb-2520m: INCOMPLETE (fdo#103713) -> PASS
igt@kms_pipe_crc_basic@suspend-read-crc-pipe-c:
fi-glk-j4005: DMESG-WARN (fdo#106238) -> PASS fdo#103713 https://bugs.freedesktop.org/show_bug.cgi?id=103713
fdo#105998 https://bugs.freedesktop.org/show_bug.cgi?id=105998
fdo#106000 https://bugs.freedesktop.org/show_bug.cgi?id=106000
fdo#106097 https://bugs.freedesktop.org/show_bug.cgi?id=106097
fdo#106238 https://bugs.freedesktop.org/show_bug.cgi?id=106238
== Participating hosts (43 -> 38) ==
Missing (5): fi-ctg-p8600 fi-ilk-m540 fi-byt-squawks fi-bsw-cyan fi-hsw-4200u
== Build changes ==
* Linux: CI_DRM_4338 -> Patchwork_9357
CI_DRM_4338: aaff08aa219c692656c858b7c667881e35561490 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4523: 778497e7965dc8662c770a89ebbd741778feb71e @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9357: a8d72caeec0eb3576a0935f1a84a11ec7170738f @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
a8d72caeec0e drm/i915/psr: Fix warning in intel_psr_activate()
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9357/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 7 lines · Dhinakaran Pandiyan
commit
5422b37c907e("drm/i915/psr: Kill delays when activating psr back.") removed the call to cancel a scheduledpsr_workfrompsr_disable()and instead added an early return in the work function. But, if the scheduled work item is executed afterpsr_enable(), we end up printing warnings as PSR is already enabled and active. So, put thecancel_workcall back inpsr_disable().
Quoted 5 lines
Cc Rodrigo Vivi <[email protected]>Cc José Roberto de Souza <[email protected]>Fixes 5422b37c907e ("drm/i915/psr: Kill delays when activating psr back.")Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=106948
Signed-off-by Dhinakaran Pandiyan <[email protected]>
sorry and thanks for fixing it.
Quoted 19 lines
--- drivers/gpu/drm/i915/intel_psr.c | 1 + 1 file changed, 1 insertion(+)drivers/gpu/drm/i915/intel_psr.c +1
-0@@ -754,6 +754,7 @@ void intel_psr_disable(struct intel_dp *intel_dp, dev_priv->psr.enabled =NULL ;mutex_unlock (&dev_priv->psr.lock); +cancel_work_sync (&dev_priv->psr.work); }static bool psr_wait_for_idle (struct drm_i915_private *dev_priv)Signature · 1 line
2.14.1
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 17 lines · Rodrigo Vivi
Quoted 10 lines · Dhinakaran Pandiyan
commit
5422b37c907e("drm/i915/psr: Kill delays when activating psr back.") removed the call to cancel a scheduledpsr_workfrompsr_disable()and instead added an early return in the work function. But,
if the scheduled work item is executed afterpsr_enable(), we end up
printing warnings as PSR is already enabled and active. So, put thecancel_workcall back inpsr_disable().Quoted 6 lines
Cc Rodrigo Vivi <[email protected]>Cc José Roberto de Souza <[email protected]>Fixes 5422b37c907e ("drm/i915/psr: Kill delays when activating psrback.")
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=106948Signed-off-by Dhinakaran Pandiyan <[email protected]>
Quoted 4 lines
Reviewed-by Rodrigo Vivi <[email protected]>sorry and thanks for fixing it.
Not a problem. Thanks for the review, patch pushed to dinq
-DK
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success for drm/i915/psr: Fix warning in intel_psr_activate()
In reply to Dhinakaran Pandiyan== Series Details ==
== Series Details ==
Series: drm/i915/psr: Fix warning in intel_psr_activate()
URL : https://patchwork.freedesktop.org/series/44978/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4338_full -> Patchwork_9357_full =
== Summary - SUCCESS ==
No regressions found.
== Known issues ==
Here are the changes found in Patchwork_9357_full that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@drv_selftest@live_gtt:
shard-glk: PASS -> FAIL (fdo#105347)
igt@kms_flip@basic-flip-vs-wf_vblank:
shard-glk: PASS -> FAIL (fdo#103928)
igt@kms_flip_tiling@flip-x-tiled:
shard-glk: PASS -> FAIL (fdo#103822, fdo#104724)
igt@kms_flip_tiling@flip-y-tiled:
shard-glk: PASS -> FAIL (fdo#104724)
==== Possible fixes ====
igt@drv_selftest@live_gtt:
shard-apl: FAIL (fdo#105347) -> PASS
igt@drv_suspend@shrink:
shard-kbl: INCOMPLETE (fdo#103665, fdo#106886) -> PASS
igt@kms_setmode@basic:
shard-kbl: FAIL (fdo#99912) -> PASS fdo#103665 https://bugs.freedesktop.org/show_bug.cgi?id=103665
fdo#103822 https://bugs.freedesktop.org/show_bug.cgi?id=103822
fdo#103928 https://bugs.freedesktop.org/show_bug.cgi?id=103928
fdo#104724 https://bugs.freedesktop.org/show_bug.cgi?id=104724
fdo#105347 https://bugs.freedesktop.org/show_bug.cgi?id=105347
fdo#106886 https://bugs.freedesktop.org/show_bug.cgi?id=106886
fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912
== Participating hosts (5 -> 5) ==
No changes in participating hosts
== Build changes ==
* Linux: CI_DRM_4338 -> Patchwork_9357
CI_DRM_4338: aaff08aa219c692656c858b7c667881e35561490 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4523: 778497e7965dc8662c770a89ebbd741778feb71e @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9357: a8d72caeec0eb3576a0935f1a84a11ec7170738f @ 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_9357/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx