From 874a71466426bfc56a50eb8a5640679b707f47f0 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 10 Jan 2023 18:31:17 +0100 Subject: [PATCH] 6.0-stable patches added patches: drm-mgag200-fix-pll-setup-for-g200_se_a-rev-4.patch --- ...00-fix-pll-setup-for-g200_se_a-rev-4.patch | 45 +++++++++++++++++++ queue-6.0/series | 1 + 2 files changed, 46 insertions(+) create mode 100644 queue-6.0/drm-mgag200-fix-pll-setup-for-g200_se_a-rev-4.patch diff --git a/queue-6.0/drm-mgag200-fix-pll-setup-for-g200_se_a-rev-4.patch b/queue-6.0/drm-mgag200-fix-pll-setup-for-g200_se_a-rev-4.patch new file mode 100644 index 00000000000..14a12917f61 --- /dev/null +++ b/queue-6.0/drm-mgag200-fix-pll-setup-for-g200_se_a-rev-4.patch @@ -0,0 +1,45 @@ +From b389286d0234e1edbaf62ed8bc0892a568c33662 Mon Sep 17 00:00:00 2001 +From: Jocelyn Falempe +Date: Thu, 13 Oct 2022 15:28:10 +0200 +Subject: drm/mgag200: Fix PLL setup for G200_SE_A rev >=4 + +From: Jocelyn Falempe + +commit b389286d0234e1edbaf62ed8bc0892a568c33662 upstream. + +For G200_SE_A, PLL M setting is wrong, which leads to blank screen, +or "signal out of range" on VGA display. +previous code had "m |= 0x80" which was changed to +m |= ((pixpllcn & BIT(8)) >> 1); + +Tested on G200_SE_A rev 42 + +This line of code was moved to another file with +commit 877507bb954e ("drm/mgag200: Provide per-device callbacks for +PIXPLLC") but can be easily backported before this commit. + +v2: * put BIT(7) First to respect MSB-to-LSB (Thomas) + * Add a comment to explain that this bit must be set (Thomas) + +Fixes: 2dd040946ecf ("drm/mgag200: Store values (not bits) in struct mgag200_pll_values") +Cc: stable@vger.kernel.org +Signed-off-by: Jocelyn Falempe +Reviewed-by: Thomas Zimmermann +Link: https://patchwork.freedesktop.org/patch/msgid/20221013132810.521945-1-jfalempe@redhat.com +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/mgag200/mgag200_pll.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/drivers/gpu/drm/mgag200/mgag200_pll.c ++++ b/drivers/gpu/drm/mgag200/mgag200_pll.c +@@ -269,7 +269,8 @@ static void mgag200_pixpll_update_g200se + pixpllcp = pixpllc->p - 1; + pixpllcs = pixpllc->s; + +- xpixpllcm = pixpllcm | ((pixpllcn & BIT(8)) >> 1); ++ // For G200SE A, BIT(7) should be set unconditionally. ++ xpixpllcm = BIT(7) | pixpllcm; + xpixpllcn = pixpllcn; + xpixpllcp = (pixpllcs << 3) | pixpllcp; + diff --git a/queue-6.0/series b/queue-6.0/series index 85a9fb44746..98ae17d0929 100644 --- a/queue-6.0/series +++ b/queue-6.0/series @@ -145,3 +145,4 @@ ksmbd-send-proper-error-response-in-smb2_tree_connect.patch ksmbd-check-nt_len-to-be-at-least-cifs_encpwd_size-in-ksmbd_decode_ntlmssp_auth_blob.patch btrfs-make-thaw-time-super-block-check-to-also-verify-checksum.patch efi-random-combine-bootloader-provided-rng-seed-with-rng-protocol-output.patch +drm-mgag200-fix-pll-setup-for-g200_se_a-rev-4.patch -- 2.47.3