| Message ID | 20170712081344.25495-8-maarten.lankhorst@linux.intel.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Geert Uytterhoeven |
| Headers | show |
On Wed, Jul 12, 2017 at 10:13:35AM +0200, Maarten Lankhorst wrote: > for_each_obj_in_state is about to be removed, so use the correct new > iterator macros. > > Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> > Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > Cc: linux-renesas-soc@vger.kernel.org Looks correct, but I think Laurent has a patch to rework/remove this. Found something below anyway. > --- > drivers/gpu/drm/rcar-du/rcar_du_plane.c | 41 ++++++++++++++++----------------- > 1 file changed, 20 insertions(+), 21 deletions(-) > > diff --git a/drivers/gpu/drm/rcar-du/rcar_du_plane.c b/drivers/gpu/drm/rcar-du/rcar_du_plane.c > index dcde6288da6c..dfd84e3c8c25 100644 > --- a/drivers/gpu/drm/rcar-du/rcar_du_plane.c > +++ b/drivers/gpu/drm/rcar-du/rcar_du_plane.c > @@ -51,12 +51,9 @@ > */ > > static bool rcar_du_plane_needs_realloc(struct rcar_du_plane *plane, > + const struct rcar_du_plane_state *cur_state, > struct rcar_du_plane_state *new_state) > { > - struct rcar_du_plane_state *cur_state; > - > - cur_state = to_rcar_plane_state(plane->plane.state); > - > /* Lowering the number of planes doesn't strictly require reallocation > * as the extra hardware plane will be freed when committing, but doing > * so could lead to more fragmentation. > @@ -141,16 +138,17 @@ int rcar_du_atomic_check_planes(struct drm_device *dev, > unsigned int groups = 0; > unsigned int i; > struct drm_plane *drm_plane; > - struct drm_plane_state *drm_plane_state; > + struct drm_plane_state *old_drm_plane_state, *new_drm_plane_state; > > /* Check if hardware planes need to be reallocated. */ > - for_each_plane_in_state(state, drm_plane, drm_plane_state, i) { > - struct rcar_du_plane_state *plane_state; > + for_each_oldnew_plane_in_state(state, drm_plane, old_drm_plane_state, new_drm_plane_state, i) { > + struct rcar_du_plane_state *old_plane_state, *new_plane_state; > struct rcar_du_plane *plane; > unsigned int index; > > plane = to_rcar_plane(drm_plane); > - plane_state = to_rcar_plane_state(drm_plane_state); > + old_plane_state = to_rcar_plane_state(old_drm_plane_state); > + new_plane_state = to_rcar_plane_state(new_drm_plane_state); > > dev_dbg(rcdu->dev, "%s: checking plane (%u,%tu)\n", __func__, > plane->group->index, plane - plane->group->planes); > @@ -159,19 +157,19 @@ int rcar_du_atomic_check_planes(struct drm_device *dev, > * the full reallocation procedure. Just mark the hardware > * plane(s) as freed. > */ > - if (!plane_state->format) { > + if (!new_plane_state->format) { > dev_dbg(rcdu->dev, "%s: plane is being disabled\n", > __func__); > index = plane - plane->group->planes; > group_freed_planes[plane->group->index] |= 1 << index; > - plane_state->hwindex = -1; > + new_plane_state->hwindex = -1; > continue; > } > > /* If the plane needs to be reallocated mark it as such, and > * mark the hardware plane(s) as free. > */ > - if (rcar_du_plane_needs_realloc(plane, plane_state)) { > + if (rcar_du_plane_needs_realloc(plane, old_plane_state, new_plane_state)) { > dev_dbg(rcdu->dev, "%s: plane needs reallocation\n", > __func__); > groups |= 1 << plane->group->index; > @@ -179,7 +177,7 @@ int rcar_du_atomic_check_planes(struct drm_device *dev, > > index = plane - plane->group->planes; > group_freed_planes[plane->group->index] |= 1 << index; > - plane_state->hwindex = -1; > + new_plane_state->hwindex = -1; > } > } > > @@ -226,16 +224,16 @@ int rcar_du_atomic_check_planes(struct drm_device *dev, > continue; > } > > - plane_state = to_rcar_plane_state(plane->plane.state); > + new_plane_state = to_rcar_plane_state(plane->plane.state); > used_planes |= rcar_du_plane_hwmask(plane_state); > > dev_dbg(rcdu->dev, > "%s: plane (%u,%tu) uses %u hwplanes (index %d)\n", > __func__, plane->group->index, > plane - plane->group->planes, > - plane_state->format ? > - plane_state->format->planes : 0, > - plane_state->hwindex); > + new_plane_state->format ? > + new_plane_state->format->planes : 0, > + new_plane_state->hwindex); > } > > group_free_planes[index] = 0xff & ~used_planes; > @@ -246,15 +244,16 @@ int rcar_du_atomic_check_planes(struct drm_device *dev, > } > > /* Reallocate hardware planes for each plane that needs it. */ > - for_each_plane_in_state(state, drm_plane, drm_plane_state, i) { > - struct rcar_du_plane_state *plane_state; > + for_each_oldnew_plane_in_state(state, drm_plane, old_drm_plane_state, new_drm_plane_state, i) { > + struct rcar_du_plane_state *old_plane_state, *new_plane_state; > struct rcar_du_plane *plane; > unsigned int crtc_planes; > unsigned int free; > int idx; > > plane = to_rcar_plane(drm_plane); > - plane_state = to_rcar_plane_state(drm_plane_state); > + old_plane_state = to_rcar_plane_state(old_drm_plane_state); > + new_plane_state = to_rcar_plane_state(new_drm_plane_state); > > dev_dbg(rcdu->dev, "%s: allocating plane (%u,%tu)\n", __func__, > plane->group->index, plane - plane->group->planes); > @@ -263,7 +262,7 @@ int rcar_du_atomic_check_planes(struct drm_device *dev, > * reallocated. > */ > if (!plane_state->format || I think you missed a few cases of replacing plane_state here. Does this compile? -Daniel > - !rcar_du_plane_needs_realloc(plane, plane_state)) > + !rcar_du_plane_needs_realloc(plane, old_plane_state, new_plane_state)) > continue; > > /* Try to allocate the plane from the free planes currently > @@ -279,7 +278,7 @@ int rcar_du_atomic_check_planes(struct drm_device *dev, > idx = rcar_du_plane_hwalloc(plane, plane_state, > free & crtc_planes); > if (idx < 0) > - idx = rcar_du_plane_hwalloc(plane, plane_state, > + idx = rcar_du_plane_hwalloc(plane, new_plane_state, > free); > if (idx < 0) { > dev_dbg(rcdu->dev, "%s: no available hardware plane\n", > -- > 2.11.0 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_plane.c b/drivers/gpu/drm/rcar-du/rcar_du_plane.c index dcde6288da6c..dfd84e3c8c25 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_plane.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_plane.c @@ -51,12 +51,9 @@ */ static bool rcar_du_plane_needs_realloc(struct rcar_du_plane *plane, + const struct rcar_du_plane_state *cur_state, struct rcar_du_plane_state *new_state) { - struct rcar_du_plane_state *cur_state; - - cur_state = to_rcar_plane_state(plane->plane.state); - /* Lowering the number of planes doesn't strictly require reallocation * as the extra hardware plane will be freed when committing, but doing * so could lead to more fragmentation. @@ -141,16 +138,17 @@ int rcar_du_atomic_check_planes(struct drm_device *dev, unsigned int groups = 0; unsigned int i; struct drm_plane *drm_plane; - struct drm_plane_state *drm_plane_state; + struct drm_plane_state *old_drm_plane_state, *new_drm_plane_state; /* Check if hardware planes need to be reallocated. */ - for_each_plane_in_state(state, drm_plane, drm_plane_state, i) { - struct rcar_du_plane_state *plane_state; + for_each_oldnew_plane_in_state(state, drm_plane, old_drm_plane_state, new_drm_plane_state, i) { + struct rcar_du_plane_state *old_plane_state, *new_plane_state; struct rcar_du_plane *plane; unsigned int index; plane = to_rcar_plane(drm_plane); - plane_state = to_rcar_plane_state(drm_plane_state); + old_plane_state = to_rcar_plane_state(old_drm_plane_state); + new_plane_state = to_rcar_plane_state(new_drm_plane_state); dev_dbg(rcdu->dev, "%s: checking plane (%u,%tu)\n", __func__, plane->group->index, plane - plane->group->planes); @@ -159,19 +157,19 @@ int rcar_du_atomic_check_planes(struct drm_device *dev, * the full reallocation procedure. Just mark the hardware * plane(s) as freed. */ - if (!plane_state->format) { + if (!new_plane_state->format) { dev_dbg(rcdu->dev, "%s: plane is being disabled\n", __func__); index = plane - plane->group->planes; group_freed_planes[plane->group->index] |= 1 << index; - plane_state->hwindex = -1; + new_plane_state->hwindex = -1; continue; } /* If the plane needs to be reallocated mark it as such, and * mark the hardware plane(s) as free. */ - if (rcar_du_plane_needs_realloc(plane, plane_state)) { + if (rcar_du_plane_needs_realloc(plane, old_plane_state, new_plane_state)) { dev_dbg(rcdu->dev, "%s: plane needs reallocation\n", __func__); groups |= 1 << plane->group->index; @@ -179,7 +177,7 @@ int rcar_du_atomic_check_planes(struct drm_device *dev, index = plane - plane->group->planes; group_freed_planes[plane->group->index] |= 1 << index; - plane_state->hwindex = -1; + new_plane_state->hwindex = -1; } } @@ -226,16 +224,16 @@ int rcar_du_atomic_check_planes(struct drm_device *dev, continue; } - plane_state = to_rcar_plane_state(plane->plane.state); + new_plane_state = to_rcar_plane_state(plane->plane.state); used_planes |= rcar_du_plane_hwmask(plane_state); dev_dbg(rcdu->dev, "%s: plane (%u,%tu) uses %u hwplanes (index %d)\n", __func__, plane->group->index, plane - plane->group->planes, - plane_state->format ? - plane_state->format->planes : 0, - plane_state->hwindex); + new_plane_state->format ? + new_plane_state->format->planes : 0, + new_plane_state->hwindex); } group_free_planes[index] = 0xff & ~used_planes; @@ -246,15 +244,16 @@ int rcar_du_atomic_check_planes(struct drm_device *dev, } /* Reallocate hardware planes for each plane that needs it. */ - for_each_plane_in_state(state, drm_plane, drm_plane_state, i) { - struct rcar_du_plane_state *plane_state; + for_each_oldnew_plane_in_state(state, drm_plane, old_drm_plane_state, new_drm_plane_state, i) { + struct rcar_du_plane_state *old_plane_state, *new_plane_state; struct rcar_du_plane *plane; unsigned int crtc_planes; unsigned int free; int idx; plane = to_rcar_plane(drm_plane); - plane_state = to_rcar_plane_state(drm_plane_state); + old_plane_state = to_rcar_plane_state(old_drm_plane_state); + new_plane_state = to_rcar_plane_state(new_drm_plane_state); dev_dbg(rcdu->dev, "%s: allocating plane (%u,%tu)\n", __func__, plane->group->index, plane - plane->group->planes); @@ -263,7 +262,7 @@ int rcar_du_atomic_check_planes(struct drm_device *dev, * reallocated. */ if (!plane_state->format || - !rcar_du_plane_needs_realloc(plane, plane_state)) + !rcar_du_plane_needs_realloc(plane, old_plane_state, new_plane_state)) continue; /* Try to allocate the plane from the free planes currently @@ -279,7 +278,7 @@ int rcar_du_atomic_check_planes(struct drm_device *dev, idx = rcar_du_plane_hwalloc(plane, plane_state, free & crtc_planes); if (idx < 0) - idx = rcar_du_plane_hwalloc(plane, plane_state, + idx = rcar_du_plane_hwalloc(plane, new_plane_state, free); if (idx < 0) { dev_dbg(rcdu->dev, "%s: no available hardware plane\n",
for_each_obj_in_state is about to be removed, so use the correct new iterator macros. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Cc: linux-renesas-soc@vger.kernel.org --- drivers/gpu/drm/rcar-du/rcar_du_plane.c | 41 ++++++++++++++++----------------- 1 file changed, 20 insertions(+), 21 deletions(-)