drm/mgag200: Inline mga_crtc_{prepare, commit}() into enable function

There's only trivial code left in mga_crtc_{prepare,commit}(). Merge the
functions into the simple pipe's enable function.

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

diff --git a/drivers/gpu/drm/mgag200/mgag200_mode.c b/drivers/gpu/drm/mgag200/mgag200_mode.c
index 4f9007f1a554572452b2a3055e1a3f1af3bb077a..e0d037a7413c644763ce44c6ccc181ef85fbf9a2 100644 (file)
--- a/drivers/gpu/drm/mgag200/mgag200_mode.c
+++ b/drivers/gpu/drm/mgag200/mgag200_mode.c
@@ -1335,36 +1335,6 @@ static void mgag200_disable_display(struct mga_device *mdev)
        WREG_ECRT(0x01, crtcext1);
 }
 
-/*
- * This is called before a mode is programmed. A typical use might be to
- * enable DPMS during the programming to avoid seeing intermediate stages,
- * but that's not relevant to us
- */
-static void mga_crtc_prepare(struct drm_crtc *crtc)
-{
-       struct drm_device *dev = crtc->dev;
-       struct mga_device *mdev = to_mga_device(dev);
-
-       if (mdev->type == G200_WB || mdev->type == G200_EW3)
-               mgag200_g200wb_hold_bmc(mdev);
-}
-
-/*
- * This is called after a mode is programmed. It should reverse anything done
- * by the prepare function
- */
-static void mga_crtc_commit(struct drm_crtc *crtc)
-{
-       struct drm_device *dev = crtc->dev;
-       struct mga_device *mdev = to_mga_device(dev);
-
-       if (mdev->type == G200_WB || mdev->type == G200_EW3)
-               mgag200_g200wb_release_bmc(mdev);
-
-       mga_crtc_load_lut(crtc);
-       mgag200_enable_display(mdev);
-}
-
 /*
  * Connector
  */
@@ -1585,7 +1555,8 @@ mgag200_simple_display_pipe_enable(struct drm_simple_display_pipe *pipe,
                .y2 = fb->height,
        };
 
-       mga_crtc_prepare(crtc);
+       if (mdev->type == G200_WB || mdev->type == G200_EW3)
+               mgag200_g200wb_hold_bmc(mdev);
 
        mgag200_set_format_regs(mdev, fb);
        mgag200_set_mode_regs(mdev, adjusted_mode);
@@ -1599,7 +1570,11 @@ mgag200_simple_display_pipe_enable(struct drm_simple_display_pipe *pipe,
        else if (mdev->type == G200_EV)
                mgag200_g200ev_set_hiprilvl(mdev);
 
-       mga_crtc_commit(crtc);
+       if (mdev->type == G200_WB || mdev->type == G200_EW3)
+               mgag200_g200wb_release_bmc(mdev);
+
+       mga_crtc_load_lut(crtc);
+       mgag200_enable_display(mdev);
 
        mgag200_handle_damage(mdev, fb, &fullscreen);
 }