Attachment 128952 Details for Bug 98690 – Patch: start the poll as the last thing on nouveau resume

[patch] Patch: start the poll as the last thing on nouveau resume

0001-drm-nouveau-Start-poll-as-the-last-thing-on-resume.patch (text/plain), 1.25 KB, created by Peter Ujfalusi on 2017-01-14 20:03:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Peter Ujfalusi

Created: 2017-01-14 20:03:11 UTC

Size: 1.25 KB

patch

obsolete

>From 08b221ab0a19073e0e4cf88a093ad8f5c8302e96 Mon Sep 17 00:00:00 2001
>From: Peter Ujfalusi <peter.ujfalusi@ti.com>
>Date: Sat, 14 Jan 2017 21:52:30 +0200
>Subject: [PATCH] drm/nouveau: Start poll as the last thing on resume
>
>To avoid race condition when we have pending delayed event waiting to be
>handled.
>
>Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
>---
> drivers/gpu/drm/nouveau/nouveau_drm.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
>diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c
>index 59348fc41c77..1e5340bae7db 100644
>--- a/drivers/gpu/drm/nouveau/nouveau_drm.c
>+++ b/drivers/gpu/drm/nouveau/nouveau_drm.c
>@@ -773,7 +773,6 @@ nouveau_pmops_runtime_resume(struct device *dev)
> 	pci_set_master(pdev);
> 
> 	ret = nouveau_do_resume(drm_dev, true);
>-	drm_kms_helper_poll_enable(drm_dev);
> 	/* do magic */
> 	nvif_mask(&device->object, 0x088488, (1 << 25), (1 << 25));
> 	vga_switcheroo_set_dynamic_switch(pdev, VGA_SWITCHEROO_ON);
>@@ -782,6 +781,9 @@ nouveau_pmops_runtime_resume(struct device *dev)
> 	/* Monitors may have been connected / disconnected during suspend */
> 	schedule_work(&nouveau_drm(drm_dev)->hpd_work);
> 
>+	/* Enable poll */
>+	drm_kms_helper_poll_enable(drm_dev);
>+
> 	return ret;
> }
> 
>-- 
>2.11.0
>

Actions: View | Splinter Review

Attachments on bug 98690: 127923 | 127924 | 128609 | 128720 | 128725 | 128742 | 128744 | 128857 | 128858 | 128877 | 128878 | 128929 | 128942 | 128943 | 128944 | 128952 | 128962 | 128963 | 128964 | 129249 | 129250 | 129251 | 129294 | 129295 | 129296 | 129326 | 129331 | 129332 | 129364 | 129681 | 129682 | 129954 | 130990 | 131148 | 131149

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.