diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2010-03-02 09:22:34 +0100 |
|---|---|---|
| committer | Carl Worth <cworth@cworth.org> | 2010-03-04 09:38:37 -0800 |
| commit | ff8a1e1cf728eeae848f6284bb4272193dfa918b (patch) | |
| tree | b1f9361ce4fe76c79f9d407a097aa706234671d5 /src/i830_memory.c | |
| parent | e18ffceb142a9e18968900dd526a2d50fab72900 (diff) | |
i830_memory: rip out field "offset"
Use the one in the drm bo instead.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'src/i830_memory.c')
| -rw-r--r-- | src/i830_memory.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/i830_memory.c b/src/i830_memory.c index e3d78198..f1804f41 100644 --- a/src/i830_memory.c +++ b/src/i830_memory.c @@ -262,10 +262,8 @@ Bool i830_allocator_init(ScrnInfoPtr scrn, unsigned long size) return FALSE; } - start->offset = 0; start->size = 0; start->next = end; - end->offset = size; end->size = 0; end->prev = start; @@ -353,8 +351,6 @@ i830_memory *i830_allocate_memory(ScrnInfoPtr scrn, const char *name, return NULL; } - /* Give buffer obviously wrong offset/end until it's pinned. */ - mem->offset = -1; mem->size = size; mem->pitch = pitch; @@ -411,7 +407,7 @@ i830_describe_allocations(ScrnInfoPtr scrn, int verbosity, const char *prefix) xf86DrvMsgVerb(scrn->scrnIndex, X_INFO, verbosity, "%s0x%08lx: %s (%ld kB%s)%s\n", prefix, - mem->offset, mem->name, + mem->bo->offset, mem->name, mem->size / 1024, phys_suffix, tile_suffix); } xf86DrvMsgVerb(scrn->scrnIndex, X_INFO, verbosity, @@ -586,7 +582,7 @@ Bool i830_bind_all_memory(ScrnInfoPtr scrn) i830_set_gem_max_sizes(scrn); if (intel->front_buffer) - scrn->fbOffset = intel->front_buffer->offset; + scrn->fbOffset = intel->front_buffer->bo->offset; return TRUE; } @@ -615,8 +611,6 @@ Bool i830_allocate_xvmc_buffer(ScrnInfoPtr scrn, const char *name, "Failed to bind XvMC buffer bo!\n"); return FALSE; } - - (*buffer)->offset = (*buffer)->bo->offset; } return TRUE; |