5.4-stable patches

added patches:
	drm-vmwgfx-initialize-drm_mode_fb_cmd2.patch

diff --git a/queue-5.4/drm-vmwgfx-initialize-drm_mode_fb_cmd2.patch b/queue-5.4/drm-vmwgfx-initialize-drm_mode_fb_cmd2.patch
new file mode 100644 (file)
index 0000000..05b94d0
--- /dev/null
+++ b/queue-5.4/drm-vmwgfx-initialize-drm_mode_fb_cmd2.patch
@@ -0,0 +1,40 @@
+From 3059d9b9f6aa433a55b9d0d21b566396d5497c33 Mon Sep 17 00:00:00 2001
+From: Zack Rusin <zackr@vmware.com>
+Date: Wed, 2 Mar 2022 10:24:24 -0500
+Subject: drm/vmwgfx: Initialize drm_mode_fb_cmd2
+
+From: Zack Rusin <zackr@vmware.com>
+
+commit 3059d9b9f6aa433a55b9d0d21b566396d5497c33 upstream.
+
+Transition to drm_mode_fb_cmd2 from drm_mode_fb_cmd left the structure
+unitialized. drm_mode_fb_cmd2 adds a few additional members, e.g. flags
+and modifiers which were never initialized. Garbage in those members
+can cause random failures during the bringup of the fbcon.
+
+Initializing the structure fixes random blank screens after bootup due
+to flags/modifiers mismatches during the fbcon bring up.
+
+Fixes: dabdcdc9822a ("drm/vmwgfx: Switch to mode_cmd2")
+Signed-off-by: Zack Rusin <zackr@vmware.com>
+Cc: Daniel Vetter <daniel.vetter@intel.com>
+Cc: <stable@vger.kernel.org> # v4.10+
+Reviewed-by: Martin Krastev <krastevm@vmware.com>
+Reviewed-by: Maaz Mombasawala <mombasawalam@vmware.com>
+Link: https://patchwork.freedesktop.org/patch/msgid/20220302152426.885214-7-zack@kde.org
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/gpu/drm/vmwgfx/vmwgfx_fb.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
++++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
+@@ -498,7 +498,7 @@ static int vmw_fb_kms_detach(struct vmw_
+ 
+ static int vmw_fb_kms_framebuffer(struct fb_info *info)
+ {
+-      struct drm_mode_fb_cmd2 mode_cmd;
++      struct drm_mode_fb_cmd2 mode_cmd = {0};
+       struct vmw_fb_par *par = info->par;
+       struct fb_var_screeninfo *var = &info->var;
+       struct drm_framebuffer *cur_fb;

diff --git a/queue-5.4/series b/queue-5.4/series
index b87e5526e9342dba3ac9ee26f8b73055716aff85..4cb23aff575de02cade358a5c1b33f183c16306e 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -36,3 +36,4 @@ serial-8250_mtk-make-sure-to-select-the-right-feature_sel.patch
 drm-nouveau-tegra-stop-using-iommu_present.patch
 i40e-i40e_main-fix-a-missing-check-on-list-iterator.patch
 cgroup-cpuset-remove-cpus_allowed-mems_allowed-setup-in-cpuset_init_smp.patch
+drm-vmwgfx-initialize-drm_mode_fb_cmd2.patch