Home Home > GIT Browse > openSUSE-15.1
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-05-13 14:59:58 +0200
committerTakashi Iwai <tiwai@suse.de>2019-05-15 11:46:07 +0200
commit0d0e6aacd0201de0fda7c2e8d6cdabbe98a56d22 (patch)
tree2aec3c964c85234562ab31c2e04044530ead75dc
parent348419fec698ee235a541da2a1ea7e6fafaf8fd3 (diff)
drm/fb-helper: generic: Call drm_client_add() after setup is
done (bsc#1111666).
-rw-r--r--patches.drm/drm-fb-helper-generic-Call-drm_client_add-after-setu.patch47
-rw-r--r--series.conf1
2 files changed, 48 insertions, 0 deletions
diff --git a/patches.drm/drm-fb-helper-generic-Call-drm_client_add-after-setu.patch b/patches.drm/drm-fb-helper-generic-Call-drm_client_add-after-setu.patch
new file mode 100644
index 0000000000..2af3e75c9a
--- /dev/null
+++ b/patches.drm/drm-fb-helper-generic-Call-drm_client_add-after-setu.patch
@@ -0,0 +1,47 @@
+From 6e3f17ee73f7e3c2ef0e2c8fd8624b2ece8ef2c9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= <noralf@tronnes.org>
+Date: Mon, 1 Apr 2019 16:13:58 +0200
+Subject: [PATCH] drm/fb-helper: generic: Call drm_client_add() after setup is done
+Mime-version: 1.0
+Content-type: text/plain; charset=UTF-8
+Content-transfer-encoding: 8bit
+Git-commit: 6e3f17ee73f7e3c2ef0e2c8fd8624b2ece8ef2c9
+Patch-mainline: v5.2-rc1
+References: bsc#1111666
+
+Hotplug can happen while drm_fbdev_generic_setup() is running so move
+drm_client_add() call after setup is done to avoid
+drm_fbdev_client_hotplug() running in two threads at the same time.
+
+Fixes: 9060d7f49376 ("drm/fb-helper: Finish the generic fbdev emulation")
+Cc: stable@vger.kernel.org
+Reported-by: Daniel Vetter <daniel.vetter@ffwll.ch>
+Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
+Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
+Link: https://patchwork.freedesktop.org/patch/msgid/20190401141358.25309-1-noralf@tronnes.org
+Acked-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ drivers/gpu/drm/drm_fb_helper.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/drivers/gpu/drm/drm_fb_helper.c
++++ b/drivers/gpu/drm/drm_fb_helper.c
+@@ -3225,8 +3225,6 @@ int drm_fbdev_generic_setup(struct drm_d
+ return ret;
+ }
+
+- drm_client_add(&fb_helper->client);
+-
+ if (!preferred_bpp)
+ preferred_bpp = dev->mode_config.preferred_depth;
+ if (!preferred_bpp)
+@@ -3235,6 +3233,8 @@ int drm_fbdev_generic_setup(struct drm_d
+
+ drm_fbdev_client_hotplug(&fb_helper->client);
+
++ drm_client_add(&fb_helper->client);
++
+ return 0;
+ }
+ EXPORT_SYMBOL(drm_fbdev_generic_setup);
diff --git a/series.conf b/series.conf
index cbe62a5ba4..0b5f8af485 100644
--- a/series.conf
+++ b/series.conf
@@ -45667,6 +45667,7 @@
patches.drivers/ipmi-ssif-compare-block-number-correctly-for-multi-p.patch
patches.drm/drm-rcar-du-Fix-rcar_du_crtc-structure-documentation.patch
patches.drm/drm-doc-Drop-content-type-from-the-legacy-kms-proper.patch
+ patches.drm/drm-fb-helper-generic-Call-drm_client_add-after-setu.patch
patches.drivers/ALSA-hda-realtek-Support-low-power-consumption-for-A.patch
patches.drivers/ALSA-hda-realtek-Support-low-power-consumption-ALC256.patch