Attachment 122727 Details for Bug 94829 – Prevent reporting an incomplete event

[patch] Prevent reporting an incomplete event

0001-sna-present-Prevent-reporting-an-incomplete-event.patch (text/plain), 2.88 KB, created by Chris Wilson on 2016-04-05 17:06:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Wilson

Created: 2016-04-05 17:06:09 UTC

Size: 2.88 KB

patch

obsolete

>From dc09e36d59576ccad3622cd1f6faada5d931d72c Mon Sep 17 00:00:00 2001
>From: Chris Wilson <chris@chris-wilson.co.uk>
>Date: Tue, 5 Apr 2016 17:53:55 +0100
>Subject: [PATCH] sna/present: Prevent reporting an incomplete event
>
>If we cancel a flip, we may try to restore the current mode and this may
>flush the partial flip (in a multi-monitor setup). We report the completed
>event back to present and free the event info. Then we report the error
>back to present, and free the event info a second time. Chaos and
>corruption ensues.
>
>Reported-by: Christoph Haag <haagch@frickel.club>
>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94829
>Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
>---
> src/sna/sna_present.c | 14 ++++++++++++++
> 1 file changed, 14 insertions(+)
>
>diff --git a/src/sna/sna_present.c b/src/sna/sna_present.c
>index e08afe5..727fa87 100644
>--- a/src/sna/sna_present.c
>+++ b/src/sna/sna_present.c
>@@ -45,6 +45,7 @@ struct sna_present_event {
> 	uint64_t *event_id;
> 	uint64_t target_msc;
> 	int n_event_id;
>+	bool queued;
> };
> 
> static void sna_present_unflip(ScreenPtr screen, uint64_t event_id);
>@@ -260,6 +261,7 @@ static bool sna_present_queue(struct sna_present_event *info,
> 		if (!sna_fake_vblank(info))
> 			return false;
> 	} else {
>+		info->queued = true;
> 		if (info->target_msc - last_msc == 1) {
> 			sna_crtc_set_vblank(info->crtc);
> 			info->crtc = mark_crtc(info->crtc);
>@@ -334,6 +336,11 @@ sna_present_vblank_handler(struct drm_event_vblank *event)
> 	struct sna_present_event *info = to_present_event(event->user_data);
> 	xf86CrtcPtr crtc = info->crtc;
> 
>+	if (!info->queued) {
>+		DBG(("%s: arrived unexpectedly early (not queued)\n", __FUNCTION__));
>+		return;
>+	}
>+
> 	vblank_complete(info,
> 			ust64(event->tv_sec, event->tv_usec),
> 			sna_crtc_record_event(unmask_crtc(crtc), event));
>@@ -406,6 +413,7 @@ sna_present_queue_vblank(RRCrtcPtr crtc, uint64_t event_id, uint64_t msc)
> 	info->event_id[0] = event_id;
> 	info->n_event_id = 1;
> 	list_add_tail(&info->link, &tmp->link);
>+	info->queued = false;
> 
> 	if (!sna_present_queue(info, swap->msc)) {
> 		list_del(&info->link);
>@@ -569,6 +577,10 @@ present_flip_handler(struct drm_event_vblank *event, void *data)
> 
> 	DBG(("%s(sequence=%d): event=%lld\n", __FUNCTION__, event->sequence, (long long)info->event_id[0]));
> 	assert(info->n_event_id == 1);
>+	if (!info->queued) {
>+		DBG(("%s: arrived unexpectedly early (not queued)\n", __FUNCTION__));
>+		return;
>+	}
> 
> 	if (info->crtc == NULL) {
> 		swap.tv_sec = event->tv_sec;
>@@ -621,6 +633,7 @@ flip(struct sna *sna,
> 	info->event_id[0] = event_id;
> 	info->n_event_id = 1;
> 	info->target_msc = target_msc;
>+	info->queued = false;
> 
> 	if (!sna_page_flip(sna, bo, present_flip_handler, info)) {
> 		DBG(("%s: pageflip failed\n", __FUNCTION__));
>@@ -628,6 +641,7 @@ flip(struct sna *sna,
> 		return FALSE;
> 	}
> 
>+	info->queued = true;
> 	if (info->crtc)
> 		sna_crtc_set_vblank(info->crtc);
> 	return TRUE;
>-- 
>1.9.1
>

Actions: View | Splinter Review

Attachments on bug 94829: 122718 | 122719 | 122720 | 122723 | 122724 | 122725 | 122726 | 122727 | 122728 | 122729 | 122730 | 122731 | 122739 | 122742 | 122749 | 122752 | 122780

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.