Attachment 4836 Details for Bug 6151 – Relax xf86AllocateOffscreenLinear() granularity restriction #2

[patch] Relax xf86AllocateOffscreenLinear() granularity restriction #2

fbman-alloc-linear.diff (text/plain), 999 bytes, created by Benjamin Herrenschmidt on 2006-03-06 16:20:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Benjamin Herrenschmidt

Created: 2006-03-06 16:20:16 UTC

Size: 999 bytes

patch

obsolete

>--- xf86fbman.orig.c	2006-03-06 15:59:44.000000000 +1100
>+++ xf86fbman.c	2006-03-06 16:14:21.000000000 +1100
>@@ -936,11 +936,17 @@
>    extents = REGION_EXTENTS(pScreen, offman->InitialBoxes);
>    pitch = extents->x2 - extents->x1;
> 
>-   if(gran && ((gran > pitch) || (pitch % gran))) {
>+   if (gran && gran > pitch) {
> 	/* we can't match the specified alignment with XY allocations */
> 	xfree(link);
> 	return NULL;
>    }
>+   if (gran && (pitch % gran)) {
>+       /* pitch and granularity aren't a perfect match, let's allocate
>+	* a bit more so we can align later on
>+	*/
>+       length += gran - 1;
>+   }
> 
>    if(length < pitch) { /* special case */
> 	w = length;
>@@ -963,6 +969,8 @@
> 	linear->pScreen = pScreen;
> 	linear->size = h * w;
> 	linear->offset = (pitch * area->box.y1) + area->box.x1;
>+	if (gran && linear->offset % gran)
>+		linear->offset += gran - (linear->offset % gran);
> 	linear->granularity = gran;
> 	linear->MoveLinearCallback = moveCB;
> 	linear->RemoveLinearCallback = removeCB;

Actions: View | Splinter Review

Attachments on bug 6151: 4830 | 4833 | 4835 | 4836

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.