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

Unverified Commit 686d2638 authored by Paul Kocialkowski's avatar Paul Kocialkowski Committed by Maxime Ripard
Browse files

drm/sun4i: Cleanup video/YUV source before enabling a layer 



This adds a dedicated function for cleaning the video and YUV source
channel layer enable bits. This function is called first on layer atomic
update to make sure that there are no leftover bits from previous
plane configuration that were not cleaned until now.

It fixes issues when alternating between video and YUV planes, where
both bits would be set eventually, leading to broken plane display.

Signed-off-by: default avatarPaul Kocialkowski <paul.kocialkowski@bootlin.com>
Signed-off-by: default avatarMaxime Ripard <maxime.ripard@bootlin.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181123092515.2511-2-paul.kocialkowski@bootlin.com
parent a42facc8

drivers/gpu/drm/sun4i/sun4i_backend.c

+9 −0
Original line number Diff line number Diff line
@@ -395,6 +395,15 @@ int sun4i_backend_update_layer_zpos(struct sun4i_backend *backend, int layer, 
	return 0;

}



void sun4i_backend_cleanup_layer(struct sun4i_backend *backend,

				 int layer)

{

	regmap_update_bits(backend->engine.regs,

			   SUN4I_BACKEND_ATTCTL_REG0(layer),

			   SUN4I_BACKEND_ATTCTL_REG0_LAY_VDOEN |

			   SUN4I_BACKEND_ATTCTL_REG0_LAY_YUVEN, 0);

}



static bool sun4i_backend_plane_uses_scaler(struct drm_plane_state *state)

{

	u16 src_h = state->src_h >> 16;

drivers/gpu/drm/sun4i/sun4i_backend.h

+2 −0
Original line number Diff line number Diff line
@@ -208,5 +208,7 @@ int sun4i_backend_update_layer_frontend(struct sun4i_backend *backend, 
					int layer, uint32_t in_fmt);

int sun4i_backend_update_layer_zpos(struct sun4i_backend *backend,

				    int layer, struct drm_plane *plane);

void sun4i_backend_cleanup_layer(struct sun4i_backend *backend,

				 int layer);



#endif /* _SUN4I_BACKEND_H_ */

drivers/gpu/drm/sun4i/sun4i_layer.c

+2 −0
Original line number Diff line number Diff line
@@ -93,6 +93,8 @@ static void sun4i_backend_layer_atomic_update(struct drm_plane *plane, 
	struct sun4i_backend *backend = layer->backend;

	struct sun4i_frontend *frontend = backend->frontend;



	sun4i_backend_cleanup_layer(backend, layer->id);



	if (layer_state->uses_frontend) {

		sun4i_frontend_init(frontend);

		sun4i_frontend_update_coord(frontend, plane);