On Wed, Apr 15, 2020 at 09:40:22AM +0200, Daniel Vetter wrote:
> 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.
>
> Signed-off-by: Daniel Vetter <daniel.vet...@intel.com>
> Cc: Alexey Brodkin <abrod...@synopsys.com>
Lots of simplifications by using drm_simple_* - good.
One open Q below - but if this is OK then
Acked-by: Sam Ravnborg <s...@ravnborg.org>
> ---
> drivers/gpu/drm/arc/arcpgu.h | 4 +-
> drivers/gpu/drm/arc/arcpgu_crtc.c | 102 ++++++++----------------------
> drivers/gpu/drm/arc/arcpgu_drv.c | 2 +-
> drivers/gpu/drm/arc/arcpgu_hdmi.c | 18 +-----
> 4 files changed, 31 insertions(+), 95 deletions(-)
>
> diff --git a/drivers/gpu/drm/arc/arcpgu.h b/drivers/gpu/drm/arc/arcpgu.h
> index c52cdd2274e1..b5c699d14f27 100644
> --- 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 c7769edeefdf..5c6d7e34ca73 100644
> --- a/drivers/gpu/drm/arc/arcpgu_crtc.c
> +++ b/drivers/gpu/drm/arc/arcpgu_crtc.c
> @@ -25,10 +25,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;
> @@ -59,10 +58,10 @@ static const struct drm_crtc_funcs arc_pgu_crtc_funcs = {
> .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 */
>
> @@ -109,15 +108,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_crtc_state *old_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);
>
> @@ -127,10 +127,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_crtc_state *old_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,
> @@ -138,80 +137,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_plane_state *state)
> +static void arc_pgu_update(struct drm_simple_display_pipe *pipe,
> + struct drm_plane_state *state)
> {
> struct arcpgu_drm_private *arcpgu;
> struct drm_gem_cma_object *gem;
>
> - if (!plane->state->crtc || !plane->state->fb)
> + if (!pipe->plane.state->crtc || !pipe->plane.state->fb)
> return;
>
> - arcpgu = crtc_to_arcpgu_priv(plane->state->crtc);
> - gem = drm_fb_cma_get_gem_obj(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 void arc_pgu_plane_destroy(struct drm_plane *plane)
> -{
> - drm_plane_cleanup(plane);
> -}
> -
> -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 = arc_pgu_plane_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 *arc_pgu_plane_init(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 *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)
> -{
> - 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 40c9fc12d515..bf03eda532bc 100644
> --- 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 925d6d31bb78..d430af686cbc 100644
> --- 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);
drm_simple_* will create a DRM_MODE_ENCODER_NONE - so the
encoder type will be different.
If this has any practical implications I dunno.
Sam
> - 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);
> }
> --
> 2.25.1
>
> _______________________________________________
> dri-devel mailing list
> dri-de...@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
