Commit 2af03944 authored by Laurent Pinchart's avatar Laurent Pinchart

drm: rcar-du: Restart the DU group when a plane source changes

Plane sources are configured by the VSPS bit in the PnDDCR4 register.
Although the datasheet states that the bit is updated during vertical
blanking, it seems that updates only occur when the DU group is held in
reset through the DSYSR.DRES bit. Restart the group if the source
changes.
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
parent 34a04f2b
...@@ -272,6 +272,10 @@ static void rcar_du_crtc_update_planes(struct rcar_du_crtc *rcrtc) ...@@ -272,6 +272,10 @@ static void rcar_du_crtc_update_planes(struct rcar_du_crtc *rcrtc)
rcar_du_group_restart(rcrtc->group); rcar_du_group_restart(rcrtc->group);
} }
/* Restart the group if plane sources have changed. */
if (rcrtc->group->need_restart)
rcar_du_group_restart(rcrtc->group);
mutex_unlock(&rcrtc->group->lock); mutex_unlock(&rcrtc->group->lock);
rcar_du_group_write(rcrtc->group, rcrtc->index % 2 ? DS2PR : DS1PR, rcar_du_group_write(rcrtc->group, rcrtc->index % 2 ? DS2PR : DS1PR,
......
...@@ -162,6 +162,8 @@ void rcar_du_group_start_stop(struct rcar_du_group *rgrp, bool start) ...@@ -162,6 +162,8 @@ void rcar_du_group_start_stop(struct rcar_du_group *rgrp, bool start)
void rcar_du_group_restart(struct rcar_du_group *rgrp) void rcar_du_group_restart(struct rcar_du_group *rgrp)
{ {
rgrp->need_restart = false;
__rcar_du_group_start_stop(rgrp, false); __rcar_du_group_start_stop(rgrp, false);
__rcar_du_group_start_stop(rgrp, true); __rcar_du_group_start_stop(rgrp, true);
} }
......
...@@ -32,6 +32,7 @@ struct rcar_du_device; ...@@ -32,6 +32,7 @@ struct rcar_du_device;
* @dptsr_planes: bitmask of planes driven by dot-clock and timing generator 1 * @dptsr_planes: bitmask of planes driven by dot-clock and timing generator 1
* @num_planes: number of planes in the group * @num_planes: number of planes in the group
* @planes: planes handled by the group * @planes: planes handled by the group
* @need_restart: the group needs to be restarted due to a configuration change
*/ */
struct rcar_du_group { struct rcar_du_group {
struct rcar_du_device *dev; struct rcar_du_device *dev;
...@@ -47,6 +48,7 @@ struct rcar_du_group { ...@@ -47,6 +48,7 @@ struct rcar_du_group {
unsigned int num_planes; unsigned int num_planes;
struct rcar_du_plane planes[RCAR_DU_NUM_KMS_PLANES]; struct rcar_du_plane planes[RCAR_DU_NUM_KMS_PLANES];
bool need_restart;
}; };
u32 rcar_du_group_read(struct rcar_du_group *rgrp, u32 reg); u32 rcar_du_group_read(struct rcar_du_group *rgrp, u32 reg);
......
...@@ -275,9 +275,27 @@ static void rcar_du_plane_atomic_update(struct drm_plane *plane, ...@@ -275,9 +275,27 @@ static void rcar_du_plane_atomic_update(struct drm_plane *plane,
struct drm_plane_state *old_state) struct drm_plane_state *old_state)
{ {
struct rcar_du_plane *rplane = to_rcar_plane(plane); struct rcar_du_plane *rplane = to_rcar_plane(plane);
struct rcar_du_plane_state *old_rstate;
struct rcar_du_plane_state *new_rstate;
if (!plane->state->crtc)
return;
if (plane->state->crtc)
rcar_du_plane_setup(rplane); rcar_du_plane_setup(rplane);
/* Check whether the source has changed from memory to live source or
* from live source to memory. The source has been configured by the
* VSPS bit in the PnDDCR4 register. Although the datasheet states that
* the bit is updated during vertical blanking, it seems that updates
* only occur when the DU group is held in reset through the DSYSR.DRES
* bit. We thus need to restart the group if the source changes.
*/
old_rstate = to_rcar_plane_state(old_state);
new_rstate = to_rcar_plane_state(plane->state);
if ((old_rstate->source == RCAR_DU_PLANE_MEMORY) !=
(new_rstate->source == RCAR_DU_PLANE_MEMORY))
rplane->group->need_restart = true;
} }
static const struct drm_plane_helper_funcs rcar_du_plane_helper_funcs = { static const struct drm_plane_helper_funcs rcar_du_plane_helper_funcs = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment