Bug #1944 (https://bugs.freedesktop.org/show_bug.cgi?id=1944)XORG-6_8_1_901

attachment #1403 (https://bugs.freedesktop.org/attachment.cgi?id=1403):
Various I8xx driver fixes, including:
- Fixed server crash on reset when a structure allocated in
  PreInit() was freed on CloseScreen().
- Fixed ring buffer lock ups that happened because the structure
  that contained ringbuffer data was not zeroed after allocation.
- Fixed numerous warnings due to signed unsigned comparisons.

1 files changed, 4 insertions, 3 deletions

diff --git a/src/i810.h b/src/i810.h
index 58345abc..18fefb67 100644
--- a/src/i810.h
+++ b/src/i810.h
@@ -172,7 +172,7 @@ typedef struct _I810Rec {
    unsigned long OverlayPhysical;
    unsigned long OverlayStart;
    int colorKey;
-   int surfaceAllocation[I810_TOTAL_SURFACES];
+   unsigned int surfaceAllocation[I810_TOTAL_SURFACES];
    int numSurfaces;
 
    DGAModePtr DGAModes;
@@ -295,9 +295,10 @@ extern int I810WaitLpRing(ScrnInfoPtr pScrn, int n, int timeout_millis);
 extern void I810Sync(ScrnInfoPtr pScrn);
 extern unsigned long I810LocalToPhysical(ScrnInfoPtr pScrn,
 					 unsigned long local);
-extern int I810AllocLow(I810MemRange * result, I810MemRange * pool, int size);
+extern int I810AllocLow(I810MemRange * result, I810MemRange * pool, 
+			int size);
 extern int I810AllocHigh(I810MemRange * result, I810MemRange * pool,
-			 int size);
+			int size);
 extern Bool I810AllocateFront(ScrnInfoPtr pScrn);
 
 extern int I810AllocateGARTMemory(ScrnInfoPtr pScrn);