Attachment 99951 Details for Bug 79317 – avoid assert() crash by dynamically adjusting image chunk size

avoid assert() crash by dynamically adjusting image chunk size

qxl_image_create_bigger_chunks.patch (text/plain), 1.16 KB, created by David Mansfield on 2014-05-27 14:33:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Mansfield

Created: 2014-05-27 14:33:44 UTC

Size: 1.16 KB

patch

obsolete

>diff -r -u xf86-video-qxl-0.1.1.orig/src/qxl_image.c xf86-video-qxl-0.1.1/src/qxl_image.c
>--- xf86-video-qxl-0.1.1.orig/src/qxl_image.c	2013-10-20 10:53:29.000000000 -0400
>+++ xf86-video-qxl-0.1.1/src/qxl_image.c	2014-05-14 09:10:43.435444196 -0400
>@@ -140,6 +140,7 @@
> 	struct qxl_bo *image_bo;
> 	int dest_stride = (width * Bpp + 3) & (~3);
> 	int h;
>+	int chunk_size;
> 
> 	data += y * stride + x * Bpp;
> 
>@@ -155,9 +156,23 @@
> 
> 	hash = 0;
> 	h = height;
>+
>+	chunk_size = MAX (512 * 512, dest_stride);
>+
>+	/* ensure we will not create too many pieces and overflow
>+	 * the command buffer (MAX_RELOCS).  if so, increase the chunk_size.
>+	 * each loop creates at least 2 cmd buffer entries, and 
>+	 * we have to leave room when we're done.
>+	 */
>+	if (height / (chunk_size / dest_stride) > (MAX_RELOCS / 4)) {
>+		chunk_size = height / (MAX_RELOCS/4) * dest_stride;
>+#if 1
>+		ErrorF ("adjusted chunk_size to %d\n", chunk_size);
>+#endif
>+	}
>+
> 	while (h)
> 	{
>-	    int chunk_size = MAX (512 * 512, dest_stride);
> 	    int n_lines = MIN ((chunk_size / dest_stride), h);
> 	    struct qxl_bo *bo = qxl->bo_funcs->bo_alloc (qxl, sizeof (QXLDataChunk) + n_lines * dest_stride, "image data");
>

Actions: View

Attachments on bug 79317: 99951

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.