On Wed, Apr 15, 2020 at 09:40:17AM +0200, Daniel Vetter wrote:
> This is a prep step to convert arc over to the simple kms helpers, for
> now we just use this as an embedding container to drop all the various
> allocations. Big change is the removal of the various devm_kzalloc,
> which have the wrong lifetimes anyway.
>
> Signed-off-by: Daniel Vetter <daniel.vetter@xxxxxxxxx>
> Cc: Alexey Brodkin <abrodkin@xxxxxxxxxxxx>
Acked-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
> ---
> drivers/gpu/drm/arc/arcpgu.h | 7 ++++---
> drivers/gpu/drm/arc/arcpgu_crtc.c | 9 +++------
> drivers/gpu/drm/arc/arcpgu_drv.c | 2 +-
> drivers/gpu/drm/arc/arcpgu_hdmi.c | 5 ++---
> drivers/gpu/drm/arc/arcpgu_sim.c | 5 ++---
> 5 files changed, 12 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/gpu/drm/arc/arcpgu.h b/drivers/gpu/drm/arc/arcpgu.h
> index ed77dd5dd5cb..52afd638a4d2 100644
> --- a/drivers/gpu/drm/arc/arcpgu.h
> +++ b/drivers/gpu/drm/arc/arcpgu.h
> @@ -8,17 +8,18 @@
> #ifndef _ARCPGU_H_
> #define _ARCPGU_H_
>
> +#include <drm/drm_simple_kms_helper.h>
> +
> struct arcpgu_drm_private {
> struct drm_device drm;
> void __iomem *regs;
> struct clk *clk;
> - struct drm_crtc crtc;
> - struct drm_plane *plane;
> + struct drm_simple_display_pipe pipe;
> };
>
> #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, crtc)
> +#define crtc_to_arcpgu_priv(x) container_of(x, struct arcpgu_drm_private, pipe.crtc)
>
> static inline void arc_pgu_write(struct arcpgu_drm_private *arcpgu,
> unsigned int reg, u32 value)
> diff --git a/drivers/gpu/drm/arc/arcpgu_crtc.c b/drivers/gpu/drm/arc/arcpgu_crtc.c
> index ba796a216244..88ba2e284fc0 100644
> --- a/drivers/gpu/drm/arc/arcpgu_crtc.c
> +++ b/drivers/gpu/drm/arc/arcpgu_crtc.c
> @@ -182,9 +182,7 @@ static struct drm_plane *arc_pgu_plane_init(struct drm_device *drm)
> struct drm_plane *plane = NULL;
> int ret;
>
> - plane = devm_kzalloc(drm->dev, sizeof(*plane), GFP_KERNEL);
> - if (!plane)
> - return ERR_PTR(-ENOMEM);
> + plane = &arcpgu->pipe.plane;
>
> ret = drm_universal_plane_init(drm, plane, 0xff, &arc_pgu_plane_funcs,
> arc_pgu_supported_formats,
> @@ -195,7 +193,6 @@ static struct drm_plane *arc_pgu_plane_init(struct drm_device *drm)
> return ERR_PTR(ret);
>
> drm_plane_helper_add(plane, &arc_pgu_plane_helper_funcs);
> - arcpgu->plane = plane;
>
> return plane;
> }
> @@ -210,13 +207,13 @@ int arc_pgu_setup_crtc(struct drm_device *drm)
> if (IS_ERR(primary))
> return PTR_ERR(primary);
>
> - ret = drm_crtc_init_with_planes(drm, &arcpgu->crtc, primary, NULL,
> + ret = drm_crtc_init_with_planes(drm, &arcpgu->pipe.crtc, primary, NULL,
> &arc_pgu_crtc_funcs, NULL);
> if (ret) {
> arc_pgu_plane_destroy(primary);
> return ret;
> }
>
> - drm_crtc_helper_add(&arcpgu->crtc, &arc_pgu_crtc_helper_funcs);
> + drm_crtc_helper_add(&arcpgu->pipe.crtc, &arc_pgu_crtc_helper_funcs);
> return 0;
> }
> diff --git a/drivers/gpu/drm/arc/arcpgu_drv.c b/drivers/gpu/drm/arc/arcpgu_drv.c
> index 81b8d7ae6623..a419f279e129 100644
> --- a/drivers/gpu/drm/arc/arcpgu_drv.c
> +++ b/drivers/gpu/drm/arc/arcpgu_drv.c
> @@ -120,7 +120,7 @@ static int arcpgu_show_pxlclock(struct seq_file *m, void *arg)
> struct drm_device *drm = node->minor->dev;
> struct arcpgu_drm_private *arcpgu = dev_to_arcpgu(drm);
> unsigned long clkrate = clk_get_rate(arcpgu->clk);
> - unsigned long mode_clock = arcpgu->crtc.mode.crtc_clock * 1000;
> + unsigned long mode_clock = arcpgu->pipe.crtc.mode.crtc_clock * 1000;
>
> seq_printf(m, "hw : %lu\n", clkrate);
> seq_printf(m, "mode: %lu\n", mode_clock);
> diff --git a/drivers/gpu/drm/arc/arcpgu_hdmi.c b/drivers/gpu/drm/arc/arcpgu_hdmi.c
> index 52839934f2fb..dbad2c9237fe 100644
> --- a/drivers/gpu/drm/arc/arcpgu_hdmi.c
> +++ b/drivers/gpu/drm/arc/arcpgu_hdmi.c
> @@ -18,14 +18,13 @@ static struct drm_encoder_funcs arcpgu_drm_encoder_funcs = {
>
> 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 = devm_kzalloc(drm->dev, sizeof(*encoder), GFP_KERNEL);
> - if (encoder == NULL)
> - return -ENOMEM;
> + encoder = &arcpgu->pipe.encoder;
>
> /* Locate drm bridge from the hdmi encoder DT node */
> bridge = of_drm_find_bridge(np);
> diff --git a/drivers/gpu/drm/arc/arcpgu_sim.c b/drivers/gpu/drm/arc/arcpgu_sim.c
> index 37d961668dfe..134afb9fa625 100644
> --- a/drivers/gpu/drm/arc/arcpgu_sim.c
> +++ b/drivers/gpu/drm/arc/arcpgu_sim.c
> @@ -56,14 +56,13 @@ static struct drm_encoder_funcs arcpgu_drm_encoder_funcs = {
>
> int arcpgu_drm_sim_init(struct drm_device *drm, struct device_node *np)
> {
> + struct arcpgu_drm_private *arcpgu = dev_to_arcpgu(drm);
> struct arcpgu_drm_connector *arcpgu_connector;
> struct drm_encoder *encoder;
> struct drm_connector *connector;
> int ret;
>
> - encoder = devm_kzalloc(drm->dev, sizeof(*encoder), GFP_KERNEL);
> - if (encoder == NULL)
> - return -ENOMEM;
> + encoder = &arcpgu->pipe.encoder;
>
> encoder->possible_crtcs = 1;
> encoder->possible_clones = 0;
> --
> 2.25.1
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@xxxxxxxxxxxxxxxxxxxxx
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
