Commit c8fa1e73 authored by Benoit Parrot's avatar Benoit Parrot Committed by Tomi Valkeinen
Browse files

drm/omap: introduce omap_hw_overlay 



Split out the hardware overlay specifics from omap_plane.
To start, the hw overlays are statically assigned to planes.

The goal is to eventually assign hw overlays dynamically to planes
during plane->atomic_check() based on requested caps (scaling, YUV,
etc). And then perform hw overlay re-assignment if required.

Signed-off-by: default avatarBenoit Parrot <bparrot@ti.com>
Signed-off-by: default avatarNeil Armstrong <narmstrong@baylibre.com>
Reviewed-by: default avatarTomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20211117141928.771082-5-narmstrong@baylibre.com
parent 0b0f7282

drivers/gpu/drm/omapdrm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ omapdrm-y := omap_drv.o \ 
	omap_debugfs.o \

	omap_crtc.o \

	omap_plane.o \

	omap_overlay.o \

	omap_encoder.o \

	omap_fb.o \

	omap_gem.o \

drivers/gpu/drm/omapdrm/omap_drv.c

+8 −1
Original line number Diff line number Diff line
@@ -583,10 +583,14 @@ static int omapdrm_init(struct omap_drm_private *priv, struct device *dev) 


	omap_gem_init(ddev);



	ret = omap_hwoverlays_init(priv);

	if (ret)

		goto err_gem_deinit;



	ret = omap_modeset_init(ddev);

	if (ret) {

		dev_err(priv->dev, "omap_modeset_init failed: ret=%d\n", ret);

		goto err_gem_deinit;

		goto err_free_overlays;

	}



	/* Initialize vblank handling, start with all CRTCs disabled. */
@@ -618,6 +622,8 @@ static int omapdrm_init(struct omap_drm_private *priv, struct device *dev) 
	omap_fbdev_fini(ddev);

err_cleanup_modeset:

	omap_modeset_fini(ddev);

err_free_overlays:

	omap_hwoverlays_destroy(priv);

err_gem_deinit:

	omap_gem_deinit(ddev);

	destroy_workqueue(priv->wq);
@@ -642,6 +648,7 @@ static void omapdrm_cleanup(struct omap_drm_private *priv) 
	drm_atomic_helper_shutdown(ddev);



	omap_modeset_fini(ddev);

	omap_hwoverlays_destroy(priv);

	omap_gem_deinit(ddev);



	destroy_workqueue(priv->wq);

drivers/gpu/drm/omapdrm/omap_drv.h

+4 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include "omap_gem.h"

#include "omap_irq.h"

#include "omap_plane.h"

#include "omap_overlay.h"



#define DBG(fmt, ...) DRM_DEBUG_DRIVER(fmt"\n", ##__VA_ARGS__)

#define VERB(fmt, ...) if (0) DRM_DEBUG_DRIVER(fmt, ##__VA_ARGS__) /* verbose debug */
@@ -57,6 +58,9 @@ struct omap_drm_private { 
	unsigned int num_planes;

	struct drm_plane *planes[8];



	unsigned int num_ovls;

	struct omap_hw_overlay *overlays[8];



	struct drm_fb_helper *fbdev;



	struct workqueue_struct *wq;

drivers/gpu/drm/omapdrm/omap_overlay.c

0 → 100644
+84 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Copyright (C) 2018 Texas Instruments Incorporated -  http://www.ti.com/

 * Author: Benoit Parrot <bparrot@ti.com>

 */



#include <drm/drm_atomic.h>

#include <drm/drm_atomic_helper.h>

#include <drm/drm_plane_helper.h>



#include "omap_dmm_tiler.h"

#include "omap_drv.h"



/*

 * overlay funcs

 */

static const char * const overlay_id_to_name[] = {

	[OMAP_DSS_GFX] = "gfx",

	[OMAP_DSS_VIDEO1] = "vid1",

	[OMAP_DSS_VIDEO2] = "vid2",

	[OMAP_DSS_VIDEO3] = "vid3",

};



static void omap_overlay_destroy(struct omap_hw_overlay *overlay)

{

	kfree(overlay);

}



static struct omap_hw_overlay *omap_overlay_init(enum omap_plane_id overlay_id,

						 enum omap_overlay_caps caps)

{

	struct omap_hw_overlay *overlay;



	overlay = kzalloc(sizeof(*overlay), GFP_KERNEL);

	if (!overlay)

		return ERR_PTR(-ENOMEM);



	overlay->name = overlay_id_to_name[overlay_id];

	overlay->id = overlay_id;

	overlay->caps = caps;



	return overlay;

}



int omap_hwoverlays_init(struct omap_drm_private *priv)

{

	static const enum omap_plane_id hw_plane_ids[] = {

			OMAP_DSS_GFX, OMAP_DSS_VIDEO1,

			OMAP_DSS_VIDEO2, OMAP_DSS_VIDEO3,

	};

	u32 num_overlays = dispc_get_num_ovls(priv->dispc);

	enum omap_overlay_caps caps;

	int i, ret;



	for (i = 0; i < num_overlays; i++) {

		struct omap_hw_overlay *overlay;



		caps = dispc_ovl_get_caps(priv->dispc, hw_plane_ids[i]);

		overlay = omap_overlay_init(hw_plane_ids[i], caps);

		if (IS_ERR(overlay)) {

			ret = PTR_ERR(overlay);

			dev_err(priv->dev, "failed to construct overlay for %s (%d)\n",

				overlay_id_to_name[i], ret);

			omap_hwoverlays_destroy(priv);

			return ret;

		}

		overlay->idx = priv->num_ovls;

		priv->overlays[priv->num_ovls++] = overlay;

	}



	return 0;

}



void omap_hwoverlays_destroy(struct omap_drm_private *priv)

{

	int i;



	for (i = 0; i < priv->num_ovls; i++) {

		omap_overlay_destroy(priv->overlays[i]);

		priv->overlays[i] = NULL;

	}



	priv->num_ovls = 0;

}

drivers/gpu/drm/omapdrm/omap_overlay.h

0 → 100644
+30 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 * Copyright (C) 2018 Texas Instruments Incorporated -  http://www.ti.com/

 * Author: Benoit Parrot <bparrot@ti.com>

 */



#ifndef __OMAPDRM_OVERLAY_H__

#define __OMAPDRM_OVERLAY_H__



#include <linux/types.h>



enum drm_plane_type;



struct drm_device;

struct drm_mode_object;

struct drm_plane;



/* Used to associate a HW overlay/plane to a plane */

struct omap_hw_overlay {

	unsigned int idx;



	const char *name;

	enum omap_plane_id id;



	enum omap_overlay_caps caps;

};



int omap_hwoverlays_init(struct omap_drm_private *priv);

void omap_hwoverlays_destroy(struct omap_drm_private *priv);

#endif /* __OMAPDRM_OVERLAY_H__ */