[Intel-gfx] [PATCH 01/13] i830_memory: rip out field "end"
Daniel Vetter
daniel.vetter at ffwll.ch
Tue Mar 2 09:22:32 CET 2010
It's a left-over from the non-gem era and no longer used at all.
Signed-off-by: Daniel Vetter <daniel.vetter at ffwll.ch>
---
src/i830.h | 4 +---
src/i830_memory.c | 7 ++-----
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/src/i830.h b/src/i830.h
index 753eeb7..9c0c1de 100644
--- a/src/i830.h
+++ b/src/i830.h
@@ -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 289c5f0..e3d7819 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,
--
1.6.6.1
More information about the Intel-gfx
mailing list