summaryrefslogtreecommitdiff
path: root/src/gallium/winsys
diff options
context:
space:
mode:
authorJerome Glisse <jglisse@redhat.com>2010-10-06 09:40:27 -0400
committerJerome Glisse <jglisse@redhat.com>2010-10-06 09:41:19 -0400
commit1644bb0f40800169a3402f08b8f8a2758e90efee (patch)
tree85c2cf4bd63b57f4584551eb6038b77b52a88641 /src/gallium/winsys
parent06472ad7e835813ef7c9bf8a5cd8b62a25fa9cc3 (diff)
r600g: avoid segfault due to unintialized list pointer
Signed-off-by: Jerome Glisse <jglisse@redhat.com>
Diffstat (limited to 'src/gallium/winsys')
-rw-r--r--src/gallium/winsys/r600/drm/evergreen_hw_context.c6
-rw-r--r--src/gallium/winsys/r600/drm/r600_hw_context.c10
2 files changed, 9 insertions, 7 deletions
diff --git a/src/gallium/winsys/r600/drm/evergreen_hw_context.c b/src/gallium/winsys/r600/drm/evergreen_hw_context.c
index 2093a2d09c..9617035c93 100644
--- a/src/gallium/winsys/r600/drm/evergreen_hw_context.c
+++ b/src/gallium/winsys/r600/drm/evergreen_hw_context.c
@@ -640,7 +640,7 @@ static inline void evergreen_context_pipe_state_set_resource(struct r600_context
block->status &= ~(R600_BLOCK_STATUS_ENABLED | R600_BLOCK_STATUS_DIRTY);
r600_bo_reference(ctx->radeon, &block->reloc[1].bo, NULL);
r600_bo_reference(ctx->radeon , &block->reloc[2].bo, NULL);
- LIST_DEL(&block->list);
+ LIST_DELINIT(&block->list);
return;
}
block->reg[0] = state->regs[0].value;
@@ -695,7 +695,7 @@ static inline void evergreen_context_pipe_state_set_sampler(struct r600_context
block = range->blocks[CTX_BLOCK_ID(ctx, offset)];
if (state == NULL) {
block->status &= ~(R600_BLOCK_STATUS_ENABLED | R600_BLOCK_STATUS_DIRTY);
- LIST_DEL(&block->list);
+ LIST_DELINIT(&block->list);
return;
}
block->reg[0] = state->regs[0].value;
@@ -719,7 +719,7 @@ static inline void evergreen_context_pipe_state_set_sampler_border(struct r600_c
block = range->blocks[CTX_BLOCK_ID(ctx, fake_offset)];
if (state == NULL) {
block->status &= ~(R600_BLOCK_STATUS_ENABLED | R600_BLOCK_STATUS_DIRTY);
- LIST_DEL(&block->list);
+ LIST_DELINIT(&block->list);
return;
}
if (state->nregs <= 3) {
diff --git a/src/gallium/winsys/r600/drm/r600_hw_context.c b/src/gallium/winsys/r600/drm/r600_hw_context.c
index 7d81d73457..72bfb357b3 100644
--- a/src/gallium/winsys/r600/drm/r600_hw_context.c
+++ b/src/gallium/winsys/r600/drm/r600_hw_context.c
@@ -125,6 +125,8 @@ int r600_context_add_block(struct r600_context *ctx, const struct r600_reg *reg,
block->reg = &block->pm4[block->pm4_ndwords];
block->pm4_ndwords += n;
block->nreg = n;
+ LIST_INITHEAD(&block->list);
+
for (j = 0; j < n; j++) {
if (reg[i+j].need_bo) {
block->nbo++;
@@ -829,7 +831,7 @@ static inline void r600_context_pipe_state_set_resource(struct r600_context *ctx
block->status &= ~(R600_BLOCK_STATUS_ENABLED | R600_BLOCK_STATUS_DIRTY);
r600_bo_reference(ctx->radeon, &block->reloc[1].bo, NULL);
r600_bo_reference(ctx->radeon , &block->reloc[2].bo, NULL);
- LIST_DEL(&block->list);
+ LIST_DELINIT(&block->list);
return;
}
block->reg[0] = state->regs[0].value;
@@ -883,7 +885,7 @@ static inline void r600_context_pipe_state_set_sampler(struct r600_context *ctx,
block = range->blocks[CTX_BLOCK_ID(ctx, offset)];
if (state == NULL) {
block->status &= ~(R600_BLOCK_STATUS_ENABLED | R600_BLOCK_STATUS_DIRTY);
- LIST_DEL(&block->list);
+ LIST_DELINIT(&block->list);
return;
}
block->reg[0] = state->regs[0].value;
@@ -906,7 +908,7 @@ static inline void r600_context_pipe_state_set_sampler_border(struct r600_contex
block = range->blocks[CTX_BLOCK_ID(ctx, offset)];
if (state == NULL) {
block->status &= ~(R600_BLOCK_STATUS_ENABLED | R600_BLOCK_STATUS_DIRTY);
- LIST_DEL(&block->list);
+ LIST_DELINIT(&block->list);
return;
}
if (state->nregs <= 3) {
@@ -1314,7 +1316,7 @@ struct r600_query *r600_context_query_create(struct r600_context *ctx, unsigned
void r600_context_query_destroy(struct r600_context *ctx, struct r600_query *query)
{
r600_bo_reference(ctx->radeon, &query->buffer, NULL);
- LIST_DEL(&query->list);
+ LIST_DELINIT(&query->list);
free(query);
}