summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Hellstrom <thomas-at-tungstengraphics.com>2008-06-30 18:59:13 +0100
committerAlan Hourihane <alanh@tungstengraphics.com>2008-06-30 18:59:13 +0100
commitcf8153b86e2a134bc773eca4348aa22795cbedac (patch)
tree2a8dde5e19f648346b01219c7a78640075b2ac9d
parentbb83cfb5d1bccce94aa048c507695b78821604cc (diff)
Avoid an EXA init segfault.
Don't allocate each VRAM buffer with a 16MB alignment.
-rw-r--r--src/exa.c6
1 files changed, 3 insertions, 3 deletions
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)