]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
drm/mgag200: Fix PLL setup for g200wb and g200ew
authorJocelyn Falempe <jfalempe@redhat.com>
Tue, 8 Mar 2022 17:43:21 +0000 (18:43 +0100)
committerStefan Bader <stefan.bader@canonical.com>
Wed, 27 Apr 2022 09:56:08 +0000 (11:56 +0200)
BugLink: https://bugs.launchpad.net/bugs/1969105
commit 40ce1121c1d76daf9048a86e36c83e469281b9fd upstream.

commit f86c3ed55920 ("drm/mgag200: Split PLL setup into compute and
 update functions") introduced a regression for g200wb and g200ew.
The PLLs are not set up properly, and VGA screen stays
black, or displays "out of range" message.

MGA1064_WB_PIX_PLLC_N/M/P was mistakenly replaced with
MGA1064_PIX_PLLC_N/M/P which have different addresses.

Patch tested on a Dell T310 with g200wb

Fixes: f86c3ed55920 ("drm/mgag200: Split PLL setup into compute and update functions")
Cc: stable@vger.kernel.org
Signed-off-by: Jocelyn Falempe <jfalempe@redhat.com>
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20220308174321.225606-1-jfalempe@redhat.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 16ac5dca1e1355d229ee3f16c69581c3173270d1)
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
drivers/gpu/drm/mgag200/mgag200_pll.c

index e9ae22b4f8138b1261779f84d86f305603d78789..52be08b744ade257cb51d71d5a3c7f9b7fcd3861 100644 (file)
@@ -404,9 +404,9 @@ mgag200_pixpll_update_g200wb(struct mgag200_pll *pixpll, const struct mgag200_pl
                udelay(50);
 
                /* program pixel pll register */
-               WREG_DAC(MGA1064_PIX_PLLC_N, xpixpllcn);
-               WREG_DAC(MGA1064_PIX_PLLC_M, xpixpllcm);
-               WREG_DAC(MGA1064_PIX_PLLC_P, xpixpllcp);
+               WREG_DAC(MGA1064_WB_PIX_PLLC_N, xpixpllcn);
+               WREG_DAC(MGA1064_WB_PIX_PLLC_M, xpixpllcm);
+               WREG_DAC(MGA1064_WB_PIX_PLLC_P, xpixpllcp);
 
                udelay(50);