From d3dc135187b92e06019bf504739a8b527a53e740 Mon Sep 17 00:00:00 2001 From: Thomas Zimmermann Date: Tue, 4 Aug 2020 08:51:58 +0200 Subject: [PATCH] drm/mgag200: Set PCI option register in G200SE models The initial value of the PCI option register got lost while refactoring the driver init code. Restore the setting. Signed-off-by: Thomas Zimmermann Reviewed-by: Dave Airlie Reported-by: kernel test robot Fixes: 2021708e0d6e ("drm/mgag200: Initialize PCI registers early during device setup") Cc: Lyude Paul Cc: Dave Airlie Cc: Sam Ravnborg Cc: Daniel Vetter Cc: Gerd Hoffmann Cc: Emil Velikov Link: https://patchwork.freedesktop.org/patch/msgid/20200804065158.21049-1-tzimmermann@suse.de --- drivers/gpu/drm/mgag200/mgag200_drv.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/mgag200/mgag200_drv.c b/drivers/gpu/drm/mgag200/mgag200_drv.c index 5c854bc..09170d4 100644 --- a/drivers/gpu/drm/mgag200/mgag200_drv.c +++ b/drivers/gpu/drm/mgag200/mgag200_drv.c @@ -74,6 +74,7 @@ static int mgag200_regs_init(struct mga_device *mdev) break; case G200_SE_A: case G200_SE_B: + option = 0x40049120; if (mgag200_has_sgram(mdev)) option |= PCI_MGA_OPTION_HARDPWMSK; option2 = 0x00008000; -- 2.7.4