From: Philipp Zabel <p.zabel@pengutronix.de>
To: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org
Subject: Re: [PATCH 12/16] drm/imx: Use atomic iterator macros
Date: Wed, 12 Jul 2017 12:00:38 +0200 [thread overview]
Message-ID: <1499853638.6374.15.camel@pengutronix.de> (raw)
In-Reply-To: <20170712081344.25495-13-maarten.lankhorst@linux.intel.com>
On Wed, 2017-07-12 at 10:13 +0200, Maarten Lankhorst wrote:
> for_each_obj_in_state is about to be removed, so use the new atomic
> iterator macros.
>
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> Cc: Philipp Zabel <p.zabel@pengutronix.de>
> ---
> drivers/gpu/drm/imx/imx-drm-core.c | 8 ++++----
> drivers/gpu/drm/imx/ipuv3-plane.c | 2 +-
> 2 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/imx/imx-drm-core.c b/drivers/gpu/drm/imx/imx-drm-core.c
> index 95e2181963d9..f5c621219113 100644
> --- a/drivers/gpu/drm/imx/imx-drm-core.c
> +++ b/drivers/gpu/drm/imx/imx-drm-core.c
> @@ -115,7 +115,7 @@ static void imx_drm_atomic_commit_tail(struct drm_atomic_state *state)
> {
> struct drm_device *dev = state->dev;
> struct drm_plane *plane;
> - struct drm_plane_state *old_plane_state;
> + struct drm_plane_state *old_plane_state, *new_plane_state;
> bool plane_disabling = false;
> int i;
>
> @@ -127,15 +127,15 @@ static void imx_drm_atomic_commit_tail(struct drm_atomic_state *state)
>
> drm_atomic_helper_commit_modeset_enables(dev, state);
>
> - for_each_plane_in_state(state, plane, old_plane_state, i) {
> - if (drm_atomic_plane_disabling(old_plane_state, plane->state))
> + for_each_oldnew_plane_in_state(state, plane, old_plane_state, new_plane_state, i) {
> + if (drm_atomic_plane_disabling(old_plane_state, new_plane_state))
> plane_disabling = true;
> }
>
> if (plane_disabling) {
> drm_atomic_helper_wait_for_vblanks(dev, state);
>
> - for_each_plane_in_state(state, plane, old_plane_state, i)
> + for_each_old_plane_in_state(state, plane, old_plane_state, i)
> ipu_plane_disable_deferred(plane);
>
> }
> diff --git a/drivers/gpu/drm/imx/ipuv3-plane.c b/drivers/gpu/drm/imx/ipuv3-plane.c
> index 49546222c6d3..ff53c8dec633 100644
> --- a/drivers/gpu/drm/imx/ipuv3-plane.c
> +++ b/drivers/gpu/drm/imx/ipuv3-plane.c
> @@ -675,7 +675,7 @@ int ipu_planes_assign_pre(struct drm_device *dev,
> int available_pres = ipu_prg_max_active_channels();
> int i;
>
> - for_each_plane_in_state(state, plane, plane_state, i) {
> + for_each_new_plane_in_state(state, plane, plane_state, i) {
> struct ipu_plane_state *ipu_state =
> to_ipu_plane_state(plane_state);
> struct ipu_plane *ipu_plane = to_ipu_plane(plane);
Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>
Tested-by: Philipp Zabel <p.zabel@pengutronix.de>
regards
Philipp
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2017-07-12 10:00 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-12 8:13 [PATCH 00/16] drm/atomic: Remove deprecated atomic iterator macros Maarten Lankhorst
2017-07-12 8:13 ` [PATCH 01/16] drm/simple-kms-helper: Fix the check for the mismatch between plane and CRTC enabled Maarten Lankhorst
2017-07-12 9:01 ` Daniel Vetter
2017-07-12 8:13 ` [PATCH 02/16] drm/atomic: Use the correct iterator macro in atomic_remove_fb Maarten Lankhorst
2017-07-12 9:01 ` Daniel Vetter
2017-07-12 8:13 ` [PATCH 03/16] drm/atomic: Use the new helpers in drm_atomic_helper_disable_all() Maarten Lankhorst
2017-07-12 9:03 ` Daniel Vetter
2017-07-12 8:13 ` [PATCH 04/16] drm/atomic: Use new iterator macros in drm_atomic_helper_wait_for_flip_done Maarten Lankhorst
2017-07-12 9:07 ` [Intel-gfx] " Daniel Vetter
2017-07-12 8:13 ` [PATCH 05/16] drm/vmwgfx: Make check_modeset() use the new atomic iterator macros Maarten Lankhorst
2017-07-12 8:33 ` Sinclair Yeh
2017-07-12 9:09 ` [Intel-gfx] " Daniel Vetter
2017-07-12 9:11 ` Sinclair Yeh
2017-07-12 8:13 ` [PATCH 06/16] drm/i915: Use correct iterator macro Maarten Lankhorst
2017-07-12 9:10 ` Daniel Vetter
2017-07-12 8:13 ` [PATCH 07/16] drm/rcar-du: Use new iterator macros Maarten Lankhorst
2017-07-12 9:15 ` Daniel Vetter
2017-07-12 10:43 ` [PATCH v2 07/16] drm/rcar-du: Use new iterator macros, v2 Maarten Lankhorst
2017-07-12 8:13 ` [PATCH 08/16] drm/atmel-hlcdec: Use for_each_new_connector_in_state Maarten Lankhorst
2017-07-12 9:17 ` Daniel Vetter
2017-07-12 9:22 ` Boris Brezillon
2017-07-12 8:13 ` [PATCH 09/16] drm/rockchip: Use for_each_oldnew_plane_in_state in vop_crtc_atomic_flush Maarten Lankhorst
2017-07-12 9:21 ` Daniel Vetter
2017-07-12 9:41 ` Mark yao
2017-07-12 8:13 ` [PATCH 10/16] drm/omapdrm: Fix omap_atomic_wait_for_completion Maarten Lankhorst
2017-07-12 9:23 ` Daniel Vetter
2017-07-12 8:13 ` [PATCH 11/16] drm/mali: Use new atomic iterator macros Maarten Lankhorst
2017-07-12 9:25 ` [Intel-gfx] " Daniel Vetter
2017-07-12 9:44 ` Liviu Dudau
2017-07-12 10:00 ` Maarten Lankhorst
2017-07-12 10:06 ` Liviu Dudau
2017-07-12 8:13 ` [PATCH 12/16] drm/imx: Use " Maarten Lankhorst
2017-07-12 9:26 ` Daniel Vetter
2017-07-12 10:00 ` Philipp Zabel [this message]
2017-07-12 8:13 ` [PATCH 13/16] drm/mediatek: Convert to new " Maarten Lankhorst
2017-07-12 9:45 ` Daniel Vetter
2017-07-13 16:00 ` Maarten Lankhorst
2017-07-12 10:01 ` Philipp Zabel
[not found] ` <20170712081344.25495-1-maarten.lankhorst-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2017-07-12 8:13 ` [PATCH 14/16] drm/msm: Convert to use " Maarten Lankhorst
2017-07-12 9:48 ` [Intel-gfx] " Daniel Vetter
[not found] ` <20170712094823.2akjrev3v7ckxb7b-dv86pmgwkMBes7Z6vYuT8azUEOm+Xw19@public.gmane.org>
2017-07-12 10:45 ` [PATCH 14/16] drm/msm: Convert to use new iterator macros, v2 Maarten Lankhorst
[not found] ` <de5e7892-71a0-d160-6619-e8267d793897-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2017-07-19 9:25 ` Archit Taneja
2017-07-12 8:13 ` [PATCH 15/16] drm/nouveau: Convert nouveau to use new iterator macros Maarten Lankhorst
2017-07-13 12:33 ` [Intel-gfx] " Daniel Vetter
2017-07-13 13:51 ` Maarten Lankhorst
2017-07-12 8:13 ` [PATCH 16/16] drm/atomic: Remove deprecated accessor macros Maarten Lankhorst
2017-07-12 9:50 ` Daniel Vetter
2017-07-12 11:48 ` Maarten Lankhorst
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1499853638.6374.15.camel@pengutronix.de \
--to=p.zabel@pengutronix.de \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=maarten.lankhorst@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox