From 9c4c323d50bd8b369e82a1dff28abdc15a219a5e Mon Sep 17 00:00:00 2001 From: Thomas Hellstrom Date: Mon, 30 Jun 2008 18:59:13 +0100 Subject: [PATCH] Avoid an EXA init segfault. Don't allocate each VRAM buffer with a 16MB alignment. --- hw/xfree86/drivers/modesetting/exa.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/xfree86/drivers/modesetting/exa.c b/hw/xfree86/drivers/modesetting/exa.c index 836811477..f688472e0 100644 --- a/hw/xfree86/drivers/modesetting/exa.c +++ b/hw/xfree86/drivers/modesetting/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)