Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 656e5f65 authored by Maxime Ripard's avatar Maxime Ripard
Browse files

drm/sun4i: engine: Add a custom crtc atomic_check 



We have some restrictions on what the planes and CRTC can provide that are
tied to only one generation of display engines.

For example, on the first generation, we can only have one YUV plane or one
plane that uses the frontend output.

Let's allow our engines to provide an atomic_check callback to validate the
current configuration.

Reviewed-by: default avatarChen-Yu Tsai <wens@csie.org>
Reviewed-by: default avatarNeil Armstrong <narmstrong@baylibre.com>
Signed-off-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
Link: https://patchwork.freedesktop.org/patch/msgid/e5f5f144e5c20d348cdb29933ae876c105bec017.1516613040.git-series.maxime.ripard@free-electrons.com
parent d540f82a

drivers/gpu/drm/sun4i/sun4i_crtc.c

+14 −0
Original line number Diff line number Diff line
@@ -46,6 +46,19 @@ static struct drm_encoder *sun4i_crtc_get_encoder(struct drm_crtc *crtc) 
	return NULL;

}



static int sun4i_crtc_atomic_check(struct drm_crtc *crtc,

				    struct drm_crtc_state *state)

{

	struct sun4i_crtc *scrtc = drm_crtc_to_sun4i_crtc(crtc);

	struct sunxi_engine *engine = scrtc->engine;

	int ret = 0;



	if (engine && engine->ops && engine->ops->atomic_check)

		ret = engine->ops->atomic_check(engine, state);



	return ret;

}



static void sun4i_crtc_atomic_begin(struct drm_crtc *crtc,

				    struct drm_crtc_state *old_state)

{
@@ -125,6 +138,7 @@ static void sun4i_crtc_mode_set_nofb(struct drm_crtc *crtc) 
}



static const struct drm_crtc_helper_funcs sun4i_crtc_helper_funcs = {

	.atomic_check	= sun4i_crtc_atomic_check,

	.atomic_begin	= sun4i_crtc_atomic_begin,

	.atomic_flush	= sun4i_crtc_atomic_flush,

	.atomic_enable	= sun4i_crtc_atomic_enable,

drivers/gpu/drm/sun4i/sunxi_engine.h

+17 −0
Original line number Diff line number Diff line
@@ -22,6 +22,23 @@ struct sunxi_engine; 
 * implement the proper behaviour.

 */

struct sunxi_engine_ops {

	/**

	 * @atomic_check:

	 *

	 * This callback allows to validate plane-update related CRTC

	 * constraints specific to engines. This is mirroring the

	 * &drm_crtc_helper_funcs.atomic_check callback, so any

	 * documentation there applies.

	 *

	 * This function is optional.

	 *

	 * RETURNS:

	 *

	 * 0 on success or a negative error code.

	 */

	int (*atomic_check)(struct sunxi_engine *engine,

			    struct drm_crtc_state *state);



	/**

	 * @commit:

	 *