From: Andrey Grodzovsky <Andrey.Grodzovsky@amd.com>
To: <dri-devel@lists.freedesktop.org>, <linux-kernel@vger.kernel.org>,
<intel-gfx@lists.freedesktop.org>,
<maarten.lankhorst@linux.intel.com>
Cc: <amd-gfx@lists.freedesktop.org>, <harry.wentland@amd.com>,
"Andrey Grodzovsky" <Andrey.Grodzovsky@amd.com>
Subject: [PATCH] drm/core: Fail atomic IOCTL with no CRTC state but with signaling.
Date: Fri, 9 Jun 2017 17:30:19 -0400 [thread overview]
Message-ID: <1497043819-28591-1-git-send-email-Andrey.Grodzovsky@amd.com> (raw)
Problem:
While running IGT kms_atomic_transition test suite i encountered
a hang in drmHandleEvent immidietly follwoing an atomic_commit.
After dumping the atomic state I relized that in this case there was
not even one CRTC attached to the state and only disabled
planes. This probably due to a commit which hadn't changed any property
which would require attaching crtc state. This means drmHandleEvent
will never wake up from read since without CRTC in atomic state
the event fd will not be singnaled.
This point to a bug in IGT but also DRM should gracefully
fail such scenario so no hang on user side will happen.
Fix:
Explicitly fail by failing atomic_commit early in
drm_mode_atomic_commit where such problem can be identified.
Signed-off-by: Andrey Grodzovsky <Andrey.Grodzovsky@amd.com>
---
drivers/gpu/drm/drm_atomic.c | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c
index a567310..32eae1c 100644
--- a/drivers/gpu/drm/drm_atomic.c
+++ b/drivers/gpu/drm/drm_atomic.c
@@ -1933,7 +1933,7 @@ static int prepare_crtc_signaling(struct drm_device *dev,
{
struct drm_crtc *crtc;
struct drm_crtc_state *crtc_state;
- int i, ret;
+ int i, c = 0, ret;
if (arg->flags & DRM_MODE_ATOMIC_TEST_ONLY)
return 0;
@@ -1994,8 +1994,17 @@ static int prepare_crtc_signaling(struct drm_device *dev,
crtc_state->event->base.fence = fence;
}
+
+ c++;
}
+ /*
+ * Having this flag means user mode pends on event which will never
+ * reach due to lack of at least one CRTC for signaling
+ */
+ if (c == 0 && (arg->flags & DRM_MODE_PAGE_FLIP_EVENT))
+ return -EINVAL;
+
return 0;
}
@@ -2179,6 +2188,8 @@ int drm_mode_atomic_ioctl(struct drm_device *dev,
drm_mode_object_unreference(obj);
}
+
+
ret = prepare_crtc_signaling(dev, state, arg, file_priv, &fence_state,
&num_fences);
if (ret)
--
2.7.4
next reply other threads:[~2017-06-09 21:31 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-09 21:30 Andrey Grodzovsky [this message]
2017-06-12 11:08 ` Maarten Lankhorst
2017-06-12 14:12 ` Andrey Grodzovsky
2017-06-15 20:46 ` Andrey Grodzovsky
2017-06-19 15:35 ` Harry Wentland
2017-06-19 19:24 ` Sean Paul
[not found] ` <f9bdcba7-1549-75ce-c1bf-39525cc3fb47@amd.com>
2017-06-20 9:29 ` [Intel-gfx] " Daniel Vetter
2017-06-20 17:57 ` [PATCH v2] " Andrey Grodzovsky
2017-06-26 19:44 ` Harry Wentland
2017-06-27 7:37 ` Daniel Vetter
2017-06-27 14:29 ` Maarten Lankhorst
2017-06-27 15:01 ` Daniel Vetter
2017-06-28 10:23 ` 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=1497043819-28591-1-git-send-email-Andrey.Grodzovsky@amd.com \
--to=andrey.grodzovsky@amd.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=harry.wentland@amd.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.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
all inboxes | Powered by JetHome®