From 7141b402eb2bc62e1d6b90a79857d9e86dae985c Mon Sep 17 00:00:00 2001 From: Jerome Glisse Date: Wed, 2 May 2012 16:24:40 -0400 Subject: [PATCH] --- yaml --- r: 307227 b: refs/heads/master c: b7f6413a731f2139041beede539149a5374860fe h: refs/heads/master i: 307225: 37db3ad6fa41d00afc567c022dbef39f20ce62a1 307223: fce3f115bf9e2ddda01e69ecdbdb9253e651da5c v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/radeon/radeon_cs.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 71efbfa5876e..9dfe05ddadb5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 43caf4515c327dac6c69bfd6080b529eb6a049a6 +refs/heads/master: b7f6413a731f2139041beede539149a5374860fe diff --git a/trunk/drivers/gpu/drm/radeon/radeon_cs.c b/trunk/drivers/gpu/drm/radeon/radeon_cs.c index 02eee4bb6a8c..c66beb1662b5 100644 --- a/trunk/drivers/gpu/drm/radeon/radeon_cs.c +++ b/trunk/drivers/gpu/drm/radeon/radeon_cs.c @@ -161,6 +161,8 @@ int radeon_cs_parser_init(struct radeon_cs_parser *p, void *data) /* get chunks */ INIT_LIST_HEAD(&p->validated); p->idx = 0; + p->ib = NULL; + p->const_ib = NULL; p->chunk_ib_idx = -1; p->chunk_relocs_idx = -1; p->chunk_flags_idx = -1; @@ -325,6 +327,9 @@ static void radeon_cs_parser_fini(struct radeon_cs_parser *parser, int error) kfree(parser->chunks); kfree(parser->chunks_array); radeon_ib_free(parser->rdev, &parser->ib); + if (parser->const_ib) { + radeon_ib_free(parser->rdev, &parser->const_ib); + } } static int radeon_cs_ib_chunk(struct radeon_device *rdev,