drm/i915: Fix races on fbdev
Subsystems (2)
PATCH v2 1/1 drm/i915: Fix races on fbdev
The ->lastclose callback invokes intel_fbdev_restore_mode() and has been witnessed to run before intel_fbdev_initial_config_async() has finished.
We might likewise receive hotplug events before we've had a chance to fully set up the fbdev.
Fix by waiting for the asynchronous thread to finish.
v2:
An async_synchronize_full() was also added to intel_fbdev_set_suspend() in v1 which turned out to be entirely gratuitous. It caused a deadlock on suspend (discovered by CI, thanks to Damien Lespiau and Tomi Sarvela for CI support) and was unnecessary since a device is never suspended until its ->probe callback (and all asynchronous tasks it scheduled) have finished. See dpm_prepare(), which calls wait_for_device_probe(), which calls async_synchronize_full().
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93580
--- drivers/gpu/drm/i915/i915_dma.c | 8 +++----- drivers/gpu/drm/i915/intel_fbdev.c | 3 +++ 2 files changed, 6 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/i915_dma.c +3 -5
@@ -430,11 +430,9 @@ static int i915_load_modeset_init(struct drm_device *dev)* Some ports require correctly set-up hpd registers for detection to * work properly (leading to ghost connected connector status), e.g. VGA * on gm45. Hence we can only set up the initial fbdev config after hpd -* irqs are fully enabled. Now we should scan for the initial config -* only once hotplug handling is enabled, but due to screwed-up locking -* around kms/fbdev init we can't protect the fdbev initial config -* scanning against hotplug events. Hence do this first and ignore the -* tiny window where we will loose hotplug notifactions. +* irqs are fully enabled. We protect the fbdev initial config scanning +* against hotplug events by waiting in intel_fbdev_output_poll_changed +* until the asynchronous thread has finished. */ intel_fbdev_initial_config_async (dev);
drivers/gpu/drm/i915/intel_fbdev.c +3 -0
@@ -800,6 +800,8 @@ void intel_fbdev_set_suspend(struct drm_device *dev, int state, bool synchronousvoid intel_fbdev_output_poll_changed (struct drm_device *dev) {struct drm_i915_private *dev_priv = dev->dev_private; + +async_synchronize_full ();if (dev_priv->fbdev)drm_fb_helper_hotplug_event (&dev_priv->fbdev->helper); }
@@ -811,6 +813,7 @@ void intel_fbdev_restore_mode(struct drm_device *dev)struct intel_fbdev *ifbdev = dev_priv->fbdev;struct drm_fb_helper *fb_helper; +async_synchronize_full ();if (!ifbdev)return ;
Signature · 6 lines
1.8.5.2 (Apple Git-48) _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for drm/i915: Fix races on fbdev (rev2)
== Series Details ==
== Series Details ==
Series: drm/i915: Fix races on fbdev (rev2)
URL : https://patchwork.freedesktop.org/series/4068/
State : failure
== Summary ==
Series 4068v2 drm/i915: Fix races on fbdev
http://patchwork.freedesktop.org/api/1.0/series/4068/revisions/2/mbox/
Test gem_ringfill:
Subgroup basic-default-s3:
pass -> DMESG-WARN (bsw-nuc-2)
Test kms_flip:
Subgroup basic-flip-vs-modeset:
dmesg-warn -> PASS (bdw-ultra)
Test kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-c:
dmesg-warn -> PASS (bsw-nuc-2)bdw-nuci7 total:186 pass:174 dwarn:0 dfail:0 fail:0 skip:12 bdw-ultra total:186 pass:167 dwarn:0 dfail:0 fail:0 skip:19 bsw-nuc-2 total:186 pass:150 dwarn:1 dfail:0 fail:0 skip:35 byt-nuc total:186 pass:154 dwarn:0 dfail:0 fail:0 skip:32 skl-i5k-2 total:186 pass:165 dwarn:0 dfail:0 fail:0 skip:21 skl-i7k-2 total:186 pass:165 dwarn:0 dfail:0 fail:0 skip:21
Results at /archive/results/CI_IGT_test/Patchwork_1548/
ab403b26610034afe0e0c97d960782bad98b97d0 drm-intel-nightly: 2016y-03m-09d-09h-25m-31s UTC integration manifest a06328bd06f956c0b41202589175e68665c09ab1 drm/i915: Fix races on fbdev
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: ??? Fi.CI.BAT: failure for drm/i915: Fix races on fbdev (rev2)
Quoted 6 lines · Patchwork
== Series Details ==
Series: drm/i915: Fix races on fbdev (rev2)
URL : https://patchwork.freedesktop.org/series/4068/
State : failure
Quoted 8 lines
== Summary ==
Series 4068v2 drm/i915: Fix races on fbdev
http://patchwork.freedesktop.org/api/1.0/series/4068/revisions/2/mbox/Test
gem_ringfill:Subgroup basic-default-s3: pass -> DMESG-WARN (bsw-nuc-2)
Unrelated to this patch according to paste kindly provided by Tomi
Sarvela: http://paste.debian.net/413850/
Quoted 14 lines
Test
kms_flip:Subgroup basic-flip-vs-modeset: dmesg-warn -> PASS (bdw-ultra) Test kms_pipe_crc_basic: Subgroup suspend-read-crc-pipe-c: dmesg-warn -> PASS (bsw-nuc-2)bdw-nuci7 total:186 pass:174 dwarn:0 dfail:0 fail:0 skip:12 bdw-ultra total:186 pass:167 dwarn:0 dfail:0 fail:0 skip:19 bsw-nuc-2 total:186 pass:150 dwarn:1 dfail:0 fail:0 skip:35 byt-nuc total:186 pass:154 dwarn:0 dfail:0 fail:0 skip:32 skl-i5k-2 total:186 pass:165 dwarn:0 dfail:0 fail:0 skip:21 skl-i7k-2 total:186 pass:165 dwarn:0 dfail:0 fail:0 skip:21
Quoted 5 lines
Results at /archive/results/CI_IGT_test/Patchwork_1548/
ab403b26610034afe0e0c97d960782bad98b97d0drm-intel-nightly: 2016y-03m-09d-09h-25m-31s UTC integration manifesta06328bd06f956c0b41202589175e68665c09ab1drm/i915: Fix races on fbdev
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Daniel Vetter
AppliedQuoted 18 lines · Lukas Wunner
The ->lastclose callback invokes
intel_fbdev_restore_mode()and has been witnessed to run beforeintel_fbdev_initial_config_async()has finished.We might likewise receive hotplug events before we've had a chance to fully set up the fbdev.
Fix by waiting for the asynchronous thread to finish.
v2:
Anasync_synchronize_full()was also added tointel_fbdev_set_suspend()in v1 which turned out to be entirely gratuitous. It caused a deadlock on suspend (discovered by CI, thanks to Damien Lespiau and Tomi Sarvela for CI support) and was unnecessary since a device is never suspended until its ->probe callback (and all asynchronous tasks it scheduled) have finished. Seedpm_prepare(), which callswait_for_device_probe(), which callsasync_synchronize_full().
Quoted 6 lines
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93580
Reported-by Gustav Fägerlind <[email protected]>Reported-by "Li, Weinan Z" <[email protected]>Cc Chris Wilson <[email protected]>Signed-off-by Lukas Wunner <[email protected]>
Queued for -next, thanks for the patch.
-Daniel
Quoted 52 lines
--- drivers/gpu/drm/i915/i915_dma.c | 8 +++----- drivers/gpu/drm/i915/intel_fbdev.c | 3 +++ 2 files changed, 6 insertions(+), 5 deletions(-)drivers/gpu/drm/i915/i915_dma.c +3
-5@@ -430,11 +430,9 @@ static int i915_load_modeset_init(struct drm_device *dev)* Some ports require correctly set-up hpd registers for detection to * work properly (leading to ghost connected connector status), e.g. VGA * on gm45. Hence we can only set up the initial fbdev config after hpd -* irqs are fully enabled. Now we should scan for the initial config -* only once hotplug handling is enabled, but due to screwed-up locking -* around kms/fbdev init we can't protect the fdbev initial config -* scanning against hotplug events. Hence do this first and ignore the -* tiny window where we will loose hotplug notifactions. +* irqs are fully enabled. We protect the fbdev initial config scanning +* against hotplug events by waiting in intel_fbdev_output_poll_changed +* until the asynchronous thread has finished. */ intel_fbdev_initial_config_async (dev);drivers/gpu/drm/i915/intel_fbdev.c +3
-0@@ -800,6 +800,8 @@ void intel_fbdev_set_suspend(struct drm_device *dev, int state, bool synchronousvoid intel_fbdev_output_poll_changed (struct drm_device *dev) {struct drm_i915_private *dev_priv = dev->dev_private; + +async_synchronize_full ();if (dev_priv->fbdev)drm_fb_helper_hotplug_event (&dev_priv->fbdev->helper); }@@ -811,6 +813,7 @@ void intel_fbdev_restore_mode(struct drm_device *dev)struct intel_fbdev *ifbdev = dev_priv->fbdev;struct drm_fb_helper *fb_helper; +async_synchronize_full ();if (!ifbdev)return ;Signature · 6 lines
1.8.5.2 (Apple Git-48) _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx