drm/arc: Convert to drm_simple_kms_pipe_helper

Really straighforward, only slight issue is that the sim connector is
created after the pipe is set up, so can't use the helpers perfectly
yet. Subsequent patches will fix that.

Aside from lots of deleting code no functional changes in here.

v2: Delete now unused crtc funcs (0day)

v3: Move endcoder setup removal to right patch (Sam)

Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Cc: Sam Ravnborg <sam@ravnborg.org>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Cc: Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Cc: Alexey Brodkin <abrodkin@synopsys.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210112084358.2771527-9-daniel.vetter@ffwll.ch

diff --git a/drivers/gpu/drm/arc/arcpgu.h b/drivers/gpu/drm/arc/arcpgu.h
index c52cdd2..b5c699d 100644 (file)
--- a/drivers/gpu/drm/arc/arcpgu.h
+++ b/drivers/gpu/drm/arc/arcpgu.h
@@ -20,7 +20,7 @@ struct arcpgu_drm_private {
 
 #define dev_to_arcpgu(x) container_of(x, struct arcpgu_drm_private, drm)
 
-#define crtc_to_arcpgu_priv(x) container_of(x, struct arcpgu_drm_private, pipe.crtc)
+#define pipe_to_arcpgu_priv(x) container_of(x, struct arcpgu_drm_private, pipe)
 
 static inline void arc_pgu_write(struct arcpgu_drm_private *arcpgu,
                                 unsigned int reg, u32 value)
@@ -34,7 +34,7 @@ static inline u32 arc_pgu_read(struct arcpgu_drm_private *arcpgu,
        return ioread32(arcpgu->regs + reg);
 }
 
-int arc_pgu_setup_crtc(struct drm_device *dev);
+int arc_pgu_setup_pipe(struct drm_device *dev);
 int arcpgu_drm_hdmi_init(struct drm_device *drm, struct device_node *np);
 int arcpgu_drm_sim_init(struct drm_device *drm, struct device_node *np);
 

diff --git a/drivers/gpu/drm/arc/arcpgu_crtc.c b/drivers/gpu/drm/arc/arcpgu_crtc.c
index 15a2f8e..19accc5 100644 (file)
--- a/drivers/gpu/drm/arc/arcpgu_crtc.c
+++ b/drivers/gpu/drm/arc/arcpgu_crtc.c
@@ -26,10 +26,9 @@ static const u32 arc_pgu_supported_formats[] = {
        DRM_FORMAT_ARGB8888,
 };
 
-static void arc_pgu_set_pxl_fmt(struct drm_crtc *crtc)
+static void arc_pgu_set_pxl_fmt(struct arcpgu_drm_private *arcpgu)
 {
-       struct arcpgu_drm_private *arcpgu = crtc_to_arcpgu_priv(crtc);
-       const struct drm_framebuffer *fb = crtc->primary->state->fb;
+       const struct drm_framebuffer *fb = arcpgu->pipe.plane.state->fb;
        uint32_t pixel_format = fb->format->format;
        u32 format = DRM_FORMAT_INVALID;
        int i;
@@ -51,19 +50,10 @@ static void arc_pgu_set_pxl_fmt(struct drm_crtc *crtc)
        arc_pgu_write(arcpgu, ARCPGU_REG_CTRL, reg_ctrl);
 }
 
-static const struct drm_crtc_funcs arc_pgu_crtc_funcs = {
-       .destroy = drm_crtc_cleanup,
-       .set_config = drm_atomic_helper_set_config,
-       .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 enum drm_mode_status arc_pgu_crtc_mode_valid(struct drm_crtc *crtc,
-                                                   const struct drm_display_mode *mode)
+static enum drm_mode_status arc_pgu_mode_valid(struct drm_simple_display_pipe *pipe,
+                                              const struct drm_display_mode *mode)
 {
-       struct arcpgu_drm_private *arcpgu = crtc_to_arcpgu_priv(crtc);
+       struct arcpgu_drm_private *arcpgu = pipe_to_arcpgu_priv(pipe);
        long rate, clk_rate = mode->clock * 1000;
        long diff = clk_rate / 200; /* +-0.5% allowed by HDMI spec */
 
@@ -110,15 +100,16 @@ static void arc_pgu_mode_set(struct arcpgu_drm_private *arcpgu)
        arc_pgu_write(arcpgu, ARCPGU_REG_STRIDE, 0);
        arc_pgu_write(arcpgu, ARCPGU_REG_START_SET, 1);
 
-       arc_pgu_set_pxl_fmt(&arcpgu->pipe.crtc);
+       arc_pgu_set_pxl_fmt(arcpgu);
 
        clk_set_rate(arcpgu->clk, m->crtc_clock * 1000);
 }
 
-static void arc_pgu_crtc_atomic_enable(struct drm_crtc *crtc,
-                                      struct drm_atomic_state *state)
+static void arc_pgu_enable(struct drm_simple_display_pipe *pipe,
+                          struct drm_crtc_state *crtc_state,
+                          struct drm_plane_state *plane_state)
 {
-       struct arcpgu_drm_private *arcpgu = crtc_to_arcpgu_priv(crtc);
+       struct arcpgu_drm_private *arcpgu = pipe_to_arcpgu_priv(pipe);
 
        arc_pgu_mode_set(arcpgu);
 
@@ -128,10 +119,9 @@ static void arc_pgu_crtc_atomic_enable(struct drm_crtc *crtc,
                      ARCPGU_CTRL_ENABLE_MASK);
 }
 
-static void arc_pgu_crtc_atomic_disable(struct drm_crtc *crtc,
-                                       struct drm_atomic_state *state)
+static void arc_pgu_disable(struct drm_simple_display_pipe *pipe)
 {
-       struct arcpgu_drm_private *arcpgu = crtc_to_arcpgu_priv(crtc);
+       struct arcpgu_drm_private *arcpgu = pipe_to_arcpgu_priv(pipe);
 
        clk_disable_unprepare(arcpgu->clk);
        arc_pgu_write(arcpgu, ARCPGU_REG_CTRL,
@@ -139,77 +129,33 @@ static void arc_pgu_crtc_atomic_disable(struct drm_crtc *crtc,
                              ~ARCPGU_CTRL_ENABLE_MASK);
 }
 
-static const struct drm_crtc_helper_funcs arc_pgu_crtc_helper_funcs = {
-       .mode_valid     = arc_pgu_crtc_mode_valid,
-       .atomic_enable  = arc_pgu_crtc_atomic_enable,
-       .atomic_disable = arc_pgu_crtc_atomic_disable,
-};
-
-static void arc_pgu_plane_atomic_update(struct drm_plane *plane,
-                                       struct drm_atomic_state *state)
+static void arc_pgu_update(struct drm_simple_display_pipe *pipe,
+                          struct drm_plane_state *state)
 {
-       struct drm_plane_state *new_plane_state = drm_atomic_get_new_plane_state(state,
-                                                                                plane);
        struct arcpgu_drm_private *arcpgu;
        struct drm_gem_cma_object *gem;
 
-       if (!new_plane_state->crtc || !new_plane_state->fb)
+       if (!pipe->plane.state->crtc || !pipe->plane.state->fb)
                return;
 
-       arcpgu = crtc_to_arcpgu_priv(new_plane_state->crtc);
-       gem = drm_fb_cma_get_gem_obj(new_plane_state->fb, 0);
+       arcpgu = pipe_to_arcpgu_priv(pipe);
+       gem = drm_fb_cma_get_gem_obj(pipe->plane.state->fb, 0);
        arc_pgu_write(arcpgu, ARCPGU_REG_BUF0_ADDR, gem->paddr);
 }
 
-static const struct drm_plane_helper_funcs arc_pgu_plane_helper_funcs = {
-       .atomic_update = arc_pgu_plane_atomic_update,
+static const struct drm_simple_display_pipe_funcs arc_pgu_pipe_funcs = {
+       .update = arc_pgu_update,
+       .mode_valid = arc_pgu_mode_valid,
+       .enable = arc_pgu_enable,
+       .disable = arc_pgu_disable,
 };
 
-static const struct drm_plane_funcs arc_pgu_plane_funcs = {
-       .update_plane           = drm_atomic_helper_update_plane,
-       .disable_plane          = drm_atomic_helper_disable_plane,
-       .destroy                = drm_plane_cleanup,
-       .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 *arc_pgu_plane_init(struct drm_device *drm)
-{
-       struct arcpgu_drm_private *arcpgu = dev_to_arcpgu(drm);
-       struct drm_plane *plane = NULL;
-       int ret;
-
-       plane = &arcpgu->pipe.plane;
-
-       ret = drm_universal_plane_init(drm, plane, 0xff, &arc_pgu_plane_funcs,
-                                      arc_pgu_supported_formats,
-                                      ARRAY_SIZE(arc_pgu_supported_formats),
-                                      NULL,
-                                      DRM_PLANE_TYPE_PRIMARY, NULL);
-       if (ret)
-               return ERR_PTR(ret);
-
-       drm_plane_helper_add(plane, &arc_pgu_plane_helper_funcs);
-
-       return plane;
-}
-
-int arc_pgu_setup_crtc(struct drm_device *drm)
+int arc_pgu_setup_pipe(struct drm_device *drm)
 {
        struct arcpgu_drm_private *arcpgu = dev_to_arcpgu(drm);
-       struct drm_plane *primary;
-       int ret;
-
-       primary = arc_pgu_plane_init(drm);
-       if (IS_ERR(primary))
-               return PTR_ERR(primary);
-
-       ret = drm_crtc_init_with_planes(drm, &arcpgu->pipe.crtc, primary, NULL,
-                                       &arc_pgu_crtc_funcs, NULL);
-       if (ret)
-               return ret;
 
-       drm_crtc_helper_add(&arcpgu->pipe.crtc, &arc_pgu_crtc_helper_funcs);
-       return 0;
+       return drm_simple_display_pipe_init(drm, &arcpgu->pipe, &arc_pgu_pipe_funcs,
+                                           arc_pgu_supported_formats,
+                                           ARRAY_SIZE(arc_pgu_supported_formats),
+                                           NULL, NULL);
 }

diff --git a/drivers/gpu/drm/arc/arcpgu_drv.c b/drivers/gpu/drm/arc/arcpgu_drv.c
index fd9e19f..86a918f 100644 (file)
--- a/drivers/gpu/drm/arc/arcpgu_drv.c
+++ b/drivers/gpu/drm/arc/arcpgu_drv.c
@@ -70,7 +70,7 @@ static int arcpgu_load(struct arcpgu_drm_private *arcpgu)
        if (dma_set_mask_and_coherent(drm->dev, DMA_BIT_MASK(32)))
                return -ENODEV;
 
-       if (arc_pgu_setup_crtc(drm) < 0)
+       if (arc_pgu_setup_pipe(drm) < 0)
                return -ENODEV;
 
        /*

diff --git a/drivers/gpu/drm/arc/arcpgu_hdmi.c b/drivers/gpu/drm/arc/arcpgu_hdmi.c
index 925d6d3..d430af6 100644 (file)
--- a/drivers/gpu/drm/arc/arcpgu_hdmi.c
+++ b/drivers/gpu/drm/arc/arcpgu_hdmi.c
@@ -12,32 +12,16 @@
 
 #include "arcpgu.h"
 
-static struct drm_encoder_funcs arcpgu_drm_encoder_funcs = {
-       .destroy = drm_encoder_cleanup,
-};
-
 int arcpgu_drm_hdmi_init(struct drm_device *drm, struct device_node *np)
 {
        struct arcpgu_drm_private *arcpgu = dev_to_arcpgu(drm);
-       struct drm_encoder *encoder;
        struct drm_bridge *bridge;
 
-       int ret = 0;
-
-       encoder = &arcpgu->pipe.encoder;
-
        /* Locate drm bridge from the hdmi encoder DT node */
        bridge = of_drm_find_bridge(np);
        if (!bridge)
                return -EPROBE_DEFER;
 
-       encoder->possible_crtcs = 1;
-       encoder->possible_clones = 0;
-       ret = drm_encoder_init(drm, encoder, &arcpgu_drm_encoder_funcs,
-                              DRM_MODE_ENCODER_TMDS, NULL);
-       if (ret)
-               return ret;
-
        /* Link drm_bridge to encoder */
-       return drm_bridge_attach(encoder, bridge, NULL, 0);
+       return drm_simple_display_pipe_attach_bridge(&arcpgu->pipe, bridge);
 }

diff --git a/drivers/gpu/drm/arc/arcpgu_sim.c b/drivers/gpu/drm/arc/arcpgu_sim.c
index afc34f8..1a63f08 100644 (file)
--- a/drivers/gpu/drm/arc/arcpgu_sim.c
+++ b/drivers/gpu/drm/arc/arcpgu_sim.c
@@ -45,10 +45,6 @@ static const struct drm_connector_funcs arcpgu_drm_connector_funcs = {
        .atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
 };
 
-static struct drm_encoder_funcs arcpgu_drm_encoder_funcs = {
-       .destroy = drm_encoder_cleanup,
-};
-
 int arcpgu_drm_sim_init(struct drm_device *drm, struct device_node *np)
 {
        struct arcpgu_drm_private *arcpgu = dev_to_arcpgu(drm);
@@ -58,14 +54,6 @@ int arcpgu_drm_sim_init(struct drm_device *drm, struct device_node *np)
 
        encoder = &arcpgu->pipe.encoder;
 
-       encoder->possible_crtcs = 1;
-       encoder->possible_clones = 0;
-
-       ret = drm_encoder_init(drm, encoder, &arcpgu_drm_encoder_funcs,
-                              DRM_MODE_ENCODER_VIRTUAL, NULL);
-       if (ret)
-               return ret;
-
        connector = &arcpgu->sim_conn;
        drm_connector_helper_add(connector, &arcpgu_drm_connector_helper_funcs);