drm/mgag200: Set MISC memory flags in mm init code

The modesetting code initialized several memory-related flags in the
MISC register. Move this code to MM initialization.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Lyude Paul <lyude@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200730102844.10995-6-tzimmermann@suse.de

diff --git a/drivers/gpu/drm/mgag200/mgag200_mm.c b/drivers/gpu/drm/mgag200/mgag200_mm.c
index 7b69392bcb891141ce659855b33b909aa5cf9a31..1b1918839e1e86b4c73b9181e8df43c60f3ea3fc 100644 (file)
--- a/drivers/gpu/drm/mgag200/mgag200_mm.c
+++ b/drivers/gpu/drm/mgag200/mgag200_mm.c
@@ -90,9 +90,15 @@ static void mgag200_mm_release(struct drm_device *dev, void *ptr)
 int mgag200_mm_init(struct mga_device *mdev)
 {
        struct drm_device *dev = &mdev->base;
+       u8 misc;
        resource_size_t start, len;
        int ret;
 
+       misc = RREG8(MGA_MISC_IN);
+       misc |= MGAREG_MISC_RAMMAPEN |
+               MGAREG_MISC_HIGH_PG_SEL;
+       WREG8(MGA_MISC_OUT, misc);
+
        /* BAR 0 is VRAM */
        start = pci_resource_start(dev->pdev, 0);
        len = pci_resource_len(dev->pdev, 0);

diff --git a/drivers/gpu/drm/mgag200/mgag200_mode.c b/drivers/gpu/drm/mgag200/mgag200_mode.c
index 7161b1651aa03af2b25213a35a3203712340d9ec..66818ee10694f8920a1ea01999daebdef545c6fe 100644 (file)
--- a/drivers/gpu/drm/mgag200/mgag200_mode.c
+++ b/drivers/gpu/drm/mgag200/mgag200_mode.c
@@ -978,9 +978,7 @@ static void mgag200_init_regs(struct mga_device *mdev)
                WREG_ECRT(0x34, 0x5);
 
        misc = RREG8(MGA_MISC_IN);
-       misc |= MGAREG_MISC_IOADSEL |
-               MGAREG_MISC_RAMMAPEN |
-               MGAREG_MISC_HIGH_PG_SEL;
+       misc |= MGAREG_MISC_IOADSEL;
        WREG8(MGA_MISC_OUT, misc);
 }