drm/mgag200: Move ER/EW3 register initialization to per-model code

The register initialization code contains special cases for G200ER
and G200EW3 hardware. Move this to per-model code.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Jocelyn Falempe <jfalempe@redhat.com>
Tested-by: Jocelyn Falempe <jfalempe@redhat.com>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20220728124103.30159-4-tzimmermann@suse.de

diff --git a/drivers/gpu/drm/mgag200/mgag200_g200er.c b/drivers/gpu/drm/mgag200/mgag200_g200er.c
index 7bee204..8ff0509 100644 (file)
--- a/drivers/gpu/drm/mgag200/mgag200_g200er.c
+++ b/drivers/gpu/drm/mgag200/mgag200_g200er.c
@@ -27,6 +27,8 @@ static void mgag200_g200er_init_registers(struct mga_device *mdev)
        WREG_DAC(0x90, 0); /* G200ER specific */
 
        mgag200_init_registers(mdev);
+
+       WREG_ECRT(0x24, 0x5); /* G200ER specific */
 }
 
 /*

diff --git a/drivers/gpu/drm/mgag200/mgag200_g200ew3.c b/drivers/gpu/drm/mgag200/mgag200_g200ew3.c
index d86284c..a4ecdd3 100644 (file)
--- a/drivers/gpu/drm/mgag200/mgag200_g200ew3.c
+++ b/drivers/gpu/drm/mgag200/mgag200_g200ew3.c
@@ -6,6 +6,13 @@
 
 #include "mgag200_drv.h"
 
+static void mgag200_g200ew3_init_registers(struct mga_device *mdev)
+{
+       mgag200_g200wb_init_registers(mdev); // same as G200WB
+
+       WREG_ECRT(0x34, 0x5); // G200EW3 specific
+}
+
 /*
  * DRM device
  */
@@ -50,7 +57,7 @@ struct mga_device *mgag200_g200ew3_device_create(struct pci_dev *pdev,
        if (ret)
                return ERR_PTR(ret);
 
-       mgag200_g200wb_init_registers(mdev); // same as G200WB
+       mgag200_g200ew3_init_registers(mdev);
 
        vram_available = mgag200_g200ew3_device_probe_vram(mdev);
 

diff --git a/drivers/gpu/drm/mgag200/mgag200_mode.c b/drivers/gpu/drm/mgag200/mgag200_mode.c
index ba5661c..11a88ef 100644 (file)
--- a/drivers/gpu/drm/mgag200/mgag200_mode.c
+++ b/drivers/gpu/drm/mgag200/mgag200_mode.c
@@ -287,12 +287,6 @@ void mgag200_init_registers(struct mga_device *mdev)
                    MGAREG_CRTC11_VINTCLR);
        WREG_CRT(0x11, crtc11);
 
-       if (mdev->type == G200_ER)
-               WREG_ECRT(0x24, 0x5);
-
-       if (mdev->type == G200_EW3)
-               WREG_ECRT(0x34, 0x5);
-
        misc = RREG8(MGA_MISC_IN);
        misc |= MGAREG_MISC_IOADSEL;
        WREG8(MGA_MISC_OUT, misc);