From: Rob Clark <robdclark@gmail.com>
To: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Daniel Vetter <daniel.vetter@intel.com>,
Intel Graphics Development <intel-gfx@lists.freedesktop.org>,
DRI Development <dri-devel@lists.freedesktop.org>
Subject: Re: [PATCH 6/6] drm/atomic_helper: Make it clear that commit_planes gets the old state
Date: Wed, 19 Nov 2014 15:29:30 -0500 [thread overview]
Message-ID: <CAF6AEGuHRM9kfgobggD-iKejCmAV5H4ow7SZX30-JSUzX9zvqw@mail.gmail.com> (raw)
In-Reply-To: <1416418691-24747-6-git-send-email-daniel.vetter@ffwll.ch>
On Wed, Nov 19, 2014 at 12:38 PM, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
> Oversight from my kerneldoc cleanup when doing the original atomic
> helper series - I've only applied this clarification to the modeset
> related helpers, and not the plane update code. Remedy this asap.
>
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Reviewed-by: Rob Clark <robdclark@gmail.com>
> ---
> drivers/gpu/drm/drm_atomic_helper.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
> index 99095ef147ef..690360038dc1 100644
> --- a/drivers/gpu/drm/drm_atomic_helper.c
> +++ b/drivers/gpu/drm/drm_atomic_helper.c
> @@ -976,18 +976,18 @@ EXPORT_SYMBOL(drm_atomic_helper_prepare_planes);
> /**
> * drm_atomic_helper_commit_planes - commit plane state
> * @dev: DRM device
> - * @state: atomic state
> + * @old_state: atomic state object with old state structures
> *
> * This function commits the new plane state using the plane and atomic helper
> * functions for planes and crtcs. It assumes that the atomic state has already
> * been pushed into the relevant object state pointers, since this step can no
> * longer fail.
> *
> - * It still requires the global state object @state to know which planes and
> + * It still requires the global state object @old_state to know which planes and
> * crtcs need to be updated though.
> */
> void drm_atomic_helper_commit_planes(struct drm_device *dev,
> - struct drm_atomic_state *state)
> + struct drm_atomic_state *old_state)
> {
> int nplanes = dev->mode_config.num_total_plane;
> int ncrtcs = dev->mode_config.num_crtc;
> @@ -995,7 +995,7 @@ void drm_atomic_helper_commit_planes(struct drm_device *dev,
>
> for (i = 0; i < ncrtcs; i++) {
> struct drm_crtc_helper_funcs *funcs;
> - struct drm_crtc *crtc = state->crtcs[i];
> + struct drm_crtc *crtc = old_state->crtcs[i];
>
> if (!crtc)
> continue;
> @@ -1010,7 +1010,7 @@ void drm_atomic_helper_commit_planes(struct drm_device *dev,
>
> for (i = 0; i < nplanes; i++) {
> struct drm_plane_helper_funcs *funcs;
> - struct drm_plane *plane = state->planes[i];
> + struct drm_plane *plane = old_state->planes[i];
>
> if (!plane)
> continue;
> @@ -1025,7 +1025,7 @@ void drm_atomic_helper_commit_planes(struct drm_device *dev,
>
> for (i = 0; i < ncrtcs; i++) {
> struct drm_crtc_helper_funcs *funcs;
> - struct drm_crtc *crtc = state->crtcs[i];
> + struct drm_crtc *crtc = old_state->crtcs[i];
>
> if (!crtc)
> continue;
> --
> 2.1.1
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2014-11-19 20:29 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-19 17:38 [PATCH 1/6] drm/atomic: Ensure that drm_connector_index is stable Daniel Vetter
2014-11-19 17:38 ` [PATCH 2/6] drm/atomic: Only destroy connector states with connection mutex held Daniel Vetter
2014-11-19 20:22 ` [Intel-gfx] " Rob Clark
2014-11-19 17:38 ` [PATCH 3/6] drm/atomic: Don't overrun the connector array when hotplugging Daniel Vetter
2014-11-19 20:24 ` Rob Clark
2014-11-20 8:53 ` Thierry Reding
2014-11-19 17:38 ` [PATCH 4/6] drm/crtc: Polish kerneldoc Daniel Vetter
2014-11-19 20:28 ` Rob Clark
2014-11-19 17:38 ` [PATCH 5/6] drm: s/enum_blob_list/enum_list/ in drm_property Daniel Vetter
2014-11-19 20:25 ` Rob Clark
2014-11-19 17:38 ` [PATCH 6/6] drm/atomic_helper: Make it clear that commit_planes gets the old state Daniel Vetter
2014-11-19 20:29 ` Rob Clark [this message]
2014-11-19 20:55 ` Daniel Vetter
2014-11-19 20:21 ` [Intel-gfx] [PATCH 1/6] drm/atomic: Ensure that drm_connector_index is stable Rob Clark
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=CAF6AEGuHRM9kfgobggD-iKejCmAV5H4ow7SZX30-JSUzX9zvqw@mail.gmail.com \
--to=robdclark@gmail.com \
--cc=daniel.vetter@ffwll.ch \
--cc=daniel.vetter@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
/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;
as well as URLs for NNTP newsgroup(s).