xf86-video-modesetting: src/exa.c

[Alan Hourihane]

 src/exa.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit cf8153b86e2a134bc773eca4348aa22795cbedac
Author: Thomas Hellstrom <thomas-at-tungstengraphics.com>
Date:   Mon Jun 30 18:59:13 2008 +0100

    Avoid an EXA init segfault.
    Don't allocate each VRAM buffer with a 16MB alignment.

diff --git a/src/exa.c b/src/exa.c
index 8368114..f688472 100644
--- a/src/exa.c
+++ b/src/exa.c
@@ -168,10 +168,10 @@ exa_buffer_create(struct pipe_winsys *pws,
     ErrorF("SIZE %d %d\n", size, alignment);
     if (!buffer->bo.handle) {
 	// buffer->data = align_malloc(size, alignment);
-	drmBOCreate(exa_winsys->ms->fd, size, 4096, NULL,
+	drmBOCreate(exa_winsys->ms->fd, size, 0, NULL,
 		    DRM_BO_FLAG_READ | DRM_BO_FLAG_WRITE |
 		    DRM_BO_FLAG_SHAREABLE | DRM_BO_FLAG_MEM_TT |
-		    DRM_BO_FLAG_MAPPABLE | DRM_BO_FLAG_CACHED_MAPPED | flags,
+		    DRM_BO_FLAG_MAPPABLE | flags,
 		    0, &buffer->bo);
     }
 
@@ -767,7 +767,7 @@ ExaInit(ScrnInfoPtr pScrn)
 {
     modesettingPtr ms = modesettingPTR(pScrn);
     struct exa_entity *exa;
-    ExaDriverPtr pExa = exa->pExa;
+    ExaDriverPtr pExa;
 
     exa = xcalloc(1, sizeof(struct exa_entity));
     if (!exa)