Attachment 114612 Details for Bug 89681 – Flip error handling fixes v2

Flip error handling fixes v2

radeon-flip-error-handling.diff (text/plain), 2.66 KB, created by Michel Dänzer on 2015-03-25 09:14:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michel Dänzer

Created: 2015-03-25 09:14:18 UTC

Size: 2.66 KB

patch

obsolete

>diff --git a/src/drmmode_display.c b/src/drmmode_display.c
>index 86bc446..3d979a4 100644
>--- a/src/drmmode_display.c
>+++ b/src/drmmode_display.c
>@@ -1836,9 +1836,6 @@ drmmode_flip_free(drmmode_flipevtcarrier_ptr flipcarrier)
> 	if (--flipdata->flip_count > 0)
> 		return;
> 
>-	/* Release framebuffer */
>-	drmModeRmFB(flipdata->drmmode->fd, flipdata->old_fb_id);
>-
> 	free(flipdata);
> }
> 
>@@ -1872,6 +1869,9 @@ drmmode_flip_handler(ScrnInfoPtr scrn, uint32_t frame, uint64_t usec, void *even
> 		flipcarrier->handler(scrn, flipdata->fe_frame, flipdata->fe_usec,
> 				     flipdata->event_data);
> 
>+	/* Release framebuffer */
>+	drmModeRmFB(flipdata->drmmode->fd, flipdata->old_fb_id);
>+
> 	drmmode_flip_free(flipcarrier);
> }
> 
>@@ -2276,10 +2276,10 @@ Bool radeon_do_pageflip(ScrnInfoPtr scrn, ClientPtr client,
> 	unsigned int pitch;
> 	int i, old_fb_id;
> 	uint32_t tiling_flags = 0;
>-	int height, emitted = 0;
>+	int height;
> 	drmmode_flipdata_ptr flipdata;
> 	drmmode_flipevtcarrier_ptr flipcarrier = NULL;
>-	struct radeon_drm_queue_entry *drm_queue = 0;
>+	struct radeon_drm_queue_entry *drm_queue = NULL;
> 
> 	if (info->allowColorTiling) {
> 		if (info->ChipFamily >= CHIP_FAMILY_R600)
>@@ -2322,19 +2322,19 @@ Bool radeon_do_pageflip(ScrnInfoPtr scrn, ClientPtr client,
> 
>         flipdata->event_data = data;
>         flipdata->drmmode = drmmode;
>+        flipdata->old_fb_id = old_fb_id;
> 
> 	for (i = 0; i < config->num_crtc; i++) {
> 		if (!config->crtc[i]->enabled)
> 			continue;
> 
>-		flipdata->flip_count++;
> 		drmmode_crtc = config->crtc[i]->driver_private;
> 
> 		flipcarrier = calloc(1, sizeof(drmmode_flipevtcarrier_rec));
> 		if (!flipcarrier) {
> 			xf86DrvMsg(scrn->scrnIndex, X_WARNING,
> 				   "flip queue: carrier alloc failed.\n");
>-			if (emitted == 0)
>+			if (flipdata->flip_count == 0)
> 				free(flipdata);
> 			goto error_undo;
> 		}
>@@ -2362,26 +2362,26 @@ Bool radeon_do_pageflip(ScrnInfoPtr scrn, ClientPtr client,
> 				    drm_queue)) {
> 			xf86DrvMsg(scrn->scrnIndex, X_WARNING,
> 				   "flip queue failed: %s\n", strerror(errno));
>-			free(flipcarrier);
>-			if (emitted == 0)
>-				free(flipdata);
> 			goto error_undo;
> 		}
>-		emitted++;
>+		flipcarrier = NULL;
>+		drm_queue = NULL;
>+		flipdata->flip_count++;
> 	}
> 
>-	flipdata->old_fb_id = old_fb_id;
> 	return TRUE;
> 
> error_undo:
>+	if (!flipdata || flipdata->flip_count <= 1) {
>+		drmModeRmFB(drmmode->fd, drmmode->fb_id);
>+		drmmode->fb_id = old_fb_id;
>+	}
>+
> 	if (drm_queue)
> 		radeon_drm_abort_entry(drm_queue);
>-	else
>+	else if (flipcarrier)
> 		drmmode_flip_abort(scrn, flipcarrier);
> 
>-	drmModeRmFB(drmmode->fd, drmmode->fb_id);
>-	drmmode->fb_id = old_fb_id;
>-
> error_out:
> 	xf86DrvMsg(scrn->scrnIndex, X_WARNING, "Page flip failed: %s\n",
> 		   strerror(errno));

Actions: View

Attachments on bug 89681: 114555 | 114558 | 114559 | 114577 | 114612 | 114614

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.