| Message ID | 20220207163515.1038648-17-maxime@cerno.tech (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | dad911d3c4a60b6fccf698c060f55fca898f287a |
| Delegated to: | Kieran Bingham |
| Headers | show |
| Series | None | expand |
Hello Maxime, Thank you for the patch. On Mon, Feb 07, 2022 at 05:35:08PM +0100, Maxime Ripard wrote: > The rcar-du KMS driver will call drm_plane_create_zpos_property() with an > init value depending on the plane type. > > Since the initial value wasn't carried over in the state, the driver had > to set it again in rcar_du_plane_reset() and rcar_du_vsp_plane_reset(). > However, the helpers have been adjusted to set it properly at reset, so > this is not needed anymore. > > Cc: linux-renesas-soc@vger.kernel.org > Cc: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com> > Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > Signed-off-by: Maxime Ripard <maxime@cerno.tech> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > drivers/gpu/drm/rcar-du/rcar_du_plane.c | 1 - > drivers/gpu/drm/rcar-du/rcar_du_vsp.c | 1 - > 2 files changed, 2 deletions(-) > > diff --git a/drivers/gpu/drm/rcar-du/rcar_du_plane.c b/drivers/gpu/drm/rcar-du/rcar_du_plane.c > index 862197be1e01..9dda5e06457d 100644 > --- a/drivers/gpu/drm/rcar-du/rcar_du_plane.c > +++ b/drivers/gpu/drm/rcar-du/rcar_du_plane.c > @@ -696,7 +696,6 @@ static void rcar_du_plane_reset(struct drm_plane *plane) > state->hwindex = -1; > state->source = RCAR_DU_PLANE_MEMORY; > state->colorkey = RCAR_DU_COLORKEY_NONE; > - state->state.zpos = plane->type == DRM_PLANE_TYPE_PRIMARY ? 0 : 1; > } > > static int rcar_du_plane_atomic_set_property(struct drm_plane *plane, > diff --git a/drivers/gpu/drm/rcar-du/rcar_du_vsp.c b/drivers/gpu/drm/rcar-du/rcar_du_vsp.c > index b7fc5b069cbc..719c60034952 100644 > --- a/drivers/gpu/drm/rcar-du/rcar_du_vsp.c > +++ b/drivers/gpu/drm/rcar-du/rcar_du_vsp.c > @@ -362,7 +362,6 @@ static void rcar_du_vsp_plane_reset(struct drm_plane *plane) > return; > > __drm_atomic_helper_plane_reset(plane, &state->state); > - state->state.zpos = plane->type == DRM_PLANE_TYPE_PRIMARY ? 0 : 1; > } > > static const struct drm_plane_funcs rcar_du_vsp_plane_funcs = {
Quoting Maxime Ripard (2022-02-07 16:35:08) > The rcar-du KMS driver will call drm_plane_create_zpos_property() with an > init value depending on the plane type. > > Since the initial value wasn't carried over in the state, the driver had > to set it again in rcar_du_plane_reset() and rcar_du_vsp_plane_reset(). > However, the helpers have been adjusted to set it properly at reset, so > this is not needed anymore. Sounds helpful ;-) > Cc: linux-renesas-soc@vger.kernel.org > Cc: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com> > Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > Signed-off-by: Maxime Ripard <maxime@cerno.tech> Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com> > --- > drivers/gpu/drm/rcar-du/rcar_du_plane.c | 1 - > drivers/gpu/drm/rcar-du/rcar_du_vsp.c | 1 - > 2 files changed, 2 deletions(-) > > diff --git a/drivers/gpu/drm/rcar-du/rcar_du_plane.c b/drivers/gpu/drm/rcar-du/rcar_du_plane.c > index 862197be1e01..9dda5e06457d 100644 > --- a/drivers/gpu/drm/rcar-du/rcar_du_plane.c > +++ b/drivers/gpu/drm/rcar-du/rcar_du_plane.c > @@ -696,7 +696,6 @@ static void rcar_du_plane_reset(struct drm_plane *plane) > state->hwindex = -1; > state->source = RCAR_DU_PLANE_MEMORY; > state->colorkey = RCAR_DU_COLORKEY_NONE; > - state->state.zpos = plane->type == DRM_PLANE_TYPE_PRIMARY ? 0 : 1; > } > > static int rcar_du_plane_atomic_set_property(struct drm_plane *plane, > diff --git a/drivers/gpu/drm/rcar-du/rcar_du_vsp.c b/drivers/gpu/drm/rcar-du/rcar_du_vsp.c > index b7fc5b069cbc..719c60034952 100644 > --- a/drivers/gpu/drm/rcar-du/rcar_du_vsp.c > +++ b/drivers/gpu/drm/rcar-du/rcar_du_vsp.c > @@ -362,7 +362,6 @@ static void rcar_du_vsp_plane_reset(struct drm_plane *plane) > return; > > __drm_atomic_helper_plane_reset(plane, &state->state); > - state->state.zpos = plane->type == DRM_PLANE_TYPE_PRIMARY ? 0 : 1; > } > > static const struct drm_plane_funcs rcar_du_vsp_plane_funcs = { > -- > 2.34.1 >
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_plane.c b/drivers/gpu/drm/rcar-du/rcar_du_plane.c index 862197be1e01..9dda5e06457d 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_plane.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_plane.c @@ -696,7 +696,6 @@ static void rcar_du_plane_reset(struct drm_plane *plane) state->hwindex = -1; state->source = RCAR_DU_PLANE_MEMORY; state->colorkey = RCAR_DU_COLORKEY_NONE; - state->state.zpos = plane->type == DRM_PLANE_TYPE_PRIMARY ? 0 : 1; } static int rcar_du_plane_atomic_set_property(struct drm_plane *plane, diff --git a/drivers/gpu/drm/rcar-du/rcar_du_vsp.c b/drivers/gpu/drm/rcar-du/rcar_du_vsp.c index b7fc5b069cbc..719c60034952 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_vsp.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_vsp.c @@ -362,7 +362,6 @@ static void rcar_du_vsp_plane_reset(struct drm_plane *plane) return; __drm_atomic_helper_plane_reset(plane, &state->state); - state->state.zpos = plane->type == DRM_PLANE_TYPE_PRIMARY ? 0 : 1; } static const struct drm_plane_funcs rcar_du_vsp_plane_funcs = {
The rcar-du KMS driver will call drm_plane_create_zpos_property() with an init value depending on the plane type. Since the initial value wasn't carried over in the state, the driver had to set it again in rcar_du_plane_reset() and rcar_du_vsp_plane_reset(). However, the helpers have been adjusted to set it properly at reset, so this is not needed anymore. Cc: linux-renesas-soc@vger.kernel.org Cc: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com> Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Maxime Ripard <maxime@cerno.tech> --- drivers/gpu/drm/rcar-du/rcar_du_plane.c | 1 - drivers/gpu/drm/rcar-du/rcar_du_vsp.c | 1 - 2 files changed, 2 deletions(-)