diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2010-03-02 09:22:32 +0100 |
|---|---|---|
| committer | Carl Worth <cworth@cworth.org> | 2010-03-04 09:38:37 -0800 |
| commit | e18ffceb142a9e18968900dd526a2d50fab72900 (patch) | |
| tree | 70f8346c6ca0c243a8f630422913876d1a48c0fc | |
| parent | 5018fd3097d77a5f31af4cb27e39daa37557b64e (diff) | |
i830_memory: rip out field "end"
It's a left-over from the non-gem era and no longer used at all.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Eric Anholt <eric@anholt.net>
| -rw-r--r-- | src/i830.h | 4 | ||||
| -rw-r--r-- | src/i830_memory.c | 7 |
2 files changed, 3 insertions, 8 deletions
@@ -181,8 +181,6 @@ typedef struct _i830_memory i830_memory; struct _i830_memory { /** Offset of the allocation in card VM */ unsigned long offset; - /** End of the allocation in card VM */ - unsigned long end; /** * Requested size of the allocation: doesn't count padding. * @@ -204,7 +202,7 @@ struct _i830_memory { i830_memory *prev; /** @} */ - dri_bo *bo; + drm_intel_bo *bo; uint32_t gem_name; }; diff --git a/src/i830_memory.c b/src/i830_memory.c index 289c5f00..e3d78198 100644 --- a/src/i830_memory.c +++ b/src/i830_memory.c @@ -263,11 +263,9 @@ Bool i830_allocator_init(ScrnInfoPtr scrn, unsigned long size) } start->offset = 0; - start->end = start->offset; start->size = 0; start->next = end; end->offset = size; - end->end = end->offset; end->size = 0; end->prev = start; @@ -357,7 +355,6 @@ i830_memory *i830_allocate_memory(ScrnInfoPtr scrn, const char *name, /* Give buffer obviously wrong offset/end until it's pinned. */ mem->offset = -1; - mem->end = -1; mem->size = size; mem->pitch = pitch; @@ -413,8 +410,8 @@ i830_describe_allocations(ScrnInfoPtr scrn, int verbosity, const char *prefix) tile_suffix = " Y tiled"; xf86DrvMsgVerb(scrn->scrnIndex, X_INFO, verbosity, - "%s0x%08lx-0x%08lx: %s (%ld kB%s)%s\n", prefix, - mem->offset, mem->end - 1, mem->name, + "%s0x%08lx: %s (%ld kB%s)%s\n", prefix, + mem->offset, mem->name, mem->size / 1024, phys_suffix, tile_suffix); } xf86DrvMsgVerb(scrn->scrnIndex, X_INFO, verbosity, |