* [PATCH] drm/i915: Lock mode_config.mutex in intel_display_resume.
@ 2016-02-16 14:27 Maarten Lankhorst
2016-02-16 15:12 ` Daniel Vetter
2016-02-16 16:21 ` ✗ Fi.CI.BAT: failure for " Patchwork
0 siblings, 2 replies; 3+ messages in thread
From: Maarten Lankhorst @ 2016-02-16 14:27 UTC (permalink / raw)
To: intel-gfx
Unfortunately i915 is still not fully atomic, and expects mode_config.mutex
to be held during modeset until we finally fix it.
This fixes the following WARN when resuming:
[ 425.208983] ------------[ cut here ]------------
[ 425.208990] WARNING: CPU: 0 PID: 6828 at drivers/gpu/drm/drm_edid.c:3555 drm_select_eld+0xa5/0xd0()
[ 425.209015] Modules linked in: pl2303 usbserial snd_hda_codec_hdmi snd_hda_codec_realtek snd_hda_codec_generic intel_powerclamp coretemp i915 crct10dif_pclmul crc32_pclmul ghash_clmulni_intel snd_hda_intel snd_hda_codec snd_hwdep lpc_ich snd_hda_core snd_pcm i2c_hid i2c_designware_platform i2c_designware_core r8169 mii sdhci_acpi sdhci mmc_core
[ 425.209018] CPU: 0 PID: 6828 Comm: kworker/u4:5 Tainted: G U W 4.5.0-rc4-gfxbench+ #1
[ 425.209020] Hardware name: \xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff \xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff/DN2820FYK, BIOS FYBYT10H.86A.0038.2014.0717.1455 07/17/2014
[ 425.209027] Workqueue: events_unbound async_run_entry_fn
[ 425.209032] 0000000000000000 ffff880072433958 ffffffff813f6b05 0000000000000000
[ 425.209036] ffffffff81aaef2d ffff880072433990 ffffffff81078291 ffff880036b933d8
[ 425.209039] ffff88006d528000 ffff88006d52b3d8 ffff88006d52b3d8 ffff88007315b6f8
[ 425.209040] Call Trace:
[ 425.209045] [<ffffffff813f6b05>] dump_stack+0x67/0x92
[ 425.209049] [<ffffffff81078291>] warn_slowpath_common+0x81/0xc0
[ 425.209052] [<ffffffff81078385>] warn_slowpath_null+0x15/0x20
[ 425.209054] [<ffffffff8151e195>] drm_select_eld+0xa5/0xd0
[ 425.209101] [<ffffffffa01f34f4>] intel_audio_codec_enable+0x44/0x160 [i915]
[ 425.209135] [<ffffffffa023eac7>] intel_enable_hdmi_audio+0x87/0x90 [i915]
[ 425.209169] [<ffffffffa023eb5a>] g4x_enable_hdmi+0x8a/0xa0 [i915]
[ 425.209202] [<ffffffffa023f41b>] vlv_hdmi_pre_enable+0x1cb/0x240 [i915]
[ 425.209236] [<ffffffffa020edcf>] valleyview_crtc_enable+0x10f/0x290 [i915]
[ 425.209270] [<ffffffffa020ba49>] intel_atomic_commit+0x769/0x17a0 [i915]
[ 425.209274] [<ffffffff81526ad5>] ? drm_atomic_check_only+0x145/0x660
[ 425.209276] [<ffffffff81527022>] drm_atomic_commit+0x32/0x50
[ 425.209310] [<ffffffffa0215fa0>] intel_display_resume+0xa0/0x130 [i915]
[ 425.209338] [<ffffffffa018c1bb>] i915_drm_resume+0xcb/0x160 [i915]
[ 425.209366] [<ffffffffa018c272>] i915_pm_resume+0x22/0x30 [i915]
[ 425.209370] [<ffffffff8143d91e>] pci_pm_resume+0x6e/0xe0
[ 425.209373] [<ffffffff8143d8b0>] ? pci_pm_resume_noirq+0xa0/0xa0
[ 425.209375] [<ffffffff815409ae>] dpm_run_callback+0x6e/0x280
[ 425.209378] [<ffffffff815410b2>] device_resume+0x92/0x250
[ 425.209380] [<ffffffff81541288>] async_resume+0x18/0x40
[ 425.209382] [<ffffffff8109c7a5>] async_run_entry_fn+0x45/0x140
[ 425.209386] [<ffffffff81093293>] process_one_work+0x1e3/0x620
[ 425.209388] [<ffffffff810931f7>] ? process_one_work+0x147/0x620
[ 425.209391] [<ffffffff81093719>] worker_thread+0x49/0x490
[ 425.209393] [<ffffffff810936d0>] ? process_one_work+0x620/0x620
[ 425.209396] [<ffffffff81099e0a>] kthread+0xea/0x100
[ 425.209400] [<ffffffff81099d20>] ? kthread_create_on_node+0x1f0/0x1f0
[ 425.209404] [<ffffffff817ba03f>] ret_from_fork+0x3f/0x70
[ 425.209407] [<ffffffff81099d20>] ? kthread_create_on_node+0x1f0/0x1f0
[ 425.209409] ---[ end trace d1b247107f34a8b2 ]---
Fixes: e2c8b8701e2d ("drm/i915: Use atomic helpers for suspend, v2.")
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
---
drivers/gpu/drm/i915/intel_display.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 568eefc7cc62..aedddaabc06b 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -15883,6 +15883,13 @@ void intel_display_resume(struct drm_device *dev)
dev_priv->modeset_restore_state = NULL;
+ /*
+ * This is a cludge because with real atomic modeset mode_config.mutex
+ * won't be taken. Unfortunately some probed state like
+ * audio_codec_enable is still protected by mode_config.mutex, so lock
+ * it here for now.
+ */
+ mutex_lock(&dev->mode_config.mutex);
drm_modeset_acquire_init(&ctx, 0);
retry:
@@ -15921,6 +15928,7 @@ retry:
drm_modeset_drop_locks(&ctx);
drm_modeset_acquire_fini(&ctx);
+ mutex_unlock(&dev->mode_config.mutex);
if (ret) {
DRM_ERROR("Restoring old state failed with %i\n", ret);
--
2.1.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/i915: Lock mode_config.mutex in intel_display_resume.
2016-02-16 14:27 [PATCH] drm/i915: Lock mode_config.mutex in intel_display_resume Maarten Lankhorst
@ 2016-02-16 15:12 ` Daniel Vetter
2016-02-16 16:21 ` ✗ Fi.CI.BAT: failure for " Patchwork
1 sibling, 0 replies; 3+ messages in thread
From: Daniel Vetter @ 2016-02-16 15:12 UTC (permalink / raw)
To: Maarten Lankhorst; +Cc: intel-gfx
On Tue, Feb 16, 2016 at 03:27:42PM +0100, Maarten Lankhorst wrote:
> Unfortunately i915 is still not fully atomic, and expects mode_config.mutex
> to be held during modeset until we finally fix it.
>
> This fixes the following WARN when resuming:
>
> [ 425.208983] ------------[ cut here ]------------
> [ 425.208990] WARNING: CPU: 0 PID: 6828 at drivers/gpu/drm/drm_edid.c:3555 drm_select_eld+0xa5/0xd0()
> [ 425.209015] Modules linked in: pl2303 usbserial snd_hda_codec_hdmi snd_hda_codec_realtek snd_hda_codec_generic intel_powerclamp coretemp i915 crct10dif_pclmul crc32_pclmul ghash_clmulni_intel snd_hda_intel snd_hda_codec snd_hwdep lpc_ich snd_hda_core snd_pcm i2c_hid i2c_designware_platform i2c_designware_core r8169 mii sdhci_acpi sdhci mmc_core
> [ 425.209018] CPU: 0 PID: 6828 Comm: kworker/u4:5 Tainted: G U W 4.5.0-rc4-gfxbench+ #1
> [ 425.209020] Hardware name: \xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff \xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff/DN2820FYK, BIOS FYBYT10H.86A.0038.2014.0717.1455 07/17/2014
> [ 425.209027] Workqueue: events_unbound async_run_entry_fn
> [ 425.209032] 0000000000000000 ffff880072433958 ffffffff813f6b05 0000000000000000
> [ 425.209036] ffffffff81aaef2d ffff880072433990 ffffffff81078291 ffff880036b933d8
> [ 425.209039] ffff88006d528000 ffff88006d52b3d8 ffff88006d52b3d8 ffff88007315b6f8
> [ 425.209040] Call Trace:
> [ 425.209045] [<ffffffff813f6b05>] dump_stack+0x67/0x92
> [ 425.209049] [<ffffffff81078291>] warn_slowpath_common+0x81/0xc0
> [ 425.209052] [<ffffffff81078385>] warn_slowpath_null+0x15/0x20
> [ 425.209054] [<ffffffff8151e195>] drm_select_eld+0xa5/0xd0
> [ 425.209101] [<ffffffffa01f34f4>] intel_audio_codec_enable+0x44/0x160 [i915]
> [ 425.209135] [<ffffffffa023eac7>] intel_enable_hdmi_audio+0x87/0x90 [i915]
> [ 425.209169] [<ffffffffa023eb5a>] g4x_enable_hdmi+0x8a/0xa0 [i915]
> [ 425.209202] [<ffffffffa023f41b>] vlv_hdmi_pre_enable+0x1cb/0x240 [i915]
> [ 425.209236] [<ffffffffa020edcf>] valleyview_crtc_enable+0x10f/0x290 [i915]
> [ 425.209270] [<ffffffffa020ba49>] intel_atomic_commit+0x769/0x17a0 [i915]
> [ 425.209274] [<ffffffff81526ad5>] ? drm_atomic_check_only+0x145/0x660
> [ 425.209276] [<ffffffff81527022>] drm_atomic_commit+0x32/0x50
> [ 425.209310] [<ffffffffa0215fa0>] intel_display_resume+0xa0/0x130 [i915]
> [ 425.209338] [<ffffffffa018c1bb>] i915_drm_resume+0xcb/0x160 [i915]
> [ 425.209366] [<ffffffffa018c272>] i915_pm_resume+0x22/0x30 [i915]
> [ 425.209370] [<ffffffff8143d91e>] pci_pm_resume+0x6e/0xe0
> [ 425.209373] [<ffffffff8143d8b0>] ? pci_pm_resume_noirq+0xa0/0xa0
> [ 425.209375] [<ffffffff815409ae>] dpm_run_callback+0x6e/0x280
> [ 425.209378] [<ffffffff815410b2>] device_resume+0x92/0x250
> [ 425.209380] [<ffffffff81541288>] async_resume+0x18/0x40
> [ 425.209382] [<ffffffff8109c7a5>] async_run_entry_fn+0x45/0x140
> [ 425.209386] [<ffffffff81093293>] process_one_work+0x1e3/0x620
> [ 425.209388] [<ffffffff810931f7>] ? process_one_work+0x147/0x620
> [ 425.209391] [<ffffffff81093719>] worker_thread+0x49/0x490
> [ 425.209393] [<ffffffff810936d0>] ? process_one_work+0x620/0x620
> [ 425.209396] [<ffffffff81099e0a>] kthread+0xea/0x100
> [ 425.209400] [<ffffffff81099d20>] ? kthread_create_on_node+0x1f0/0x1f0
> [ 425.209404] [<ffffffff817ba03f>] ret_from_fork+0x3f/0x70
> [ 425.209407] [<ffffffff81099d20>] ? kthread_create_on_node+0x1f0/0x1f0
> [ 425.209409] ---[ end trace d1b247107f34a8b2 ]---
>
> Fixes: e2c8b8701e2d ("drm/i915: Use atomic helpers for suspend, v2.")
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Please push once CI has approved it too ;-)
-Daniel
> ---
> drivers/gpu/drm/i915/intel_display.c | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 568eefc7cc62..aedddaabc06b 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -15883,6 +15883,13 @@ void intel_display_resume(struct drm_device *dev)
>
> dev_priv->modeset_restore_state = NULL;
>
> + /*
> + * This is a cludge because with real atomic modeset mode_config.mutex
> + * won't be taken. Unfortunately some probed state like
> + * audio_codec_enable is still protected by mode_config.mutex, so lock
> + * it here for now.
> + */
> + mutex_lock(&dev->mode_config.mutex);
> drm_modeset_acquire_init(&ctx, 0);
>
> retry:
> @@ -15921,6 +15928,7 @@ retry:
>
> drm_modeset_drop_locks(&ctx);
> drm_modeset_acquire_fini(&ctx);
> + mutex_unlock(&dev->mode_config.mutex);
>
> if (ret) {
> DRM_ERROR("Restoring old state failed with %i\n", ret);
> --
> 2.1.0
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 3+ messages in thread
* ✗ Fi.CI.BAT: failure for drm/i915: Lock mode_config.mutex in intel_display_resume.
2016-02-16 14:27 [PATCH] drm/i915: Lock mode_config.mutex in intel_display_resume Maarten Lankhorst
2016-02-16 15:12 ` Daniel Vetter
@ 2016-02-16 16:21 ` Patchwork
1 sibling, 0 replies; 3+ messages in thread
From: Patchwork @ 2016-02-16 16:21 UTC (permalink / raw)
To: Maarten Lankhorst; +Cc: intel-gfx
== Summary ==
Series 3485v1 drm/i915: Lock mode_config.mutex in intel_display_resume.
http://patchwork.freedesktop.org/api/1.0/series/3485/revisions/1/mbox/
Test drv_module_reload_basic:
fail -> PASS (snb-dellxps)
Test gem_mmap_gtt:
Subgroup basic-write:
pass -> DMESG-WARN (bsw-nuc-2)
Test kms_force_connector_basic:
Subgroup force-edid:
skip -> PASS (snb-x220t)
skip -> PASS (ivb-t430s)
Subgroup prune-stale-modes:
skip -> PASS (ivb-t430s)
Test kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-a:
dmesg-warn -> PASS (skl-i5k-2)
dmesg-warn -> PASS (snb-dellxps)
dmesg-warn -> PASS (hsw-brixbox)
dmesg-warn -> PASS (byt-nuc)
Subgroup suspend-read-crc-pipe-b:
pass -> DMESG-WARN (skl-i5k-2)
dmesg-warn -> PASS (hsw-gt2)
dmesg-warn -> PASS (snb-dellxps)
dmesg-warn -> PASS (hsw-brixbox)
dmesg-warn -> PASS (byt-nuc)
Subgroup suspend-read-crc-pipe-c:
dmesg-warn -> PASS (bsw-nuc-2)
dmesg-warn -> INCOMPLETE (hsw-gt2)
dmesg-warn -> PASS (hsw-brixbox)
Test pm_rpm:
Subgroup basic-pci-d3-state:
pass -> DMESG-WARN (byt-nuc)
Subgroup basic-rte:
dmesg-warn -> PASS (bsw-nuc-2)
bdw-ultra total:165 pass:152 dwarn:0 dfail:0 fail:0 skip:13
bsw-nuc-2 total:165 pass:135 dwarn:1 dfail:0 fail:0 skip:29
byt-nuc total:165 pass:140 dwarn:1 dfail:0 fail:0 skip:24
hsw-brixbox total:165 pass:151 dwarn:0 dfail:0 fail:0 skip:14
hsw-gt2 total:85 pass:78 dwarn:0 dfail:0 fail:0 skip:6
ivb-t430s total:165 pass:150 dwarn:0 dfail:0 fail:1 skip:14
skl-i5k-2 total:165 pass:149 dwarn:1 dfail:0 fail:0 skip:15
snb-dellxps total:165 pass:142 dwarn:0 dfail:0 fail:1 skip:22
snb-x220t total:165 pass:142 dwarn:0 dfail:0 fail:2 skip:21
Results at /archive/results/CI_IGT_test/Patchwork_1415/
d6fbb21195050d1fcff27e5918114fb5ef66c137 drm-intel-nightly: 2016y-02m-16d-14h-37m-16s UTC integration manifest
8b2c8ef0acd075cbacd9d3b59fa6514d0cd67897 drm/i915: Lock mode_config.mutex in intel_display_resume.
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-02-16 16:21 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-02-16 14:27 [PATCH] drm/i915: Lock mode_config.mutex in intel_display_resume Maarten Lankhorst
2016-02-16 15:12 ` Daniel Vetter
2016-02-16 16:21 ` ✗ 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.