From 603f48e31b021c4dc0bbf7b5efbb2e68aeb421d5 Mon Sep 17 00:00:00 2001 From: Jesse Barnes Date: Tue, 12 Aug 2008 18:04:08 -0700 Subject: [PATCH] Don't set tiling (yet) if kernel mode setting is active --- src/i830_memory.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/i830_memory.c b/src/i830_memory.c index fe709081..d14d86f7 100644 --- a/src/i830_memory.c +++ b/src/i830_memory.c @@ -193,7 +193,7 @@ i830_bind_memory(ScrnInfoPtr pScrn, i830_memory *mem) mem->bound = TRUE; } - if (mem->tiling != TILE_NONE && pI830->use_drm_mode) { + if (mem->tiling != TILE_NONE && !pI830->use_drm_mode) { mem->fence_nr = i830_set_tiling(pScrn, mem->offset, mem->pitch, mem->allocated_size, mem->tiling); } @@ -741,8 +741,6 @@ i830_allocate_memory_bo(ScrnInfoPtr pScrn, const char *name, mem->bo = dri_bo_alloc (pI830->bufmgr, name, size, align); - ErrorF("alloc'd bo for %s\n", name); - if (!mem->bo) { xfree(mem->name); xfree(mem);