Attachment 709 Details for Bug 1084 – first patch isn't correct - this one is better..

[patch] first patch isn't correct - this one is better..

i810_diff (text/plain), 1.14 KB, created by Dave Airlie on 2004-08-22 21:57:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dave Airlie

Created: 2004-08-22 21:57:32 UTC

Size: 1.14 KB

patch

obsolete

>Index: i810_driver.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c,v
>retrieving revision 1.8
>diff -u -r1.8 i810_driver.c
>--- i810_driver.c	30 Jul 2004 21:36:40 -0000	1.8
>+++ i810_driver.c	23 Aug 2004 04:56:12 -0000
>@@ -274,6 +274,7 @@
>    "drmAgpRelease",
>    "drmAgpUnbind",
>    "drmAuthMagic",
>+   "drmCommandNone",
>    "drmCommandWrite",
>    "drmCreateContext",
>    "drmCtlInstHandler",
>@@ -1123,6 +1124,14 @@
>    xf86SetOperatingState(resVgaIo, pI810->pEnt->index, ResUnusedOpr);
>    xf86SetOperatingState(resVgaMem, pI810->pEnt->index, ResDisableOpr);
> 
>+   pI810->LpRing = xalloc(sizeof(I810RingBuffer));
>+   if (!pI810->LpRing) {
>+     xf86DrvMsg(pScrn->scrnIndex, X_ERROR, 
>+		"Could not allocate lpring data structure.\n");
>+     I810FreeRec(pScrn);
>+     return FALSE;
>+   }
>+   
>    return TRUE;
> }
> 
>@@ -2495,6 +2504,9 @@
>     */
>    xf86GARTCloseScreen(scrnIndex);
> 
>+   xfree(pI810->LpRing);
>+   pI810->LpRing = NULL;
>+
>    pScrn->vtSema = FALSE;
>    pScreen->CloseScreen = pI810->CloseScreen;
>    return (*pScreen->CloseScreen) (scrnIndex, pScreen);

Actions: View | Splinter Review

Attachments on bug 1084: 655 | 684 | 708 | 709 | 818

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.