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: [Intel-gfx] [PATCH 2/6] drm/atomic: Only destroy connector states with connection mutex held
Date: Wed, 19 Nov 2014 15:22:38 -0500 [thread overview]
Message-ID: <CAF6AEGt4d-t2-Ab9XD=x05OrgEUGjdRgmX1AnVfdrR9KUSsUCQ@mail.gmail.com> (raw)
In-Reply-To: <1416418691-24747-2-git-send-email-daniel.vetter@ffwll.ch>
On Wed, Nov 19, 2014 at 12:38 PM, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
> Otherwise the connector might have been unplugged and destroyed while
> we didn't look. Yet another fallout from DP MST hotplugging that I
> didn't consider.
>
> To make sure we get this right add an appropriate WARN_ON to
> drm_atomic_state_clear (obviously only when we actually have a state
> to clear up). And reorder all the state_clear and backoff calls to
> make it work out properly.
>
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Reviewed-by: Rob Clark <robdclark@gmail.com>
> ---
> drivers/gpu/drm/drm_atomic.c | 9 ++++++---
> drivers/gpu/drm/drm_atomic_helper.c | 14 +++++++-------
> 2 files changed, 13 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c
> index 90b2d1644bd7..67c1dc894bd9 100644
> --- a/drivers/gpu/drm/drm_atomic.c
> +++ b/drivers/gpu/drm/drm_atomic.c
> @@ -112,21 +112,24 @@ EXPORT_SYMBOL(drm_atomic_state_alloc);
> void drm_atomic_state_clear(struct drm_atomic_state *state)
> {
> struct drm_device *dev = state->dev;
> + struct drm_mode_config *config = &dev->mode_config;
> int i;
>
> DRM_DEBUG_KMS("Clearing atomic state %p\n", state);
>
> - for (i = 0; i < dev->mode_config.num_connector; i++) {
> + for (i = 0; i < config->num_connector; i++) {
> struct drm_connector *connector = state->connectors[i];
>
> if (!connector)
> continue;
>
> + WARN_ON(!drm_modeset_is_locked(&config->connection_mutex));
> +
> connector->funcs->atomic_destroy_state(connector,
> state->connector_states[i]);
> }
>
> - for (i = 0; i < dev->mode_config.num_crtc; i++) {
> + for (i = 0; i < config->num_crtc; i++) {
> struct drm_crtc *crtc = state->crtcs[i];
>
> if (!crtc)
> @@ -136,7 +139,7 @@ void drm_atomic_state_clear(struct drm_atomic_state *state)
> state->crtc_states[i]);
> }
>
> - for (i = 0; i < dev->mode_config.num_total_plane; i++) {
> + for (i = 0; i < config->num_total_plane; i++) {
> struct drm_plane *plane = state->planes[i];
>
> if (!plane)
> diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
> index fad2b932cf72..0cd054615920 100644
> --- a/drivers/gpu/drm/drm_atomic_helper.c
> +++ b/drivers/gpu/drm/drm_atomic_helper.c
> @@ -1217,8 +1217,8 @@ fail:
>
> return ret;
> backoff:
> - drm_atomic_legacy_backoff(state);
> drm_atomic_state_clear(state);
> + drm_atomic_legacy_backoff(state);
>
> /*
> * Someone might have exchanged the framebuffer while we dropped locks
> @@ -1285,8 +1285,8 @@ fail:
>
> return ret;
> backoff:
> - drm_atomic_legacy_backoff(state);
> drm_atomic_state_clear(state);
> + drm_atomic_legacy_backoff(state);
>
> /*
> * Someone might have exchanged the framebuffer while we dropped locks
> @@ -1462,8 +1462,8 @@ fail:
>
> return ret;
> backoff:
> - drm_atomic_legacy_backoff(state);
> drm_atomic_state_clear(state);
> + drm_atomic_legacy_backoff(state);
>
> /*
> * Someone might have exchanged the framebuffer while we dropped locks
> @@ -1528,8 +1528,8 @@ fail:
>
> return ret;
> backoff:
> - drm_atomic_legacy_backoff(state);
> drm_atomic_state_clear(state);
> + drm_atomic_legacy_backoff(state);
>
> goto retry;
> }
> @@ -1587,8 +1587,8 @@ fail:
>
> return ret;
> backoff:
> - drm_atomic_legacy_backoff(state);
> drm_atomic_state_clear(state);
> + drm_atomic_legacy_backoff(state);
>
> goto retry;
> }
> @@ -1646,8 +1646,8 @@ fail:
>
> return ret;
> backoff:
> - drm_atomic_legacy_backoff(state);
> drm_atomic_state_clear(state);
> + drm_atomic_legacy_backoff(state);
>
> goto retry;
> }
> @@ -1725,8 +1725,8 @@ fail:
>
> return ret;
> backoff:
> - drm_atomic_legacy_backoff(state);
> drm_atomic_state_clear(state);
> + drm_atomic_legacy_backoff(state);
>
> /*
> * Someone might have exchanged the framebuffer while we dropped locks
> --
> 2.1.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
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:22 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 ` Rob Clark [this message]
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
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='CAF6AEGt4d-t2-Ab9XD=x05OrgEUGjdRgmX1AnVfdrR9KUSsUCQ@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).