drm/bochs: use simple display pipe

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Acked-by: Noralf Trønnes <noralf@tronnes.org>
Link: http://patchwork.freedesktop.org/patch/msgid/20190410074828.10296-1-kraxel@redhat.com

diff --git a/drivers/gpu/drm/bochs/bochs.h b/drivers/gpu/drm/bochs/bochs.h
index a7f6723bebdd471fc4e757663d8bfa0eb56ca2a4..36f6ee725d132385d85136ca419004810f21c607 100644 (file)
--- a/drivers/gpu/drm/bochs/bochs.h
+++ b/drivers/gpu/drm/bochs/bochs.h
@@ -7,6 +7,7 @@
 #include <drm/drm_crtc_helper.h>
 #include <drm/drm_encoder.h>
 #include <drm/drm_fb_helper.h>
+#include <drm/drm_simple_kms_helper.h>
 
 #include <drm/drm_gem.h>
 
@@ -69,9 +70,8 @@ struct bochs_device {
        struct edid *edid;
 
        /* drm */
-       struct drm_device  *dev;
-       struct drm_crtc crtc;
-       struct drm_encoder encoder;
+       struct drm_device *dev;
+       struct drm_simple_display_pipe pipe;
        struct drm_connector connector;
 
        /* ttm */

diff --git a/drivers/gpu/drm/bochs/bochs_kms.c b/drivers/gpu/drm/bochs/bochs_kms.c
index 485f9cf05e8b8fd2c4fdf70ecb3effe72e9f07a0..5e905f50449da70e51a2ce8644eae3d84c2347ad 100644 (file)
--- a/drivers/gpu/drm/bochs/bochs_kms.c
+++ b/drivers/gpu/drm/bochs/bochs_kms.c
@@ -22,76 +22,55 @@ MODULE_PARM_DESC(defy, "default y resolution");
 
 /* ---------------------------------------------------------------------- */
 
-static void bochs_crtc_mode_set_nofb(struct drm_crtc *crtc)
+static const uint32_t bochs_formats[] = {
+       DRM_FORMAT_XRGB8888,
+       DRM_FORMAT_BGRX8888,
+};
+
+static void bochs_plane_update(struct bochs_device *bochs,
+                              struct drm_plane_state *state)
 {
-       struct bochs_device *bochs =
-               container_of(crtc, struct bochs_device, crtc);
+       struct bochs_bo *bo;
 
-       bochs_hw_setmode(bochs, &crtc->mode);
+       if (!state->fb || !bochs->stride)
+               return;
+
+       bo = gem_to_bochs_bo(state->fb->obj[0]);
+       bochs_hw_setbase(bochs,
+                        state->crtc_x,
+                        state->crtc_y,
+                        bo->bo.offset);
+       bochs_hw_setformat(bochs, state->fb->format);
 }
 
-static void bochs_crtc_atomic_enable(struct drm_crtc *crtc,
-                                    struct drm_crtc_state *old_crtc_state)
+static void bochs_pipe_enable(struct drm_simple_display_pipe *pipe,
+                             struct drm_crtc_state *crtc_state,
+                             struct drm_plane_state *plane_state)
 {
+       struct bochs_device *bochs = pipe->crtc.dev->dev_private;
+
+       bochs_hw_setmode(bochs, &crtc_state->mode);
+       bochs_plane_update(bochs, plane_state);
 }
 
-static void bochs_crtc_atomic_flush(struct drm_crtc *crtc,
-                                   struct drm_crtc_state *old_crtc_state)
+static void bochs_pipe_update(struct drm_simple_display_pipe *pipe,
+                             struct drm_plane_state *old_state)
 {
-       struct drm_device *dev = crtc->dev;
-       struct drm_pending_vblank_event *event;
+       struct bochs_device *bochs = pipe->crtc.dev->dev_private;
+       struct drm_crtc *crtc = &pipe->crtc;
 
-       if (crtc->state && crtc->state->event) {
-               unsigned long irqflags;
+       bochs_plane_update(bochs, pipe->plane.state);
 
-               spin_lock_irqsave(&dev->event_lock, irqflags);
-               event = crtc->state->event;
+       if (crtc->state->event) {
+               spin_lock_irq(&crtc->dev->event_lock);
+               drm_crtc_send_vblank_event(crtc, crtc->state->event);
                crtc->state->event = NULL;
-               drm_crtc_send_vblank_event(crtc, event);
-               spin_unlock_irqrestore(&dev->event_lock, irqflags);
+               spin_unlock_irq(&crtc->dev->event_lock);
        }
 }
 
-
-/* These provide the minimum set of functions required to handle a CRTC */
-static const struct drm_crtc_funcs bochs_crtc_funcs = {
-       .set_config = drm_atomic_helper_set_config,
-       .destroy = drm_crtc_cleanup,
-       .page_flip = drm_atomic_helper_page_flip,
-       .reset = drm_atomic_helper_crtc_reset,
-       .atomic_duplicate_state = drm_atomic_helper_crtc_duplicate_state,
-       .atomic_destroy_state = drm_atomic_helper_crtc_destroy_state,
-};
-
-static const struct drm_crtc_helper_funcs bochs_helper_funcs = {
-       .mode_set_nofb = bochs_crtc_mode_set_nofb,
-       .atomic_enable = bochs_crtc_atomic_enable,
-       .atomic_flush = bochs_crtc_atomic_flush,
-};
-
-static const uint32_t bochs_formats[] = {
-       DRM_FORMAT_XRGB8888,
-       DRM_FORMAT_BGRX8888,
-};
-
-static void bochs_plane_atomic_update(struct drm_plane *plane,
-                                     struct drm_plane_state *old_state)
-{
-       struct bochs_device *bochs = plane->dev->dev_private;
-       struct bochs_bo *bo;
-
-       if (!plane->state->fb)
-               return;
-       bo = gem_to_bochs_bo(plane->state->fb->obj[0]);
-       bochs_hw_setbase(bochs,
-                        plane->state->crtc_x,
-                        plane->state->crtc_y,
-                        bo->bo.offset);
-       bochs_hw_setformat(bochs, plane->state->fb->format);
-}
-
-static int bochs_plane_prepare_fb(struct drm_plane *plane,
-                               struct drm_plane_state *new_state)
+static int bochs_pipe_prepare_fb(struct drm_simple_display_pipe *pipe,
+                                struct drm_plane_state *new_state)
 {
        struct bochs_bo *bo;
 
@@ -101,8 +80,8 @@ static int bochs_plane_prepare_fb(struct drm_plane *plane,
        return bochs_bo_pin(bo, TTM_PL_FLAG_VRAM);
 }
 
-static void bochs_plane_cleanup_fb(struct drm_plane *plane,
-                                  struct drm_plane_state *old_state)
+static void bochs_pipe_cleanup_fb(struct drm_simple_display_pipe *pipe,
+                                 struct drm_plane_state *old_state)
 {
        struct bochs_bo *bo;
 
@@ -112,73 +91,13 @@ static void bochs_plane_cleanup_fb(struct drm_plane *plane,
        bochs_bo_unpin(bo);
 }
 
-static const struct drm_plane_helper_funcs bochs_plane_helper_funcs = {
-       .atomic_update = bochs_plane_atomic_update,
-       .prepare_fb = bochs_plane_prepare_fb,
-       .cleanup_fb = bochs_plane_cleanup_fb,
-};
-
-static const struct drm_plane_funcs bochs_plane_funcs = {
-       .update_plane   = drm_atomic_helper_update_plane,
-       .disable_plane  = drm_atomic_helper_disable_plane,
-       .destroy        = drm_primary_helper_destroy,
-       .reset          = drm_atomic_helper_plane_reset,
-       .atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state,
-       .atomic_destroy_state = drm_atomic_helper_plane_destroy_state,
-};
-
-static struct drm_plane *bochs_primary_plane(struct drm_device *dev)
-{
-       struct drm_plane *primary;
-       int ret;
-
-       primary = kzalloc(sizeof(*primary), GFP_KERNEL);
-       if (primary == NULL) {
-               DRM_DEBUG_KMS("Failed to allocate primary plane\n");
-               return NULL;
-       }
-
-       ret = drm_universal_plane_init(dev, primary, 0,
-                                      &bochs_plane_funcs,
-                                      bochs_formats,
-                                      ARRAY_SIZE(bochs_formats),
-                                      NULL,
-                                      DRM_PLANE_TYPE_PRIMARY, NULL);
-       if (ret) {
-               kfree(primary);
-               return NULL;
-       }
-
-       drm_plane_helper_add(primary, &bochs_plane_helper_funcs);
-       return primary;
-}
-
-static void bochs_crtc_init(struct drm_device *dev)
-{
-       struct bochs_device *bochs = dev->dev_private;
-       struct drm_crtc *crtc = &bochs->crtc;
-       struct drm_plane *primary = bochs_primary_plane(dev);
-
-       drm_crtc_init_with_planes(dev, crtc, primary, NULL,
-                                 &bochs_crtc_funcs, NULL);
-       drm_crtc_helper_add(crtc, &bochs_helper_funcs);
-}
-
-static const struct drm_encoder_funcs bochs_encoder_encoder_funcs = {
-       .destroy = drm_encoder_cleanup,
+static const struct drm_simple_display_pipe_funcs bochs_pipe_funcs = {
+       .enable     = bochs_pipe_enable,
+       .update     = bochs_pipe_update,
+       .prepare_fb = bochs_pipe_prepare_fb,
+       .cleanup_fb = bochs_pipe_cleanup_fb,
 };
 
-static void bochs_encoder_init(struct drm_device *dev)
-{
-       struct bochs_device *bochs = dev->dev_private;
-       struct drm_encoder *encoder = &bochs->encoder;
-
-       encoder->possible_crtcs = 0x1;
-       drm_encoder_init(dev, encoder, &bochs_encoder_encoder_funcs,
-                        DRM_MODE_ENCODER_DAC, NULL);
-}
-
-
 static int bochs_connector_get_modes(struct drm_connector *connector)
 {
        struct bochs_device *bochs =
@@ -278,11 +197,14 @@ int bochs_kms_init(struct bochs_device *bochs)
 
        bochs->dev->mode_config.funcs = &bochs_mode_funcs;
 
-       bochs_crtc_init(bochs->dev);
-       bochs_encoder_init(bochs->dev);
        bochs_connector_init(bochs->dev);
-       drm_connector_attach_encoder(&bochs->connector,
-                                         &bochs->encoder);
+       drm_simple_display_pipe_init(bochs->dev,
+                                    &bochs->pipe,
+                                    &bochs_pipe_funcs,
+                                    bochs_formats,
+                                    ARRAY_SIZE(bochs_formats),
+                                    NULL,
+                                    &bochs->connector);
 
        drm_mode_config_reset(bochs->dev);