aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Zimmermann <[email protected]>2020-08-04 08:51:58 +0200
committerThomas Zimmermann <[email protected]>2020-08-05 08:07:35 +0200
commitd3dc135187b92e06019bf504739a8b527a53e740 (patch)
tree7fb34a8ca15041200230b6f0c50212f62aba1ef4
parentad04fae0de07580359b7ab3e19a678a775fdf07f (diff)
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 <[email protected]> Reviewed-by: Dave Airlie <[email protected]> Reported-by: kernel test robot <[email protected]> Fixes: 2021708e0d6e ("drm/mgag200: Initialize PCI registers early during device setup") Cc: Lyude Paul <[email protected]> Cc: Dave Airlie <[email protected]> Cc: Sam Ravnborg <[email protected]> Cc: Daniel Vetter <[email protected]> Cc: Gerd Hoffmann <[email protected]> Cc: Emil Velikov <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
-rw-r--r--drivers/gpu/drm/mgag200/mgag200_drv.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/mgag200/mgag200_drv.c b/drivers/gpu/drm/mgag200/mgag200_drv.c
index 5c854bc7dc86..09170d46aa53 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;