Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Zimmermann <tzimmermann@suse.de>2019-12-05 13:33:11 +0100
committerThomas Zimmermann <tzimmermann@suse.de>2019-12-06 13:08:50 +0100
commitca2571141d71acb87ae20feae8906795d48b6575 (patch)
tree2b796eec7d7e8b7ec97ac7f4ddb8e50172657bc1
parentc376bc268929a0ad190d1851237415389171afb4 (diff)
drm: fix module name in edid_firmware log message (bsc#1113956)rpm-4.12.14-197.29--sle15-sp1-updatesrpm-4.12.14-197.29
-rw-r--r--patches.suse/0007-drm-fix-module-name-in-edid_firmware-log-message.patch35
-rw-r--r--series.conf1
2 files changed, 36 insertions, 0 deletions
diff --git a/patches.suse/0007-drm-fix-module-name-in-edid_firmware-log-message.patch b/patches.suse/0007-drm-fix-module-name-in-edid_firmware-log-message.patch
new file mode 100644
index 0000000000..ecf9ecf5aa
--- /dev/null
+++ b/patches.suse/0007-drm-fix-module-name-in-edid_firmware-log-message.patch
@@ -0,0 +1,35 @@
+From ade925995b172f1d7410d1c665b2f47c5e99bef0 Mon Sep 17 00:00:00 2001
+From: Jani Nikula <jani.nikula@intel.com>
+Date: Wed, 21 Aug 2019 12:43:12 +0300
+Subject: drm: fix module name in edid_firmware log message
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+Git-commit: ade925995b172f1d7410d1c665b2f47c5e99bef0
+Patch-mainline: v5.4-rc1
+References: bsc#1113956
+
+The module is drm_kms_helper, not drm_kms_firmware.
+
+Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=204549
+Reported-by: Göran Uddeborg <goeran@uddeborg.se>
+Fixes: ac6c35a4d8c7 ("drm: add backwards compatibility support for drm_kms_helper.edid_firmware")
+Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
+Signed-off-by: Jani Nikula <jani.nikula@intel.com>
+Link: https://patchwork.freedesktop.org/patch/msgid/20190821094312.5514-1-jani.nikula@intel.com
+Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
+---
+ drivers/gpu/drm/drm_kms_helper_common.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/gpu/drm/drm_kms_helper_common.c
++++ b/drivers/gpu/drm/drm_kms_helper_common.c
+@@ -39,7 +39,7 @@ MODULE_LICENSE("GPL and additional right
+ /* Backward compatibility for drm_kms_helper.edid_firmware */
+ static int edid_firmware_set(const char *val, const struct kernel_param *kp)
+ {
+- DRM_NOTE("drm_kms_firmware.edid_firmware is deprecated, please use drm.edid_firmware intead.\n");
++ DRM_NOTE("drm_kms_helper.edid_firmware is deprecated, please use drm.edid_firmware instead.\n");
+
+ return __drm_set_edid_firmware_path(val);
+ }
diff --git a/series.conf b/series.conf
index 1291e6166e..6b5b38f942 100644
--- a/series.conf
+++ b/series.conf
@@ -50410,6 +50410,7 @@
patches.suse/drm-rcar-du-lvds-Fix-bridge_to_rcar_lvds.patch
patches.suse/drm-nouveau-volt-Fix-for-some-cards-having-0-maximum.patch
patches.suse/0001-drm-imx-Drop-unused-imx-ipuv3-crtc.o-build.patch
+ patches.suse/0007-drm-fix-module-name-in-edid_firmware-log-message.patch
patches.suse/drm-amd-display-fix-issue-where-252-255-values-are-c.patch
patches.suse/drm-amd-display-reprogram-VM-config-when-system-resu.patch
patches.suse/drm-amd-powerplay-smu7-enforce-minimal-VBITimeout-v2.patch