summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2007-01-09nouveau: Fill in context_init for nv10-nv3x.Jeremy Kolb jkolb@brandeis.edu
2007-01-10nouveau: Don't use DRIVER_USE_MTRR, we already setup our own mtrr over vram.Stephane Marchesin
2007-01-09ttm: make ttm alloc/free into alloc_pages/free_pagesDave Airlie
2007-01-09novueau: try resource 3 if resource 2 is 0 lengthDave Airlie
2007-01-08nouveau: fix nv4a context size.Stephane Marchesin
2007-01-08add export symbol for memory managerDave Airlie
2007-01-07Align whitespace with masterKeith Packard
2007-01-07Merge branch 'master' into crestlineKeith Packard
2007-01-08nouveau: nv4a context support.Stephane Marchesin
2007-01-08Merge branch 'master' of git+ssh://marcheu@git.freedesktop.org/git/mesa/drmStephane Marchesin
2007-01-08i830: complete fix for i830 mapsDave Airlie
2007-01-08nouveau: oopsBen Skeggs
2007-01-08nouveau: nv43 context stuffBen Skeggs
2007-01-08drm: remove drm_follow_page, and drm_ioremap and ioremapfreeChristoph Hellwig
2007-01-08fixup i810/i830 to use drm_core_ioremap instead of drm_ioremapDave Airlie
2007-01-08nouveau: fix a stupid bug from me.Stephane Marchesin
2007-01-08nouveau: avoid allocating vram that's used as instance memory.Ben Skeggs
2007-01-08nouveau: map pci resource 2 on >=nv40Ben Skeggs
2007-01-06Revert i915 drm driver name to i915; miniglx doesn't work otherwiseKeith Packard
2007-01-06Bump i915 minor for ARB_OC ioctlWang Zhenyu
2007-01-06i915: ARB_Occlusion_query(MMIO ioctl) support.Zou Nan hai
2007-01-06nouveau: get c51 doing glxgears without the binary driver's help.Ben Skeggs
2007-01-06nouveau: Use PMC_BOOT_0 to determine which ctx_voodoo to load.Ben Skeggs
2007-01-05nouveau: oops, we don't need OS_HAS_MTRR actually.Stephane Marchesin
2007-01-05Merge branch 'master' of git+ssh://marcheu@git.freedesktop.org/git/mesa/drmStephane Marchesin
2007-01-05nouveau: Add an mtrr over the whole FBStephane Marchesin
2007-01-05Merge branch 'master' of git+ssh://matc@git.freedesktop.org/git/mesa/drm/Matthieu Castet
2007-01-05Add basic pgraph context for nv10.Matthieu Castet
2007-01-05Cleanup the nv04 fifo code a bit.Stephane Marchesin
2007-01-02i915: Fix a DRM_ERROR that should be DRM_DEBUG.Michel Dänzer
2007-01-02Make git ignore Emacs style backup files and cscope files.Michel Dänzer
2007-01-02linux-core: Make git ignore generated module symbol version files.Michel Dänzer
2007-01-02nouveau: oops, forgot to free RAMIN..Ben Skeggs
2007-01-02nouveau: Hookup nv40_graph_init.Ben Skeggs
2007-01-02nouveau: Hook up grctx code for NV4x.Ben Skeggs
2007-01-02nouveau: Add nv40-specific PGRAPH code, not hooked up yet.Ben Skeggs
2007-01-02nouveau: Only clobber PFIFO if no channels are already alloc'dBen Skeggs
2007-01-01make build against 2.6.20 hopefullyDave Airlie
2007-01-01fixup permission along line of kernelDave Airlie
2006-12-28Add some new via chipsets.Thomas Hellstrom
2006-12-27Leftover from previous commit.Thomas Hellstrom
2006-12-27Allow for non-power-of-two texture pitch alignment.Thomas Hellstrom
2006-12-27Proper allocation of AGP pages for ttms.Thomas Hellstrom
2006-12-27nouveau: return the *actual* type of memory alloc'd to userspaceBen Skeggs
2006-12-26nouveau: Alloc cmdbuf for each channel individuallyBen Skeggs
2006-12-21Bug #9120.Thomas Hellstrom
2006-12-21Improve memory manager accounting printout formatting.Thomas Hellstrom
2006-12-21Fix buggy aligned allocations.Thomas Hellstrom
2006-12-21nouveau: save/restore endianness flag on FIFO switchBen Skeggs
2006-12-20Remove the stupid root_node field from the core memory manager.Thomas Hellstrom
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-10 16:50:48 +0000
\n", (void *)heap); if (heap == 0) { drmMsg(" heap == 0\n"); } else { const struct mem_block *p; for(p = heap->next; p != heap; p = p->next) { drmMsg(" Offset:%08x, Size:%08x, %c%c\n",p->ofs,p->size, p->free ? 'F':'.', p->reserved ? 'R':'.'); } drmMsg("\nFree list:\n"); for(p = heap->next_free; p != heap; p = p->next_free) { drmMsg(" FREE Offset:%08x, Size:%08x, %c%c\n",p->ofs,p->size, p->free ? 'F':'.', p->reserved ? 'R':'.'); } } drmMsg("End of memory blocks\n"); } struct mem_block * mmInit(int ofs, int size) { struct mem_block *heap, *block; if (size <= 0) return NULL; heap = (struct mem_block *) calloc(1, sizeof(struct mem_block)); if (!heap) return NULL; block = (struct mem_block *) calloc(1, sizeof(struct mem_block)); if (!block) { free(heap); return NULL; } heap->next = block; heap->prev = block; heap->next_free = block; heap->prev_free = block; block->heap = heap; block->next = heap; block->prev = heap; block->next_free = heap; block->prev_free = heap; block->ofs = ofs; block->size = size; block->free = 1; return heap; } static struct mem_block * SliceBlock(struct mem_block *p, int startofs, int size, int reserved, int alignment) { struct mem_block *newblock; /* break left [p, newblock, p->next], then p = newblock */ if (startofs > p->ofs) { newblock = (struct mem_block*) calloc(1, sizeof(struct mem_block)); if (!newblock) return NULL; newblock->ofs = startofs; newblock->size = p->size - (startofs - p->ofs); newblock->free = 1; newblock->heap = p->heap; newblock->next = p->next; newblock->prev = p; p->next->prev = newblock; p->next = newblock; newblock->next_free = p->next_free; newblock->prev_free = p; p->next_free->prev_free = newblock; p->next_free = newblock; p->size -= newblock->size; p = newblock; } /* break right, also [p, newblock, p->next] */ if (size < p->size) { newblock = (struct mem_block*) calloc(1, sizeof(struct mem_block)); if (!newblock) return NULL; newblock->ofs = startofs + size; newblock->size = p->size - size; newblock->free = 1; newblock->heap = p->heap; newblock->next = p->next; newblock->prev = p; p->next->prev = newblock; p->next = newblock; newblock->next_free = p->next_free; newblock->prev_free = p; p->next_free->prev_free = newblock; p->next_free = newblock; p->size = size; } /* p = middle block */ p->free = 0; /* Remove p from the free list: */ p->next_free->prev_free = p->prev_free; p->prev_free->next_free = p->next_free; p->next_free = 0; p->prev_free = 0; p->reserved = reserved; return p; } struct mem_block * mmAllocMem(struct mem_block *heap, int size, int align2, int startSearch) { struct mem_block *p; const int mask = (1 << align2)-1; int startofs = 0; int endofs; if (!heap || align2 < 0 || size <= 0) return NULL; for (p = heap->next_free; p != heap; p = p->next_free) { assert(p->free); startofs = (p->ofs + mask) & ~mask; if ( startofs < startSearch ) { startofs = startSearch; } endofs = startofs+size; if (endofs <= (p->ofs+p->size)) break; } if (p == heap) return NULL; assert(p->free); p = SliceBlock(p,startofs,size,0,mask+1); return p; } struct mem_block * mmFindBlock(struct mem_block *heap, int start) { struct mem_block *p; for (p = heap->next; p != heap; p = p->next) { if (p->ofs == start) return p; } return NULL; } static int Join2Blocks(struct mem_block *p) { /* XXX there should be some assertions here */ /* NOTE: heap->free == 0 */ if (p->free && p->next->free) { struct mem_block *q = p->next; assert(p->ofs + p->size == q->ofs); p->size += q->size; p->next = q->next; q->next->prev = p; q->next_free->prev_free = q->prev_free; q->prev_free->next_free = q->next_free; free(q); return 1; } return 0; } int mmFreeMem(struct mem_block *b) { if (!b) return 0; if (b->free) { drmMsg("block already free\n"); return -1; } if (b->reserved) { drmMsg("block is reserved\n"); return -1; } b->free = 1; b->next_free = b->heap->next_free; b->prev_free = b->heap; b->next_free->prev_free = b; b->prev_free->next_free = b; Join2Blocks(b); if (b->prev != b->heap) Join2Blocks(b->prev); return 0; } void mmDestroy(struct mem_block *heap) { struct mem_block *p; if (!heap) return; for (p = heap->next; p != heap; ) { struct mem_block *next = p->next; free(p); p = next; } free(heap); }
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-10 16:50:48 +0000