From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
To: dri-devel@lists.freedesktop.org
Cc: Gustavo Padovan <gustavo.padovan@collabora.com>,
intel-gfx@lists.freedesktop.org,
Daniel Vetter <daniel.vetter@ffwll.ch>
Subject: [PATCH 1/2] drm/atomic: Make atomic helper track newly assigned planes correctly.
Date: Mon, 16 Oct 2017 15:29:27 +0200 [thread overview]
Message-ID: <20171016132928.6498-1-maarten.lankhorst@linux.intel.com> (raw)
Commit 669c9215afea ("drm/atomic: Make async plane update checks work as
intended, v2.") forced planes to always be tracked, but forgot to
explicitly get the crtc commit from the new crtc when available.
This broke plane commit tracking, and caused kms_atomic_transitions
to randomly fail with -EBUSY.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Fixes: 669c9215afea ("drm/atomic: Make async plane update checks work as intended, v2.")
Cc: Gustavo Padovan <gustavo.padovan@collabora.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=102671
Testcase: kms_atomic_transitions
---
drivers/gpu/drm/drm_atomic_helper.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
index d59441f1dcd4..b64c8f5bc940 100644
--- a/drivers/gpu/drm/drm_atomic_helper.c
+++ b/drivers/gpu/drm/drm_atomic_helper.c
@@ -1804,7 +1804,7 @@ int drm_atomic_helper_setup_commit(struct drm_atomic_state *state,
!try_wait_for_completion(&old_plane_state->commit->flip_done))
return -EBUSY;
- commit = crtc_or_fake_commit(state, old_plane_state->crtc);
+ commit = crtc_or_fake_commit(state, old_plane_state->crtc ?: new_plane_state->crtc);
if (!commit)
return -ENOMEM;
--
2.14.1
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next reply other threads:[~2017-10-16 13:29 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-16 13:29 Maarten Lankhorst [this message]
2017-10-16 13:29 ` [PATCH 2/2] drm/atomic: Check for busy planes/connectors before setting the commit Maarten Lankhorst
2017-10-16 13:51 ` Ville Syrjälä
2017-10-16 13:42 ` [PATCH 1/2] drm/atomic: Make atomic helper track newly assigned planes correctly Ville Syrjälä
2017-10-16 13:59 ` Maarten Lankhorst
2017-10-16 14:48 ` Ville Syrjälä
2017-10-16 15:28 ` Maarten Lankhorst
2017-10-16 15:37 ` Ville Syrjälä
2017-10-17 5:20 ` [PATCH] drm/atomic: Make atomic helper track newly assigned planes correctly, v2 Maarten Lankhorst
2017-10-17 12:11 ` Daniel Vetter
2017-10-17 12:35 ` Maarten Lankhorst
2017-10-16 14:43 ` ✓ Fi.CI.BAT: success for series starting with [1/2] drm/atomic: Make atomic helper track newly assigned planes correctly Patchwork
2017-10-17 1:11 ` ✗ Fi.CI.IGT: warning " Patchwork
2017-10-17 5:42 ` ✓ Fi.CI.BAT: success for series starting with drm/atomic: Make atomic helper track newly assigned planes correctly, v2. (rev2) Patchwork
2017-10-17 18:11 ` ✓ Fi.CI.IGT: " Patchwork
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=20171016132928.6498-1-maarten.lankhorst@linux.intel.com \
--to=maarten.lankhorst@linux.intel.com \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=gustavo.padovan@collabora.com \
--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