drm/mgag200: Move CRTC atomic_enable to model-specific code

The CRTC atomic_enable helper contains per-model branches for
G200ER, G200EV and G200SE devices. Implement a dedicated helper
for each of them and remove the branches from the shared helper.

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-14-tzimmermann@suse.de

diff --git a/drivers/gpu/drm/mgag200/mgag200_drv.h b/drivers/gpu/drm/mgag200/mgag200_drv.h
index 1e7de8b12e7566b330842e802ae6af9751d75cb8..26038fa3cf0932fc37b9dfdd486a18cfdacdefbd 100644 (file)
--- a/drivers/gpu/drm/mgag200/mgag200_drv.h
+++ b/drivers/gpu/drm/mgag200/mgag200_drv.h
@@ -210,8 +210,6 @@ enum mga_type {
        G200_EW3,
 };
 
-#define IS_G200_SE(mdev) (mdev->type == G200_SE_A || mdev->type == G200_SE_B)
-
 struct mgag200_device_info {
        u16 max_hdisplay;
        u16 max_vdisplay;
@@ -438,7 +436,9 @@ int mgag200_vga_connector_helper_get_modes(struct drm_connector *connector);
        .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, \
        .atomic_destroy_state   = drm_atomic_helper_connector_destroy_state
 
-resource_size_t mgag200_device_probe_vram(struct mga_device *mdev);
+void mgag200_set_mode_regs(struct mga_device *mdev, const struct drm_display_mode *mode);
+void mgag200_set_format_regs(struct mga_device *mdev, const struct drm_format_info *format);
+void mgag200_enable_display(struct mga_device *mdev);
 void mgag200_init_registers(struct mga_device *mdev);
 int mgag200_mode_config_init(struct mga_device *mdev, resource_size_t vram_available);
 

diff --git a/drivers/gpu/drm/mgag200/mgag200_g200er.c b/drivers/gpu/drm/mgag200/mgag200_g200er.c
index 399f2443cb47d73051318edde52532864dbe9619..ae9bb38c1ac0c2332985a6bc4c13261b90d41995 100644 (file)
--- a/drivers/gpu/drm/mgag200/mgag200_g200er.c
+++ b/drivers/gpu/drm/mgag200/mgag200_g200er.c
@@ -36,6 +36,22 @@ static void mgag200_g200er_init_registers(struct mga_device *mdev)
        WREG_ECRT(0x24, 0x5); /* G200ER specific */
 }
 
+static void mgag200_g200er_reset_tagfifo(struct mga_device *mdev)
+{
+       static const uint32_t RESET_FLAG = 0x00200000; /* undocumented magic value */
+       u32 memctl;
+
+       memctl = RREG32(MGAREG_MEMCTL);
+
+       memctl |= RESET_FLAG;
+       WREG32(MGAREG_MEMCTL, memctl);
+
+       udelay(1000);
+
+       memctl &= ~RESET_FLAG;
+       WREG32(MGAREG_MEMCTL, memctl);
+}
+
 /*
  * PIXPLLC
  */
@@ -164,8 +180,40 @@ static const struct drm_plane_funcs mgag200_g200er_primary_plane_funcs = {
        MGAG200_PRIMARY_PLANE_FUNCS,
 };
 
+static void mgag200_g200er_crtc_helper_atomic_enable(struct drm_crtc *crtc,
+                                                    struct drm_atomic_state *old_state)
+{
+       struct drm_device *dev = crtc->dev;
+       struct mga_device *mdev = to_mga_device(dev);
+       const struct mgag200_device_funcs *funcs = mdev->funcs;
+       struct drm_crtc_state *crtc_state = crtc->state;
+       struct drm_display_mode *adjusted_mode = &crtc_state->adjusted_mode;
+       struct mgag200_crtc_state *mgag200_crtc_state = to_mgag200_crtc_state(crtc_state);
+       const struct drm_format_info *format = mgag200_crtc_state->format;
+
+       if (funcs->disable_vidrst)
+               funcs->disable_vidrst(mdev);
+
+       mgag200_set_format_regs(mdev, format);
+       mgag200_set_mode_regs(mdev, adjusted_mode);
+
+       if (funcs->pixpllc_atomic_update)
+               funcs->pixpllc_atomic_update(crtc, old_state);
+
+       mgag200_g200er_reset_tagfifo(mdev);
+
+       mgag200_enable_display(mdev);
+
+       if (funcs->enable_vidrst)
+               funcs->enable_vidrst(mdev);
+}
+
 static const struct drm_crtc_helper_funcs mgag200_g200er_crtc_helper_funcs = {
-       MGAG200_CRTC_HELPER_FUNCS,
+       .mode_valid = mgag200_crtc_helper_mode_valid,
+       .atomic_check = mgag200_crtc_helper_atomic_check,
+       .atomic_flush = mgag200_crtc_helper_atomic_flush,
+       .atomic_enable = mgag200_g200er_crtc_helper_atomic_enable,
+       .atomic_disable = mgag200_crtc_helper_atomic_disable
 };
 
 static const struct drm_crtc_funcs mgag200_g200er_crtc_funcs = {

diff --git a/drivers/gpu/drm/mgag200/mgag200_g200ev.c b/drivers/gpu/drm/mgag200/mgag200_g200ev.c
index 2165ec7d63e843dd4a921a64c0381e89438b57e4..ec324d942b47b3e3f1e19f31ffb001d2c113a47d 100644 (file)
--- a/drivers/gpu/drm/mgag200/mgag200_g200ev.c
+++ b/drivers/gpu/drm/mgag200/mgag200_g200ev.c
@@ -36,6 +36,11 @@ static void mgag200_g200ev_init_registers(struct mga_device *mdev)
        mgag200_init_registers(mdev);
 }
 
+static void mgag200_g200ev_set_hiprilvl(struct mga_device *mdev)
+{
+       WREG_ECRT(0x06, 0x00);
+}
+
 /*
  * PIXPLLC
  */
@@ -176,8 +181,40 @@ static const struct drm_plane_funcs mgag200_g200ev_primary_plane_funcs = {
        MGAG200_PRIMARY_PLANE_FUNCS,
 };
 
+static void mgag200_g200ev_crtc_helper_atomic_enable(struct drm_crtc *crtc,
+                                                    struct drm_atomic_state *old_state)
+{
+       struct drm_device *dev = crtc->dev;
+       struct mga_device *mdev = to_mga_device(dev);
+       const struct mgag200_device_funcs *funcs = mdev->funcs;
+       struct drm_crtc_state *crtc_state = crtc->state;
+       struct drm_display_mode *adjusted_mode = &crtc_state->adjusted_mode;
+       struct mgag200_crtc_state *mgag200_crtc_state = to_mgag200_crtc_state(crtc_state);
+       const struct drm_format_info *format = mgag200_crtc_state->format;
+
+       if (funcs->disable_vidrst)
+               funcs->disable_vidrst(mdev);
+
+       mgag200_set_format_regs(mdev, format);
+       mgag200_set_mode_regs(mdev, adjusted_mode);
+
+       if (funcs->pixpllc_atomic_update)
+               funcs->pixpllc_atomic_update(crtc, old_state);
+
+       mgag200_g200ev_set_hiprilvl(mdev);
+
+       mgag200_enable_display(mdev);
+
+       if (funcs->enable_vidrst)
+               funcs->enable_vidrst(mdev);
+}
+
 static const struct drm_crtc_helper_funcs mgag200_g200ev_crtc_helper_funcs = {
-       MGAG200_CRTC_HELPER_FUNCS,
+       .mode_valid = mgag200_crtc_helper_mode_valid,
+       .atomic_check = mgag200_crtc_helper_atomic_check,
+       .atomic_flush = mgag200_crtc_helper_atomic_flush,
+       .atomic_enable = mgag200_g200ev_crtc_helper_atomic_enable,
+       .atomic_disable = mgag200_crtc_helper_atomic_disable
 };
 
 static const struct drm_crtc_funcs mgag200_g200ev_crtc_funcs = {

diff --git a/drivers/gpu/drm/mgag200/mgag200_g200se.c b/drivers/gpu/drm/mgag200/mgag200_g200se.c
index a28f5203a95a9c2bb471e89e6baa65273d5654be..0addc375041385de7c258c16673eb0f026313e64 100644 (file)
--- a/drivers/gpu/drm/mgag200/mgag200_g200se.c
+++ b/drivers/gpu/drm/mgag200/mgag200_g200se.c
@@ -61,6 +61,52 @@ static void mgag200_g200se_init_registers(struct mgag200_g200se_device *g200se)
        mgag200_init_registers(mdev);
 }
 
+static void mgag200_g200se_set_hiprilvl(struct mga_device *mdev,
+                                       const struct drm_display_mode *mode,
+                                       const struct drm_format_info *format)
+{
+       struct mgag200_g200se_device *g200se = to_mgag200_g200se_device(&mdev->base);
+       unsigned int hiprilvl;
+       u8 crtcext6;
+
+       if  (g200se->unique_rev_id >= 0x04) {
+               hiprilvl = 0;
+       } else if (g200se->unique_rev_id >= 0x02) {
+               unsigned int bpp;
+               unsigned long mb;
+
+               if (format->cpp[0] * 8 > 16)
+                       bpp = 32;
+               else if (format->cpp[0] * 8 > 8)
+                       bpp = 16;
+               else
+                       bpp = 8;
+
+               mb = (mode->clock * bpp) / 1000;
+               if (mb > 3100)
+                       hiprilvl = 0;
+               else if (mb > 2600)
+                       hiprilvl = 1;
+               else if (mb > 1900)
+                       hiprilvl = 2;
+               else if (mb > 1160)
+                       hiprilvl = 3;
+               else if (mb > 440)
+                       hiprilvl = 4;
+               else
+                       hiprilvl = 5;
+
+       } else if (g200se->unique_rev_id >= 0x01) {
+               hiprilvl = 3;
+       } else {
+               hiprilvl = 4;
+       }
+
+       crtcext6 = hiprilvl; /* implicitly sets maxhipri to 0 */
+
+       WREG_ECRT(0x06, crtcext6);
+}
+
 /*
  * PIXPLLC
  */
@@ -265,8 +311,40 @@ static const struct drm_plane_funcs mgag200_g200se_primary_plane_funcs = {
        MGAG200_PRIMARY_PLANE_FUNCS,
 };
 
+static void mgag200_g200se_crtc_helper_atomic_enable(struct drm_crtc *crtc,
+                                                    struct drm_atomic_state *old_state)
+{
+       struct drm_device *dev = crtc->dev;
+       struct mga_device *mdev = to_mga_device(dev);
+       const struct mgag200_device_funcs *funcs = mdev->funcs;
+       struct drm_crtc_state *crtc_state = crtc->state;
+       struct drm_display_mode *adjusted_mode = &crtc_state->adjusted_mode;
+       struct mgag200_crtc_state *mgag200_crtc_state = to_mgag200_crtc_state(crtc_state);
+       const struct drm_format_info *format = mgag200_crtc_state->format;
+
+       if (funcs->disable_vidrst)
+               funcs->disable_vidrst(mdev);
+
+       mgag200_set_format_regs(mdev, format);
+       mgag200_set_mode_regs(mdev, adjusted_mode);
+
+       if (funcs->pixpllc_atomic_update)
+               funcs->pixpllc_atomic_update(crtc, old_state);
+
+       mgag200_g200se_set_hiprilvl(mdev, adjusted_mode, format);
+
+       mgag200_enable_display(mdev);
+
+       if (funcs->enable_vidrst)
+               funcs->enable_vidrst(mdev);
+}
+
 static const struct drm_crtc_helper_funcs mgag200_g200se_crtc_helper_funcs = {
-       MGAG200_CRTC_HELPER_FUNCS,
+       .mode_valid = mgag200_crtc_helper_mode_valid,
+       .atomic_check = mgag200_crtc_helper_atomic_check,
+       .atomic_flush = mgag200_crtc_helper_atomic_flush,
+       .atomic_enable = mgag200_g200se_crtc_helper_atomic_enable,
+       .atomic_disable = mgag200_crtc_helper_atomic_disable
 };
 
 static const struct drm_crtc_funcs mgag200_g200se_crtc_funcs = {

diff --git a/drivers/gpu/drm/mgag200/mgag200_mode.c b/drivers/gpu/drm/mgag200/mgag200_mode.c
index 789ea77b94ae810a527a273c8c5e91c0d2024bac..1f26d47166793d83a70cc4e341d9839dec308a4b 100644 (file)
--- a/drivers/gpu/drm/mgag200/mgag200_mode.c
+++ b/drivers/gpu/drm/mgag200/mgag200_mode.c
@@ -199,8 +199,7 @@ void mgag200_init_registers(struct mga_device *mdev)
        WREG8(MGA_MISC_OUT, misc);
 }
 
-static void mgag200_set_mode_regs(struct mga_device *mdev,
-                                 const struct drm_display_mode *mode)
+void mgag200_set_mode_regs(struct mga_device *mdev, const struct drm_display_mode *mode)
 {
        const struct mgag200_device_info *info = mdev->info;
        unsigned int hdisplay, hsyncstart, hsyncend, htotal;
@@ -324,7 +323,7 @@ static void mgag200_set_offset(struct mga_device *mdev,
        WREG_ECRT(0x00, crtcext0);
 }
 
-static void mgag200_set_format_regs(struct mga_device *mdev, const struct drm_format_info *format)
+void mgag200_set_format_regs(struct mga_device *mdev, const struct drm_format_info *format)
 {
        struct drm_device *dev = &mdev->base;
        unsigned int bpp, bppshift, scale;
@@ -387,74 +386,7 @@ static void mgag200_set_format_regs(struct mga_device *mdev, const struct drm_fo
        WREG_ECRT(3, crtcext3);
 }
 
-static void mgag200_g200er_reset_tagfifo(struct mga_device *mdev)
-{
-       static uint32_t RESET_FLAG = 0x00200000; /* undocumented magic value */
-       u32 memctl;
-
-       memctl = RREG32(MGAREG_MEMCTL);
-
-       memctl |= RESET_FLAG;
-       WREG32(MGAREG_MEMCTL, memctl);
-
-       udelay(1000);
-
-       memctl &= ~RESET_FLAG;
-       WREG32(MGAREG_MEMCTL, memctl);
-}
-
-static void mgag200_g200se_set_hiprilvl(struct mga_device *mdev,
-                                       const struct drm_display_mode *mode,
-                                       const struct drm_format_info *format)
-{
-       struct mgag200_g200se_device *g200se = to_mgag200_g200se_device(&mdev->base);
-       unsigned int hiprilvl;
-       u8 crtcext6;
-
-       if  (g200se->unique_rev_id >= 0x04) {
-               hiprilvl = 0;
-       } else if (g200se->unique_rev_id >= 0x02) {
-               unsigned int bpp;
-               unsigned long mb;
-
-               if (format->cpp[0] * 8 > 16)
-                       bpp = 32;
-               else if (format->cpp[0] * 8 > 8)
-                       bpp = 16;
-               else
-                       bpp = 8;
-
-               mb = (mode->clock * bpp) / 1000;
-               if (mb > 3100)
-                       hiprilvl = 0;
-               else if (mb > 2600)
-                       hiprilvl = 1;
-               else if (mb > 1900)
-                       hiprilvl = 2;
-               else if (mb > 1160)
-                       hiprilvl = 3;
-               else if (mb > 440)
-                       hiprilvl = 4;
-               else
-                       hiprilvl = 5;
-
-       } else if (g200se->unique_rev_id >= 0x01) {
-               hiprilvl = 3;
-       } else {
-               hiprilvl = 4;
-       }
-
-       crtcext6 = hiprilvl; /* implicitly sets maxhipri to 0 */
-
-       WREG_ECRT(0x06, crtcext6);
-}
-
-static void mgag200_g200ev_set_hiprilvl(struct mga_device *mdev)
-{
-       WREG_ECRT(0x06, 0x00);
-}
-
-static void mgag200_enable_display(struct mga_device *mdev)
+void mgag200_enable_display(struct mga_device *mdev)
 {
        u8 seq0, crtcext1;
 
@@ -709,14 +641,6 @@ void mgag200_crtc_helper_atomic_enable(struct drm_crtc *crtc, struct drm_atomic_
        if (funcs->pixpllc_atomic_update)
                funcs->pixpllc_atomic_update(crtc, old_state);
 
-       if (mdev->type == G200_ER)
-               mgag200_g200er_reset_tagfifo(mdev);
-
-       if (IS_G200_SE(mdev))
-               mgag200_g200se_set_hiprilvl(mdev, adjusted_mode, format);
-       else if (mdev->type == G200_EV)
-               mgag200_g200ev_set_hiprilvl(mdev);
-
        mgag200_enable_display(mdev);
 
        if (funcs->enable_vidrst)