diff options
| author | Keith Packard <keithp@keithp.com> | 2008-12-15 15:19:00 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2009-01-06 09:31:38 -0800 |
| commit | 21bd4e8974e4c0e83f5f95adb0fc17290444caf5 (patch) | |
| tree | 711b626be422296978d70f783cd857f88816ad83 /src/i965_hwmc.c | |
| parent | 1f61e97904dfe5f8c08bb9f284cfdfe878f7e541 (diff) | |
Make i830_allocate_memory take tiling parameters.
This eliminates the separate i830_allocate_memory_tiled function which means
that all memory objects will have tiling parameters set correctly.
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'src/i965_hwmc.c')
| -rw-r--r-- | src/i965_hwmc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/i965_hwmc.c b/src/i965_hwmc.c index 1c293d16..99e86f54 100644 --- a/src/i965_hwmc.c +++ b/src/i965_hwmc.c @@ -49,7 +49,7 @@ static int alloc_drm_memory_tiled(ScrnInfoPtr pScrn, char *name, size_t size, unsigned long pitch, unsigned long alignment) { I830Ptr pI830 = I830PTR(pScrn); - if ((mem->buffer = i830_allocate_memory_tiled(pScrn, + if ((mem->buffer = i830_allocate_memory(pScrn, name, size, pitch, GTT_PAGE_SIZE, ALIGN_BOTH_ENDS, TILE_XMAJOR)) == NULL) { ErrorF("Fail to alloc \n"); @@ -75,8 +75,8 @@ static int alloc_drm_memory(ScrnInfoPtr pScrn, { I830Ptr pI830 = I830PTR(pScrn); if ((mem->buffer = i830_allocate_memory(pScrn, - name, size, - GTT_PAGE_SIZE, ALIGN_BOTH_ENDS)) == NULL) { + name, size, PITCH_NONE, GTT_PAGE_SIZE, + ALIGN_BOTH_ENDS, TILE_NONE)) == NULL) { ErrorF("Fail to alloc \n"); return BadAlloc; } |