lkml.org 
[lkml]   [2015]   [Oct]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.4 57/65] Revert "drm/radeon: Use drm_calloc_ab for CS relocs"
    Date
    From: Zefan Li <lizefan@huawei.com>

    3.4.110-rc1 review patch. If anyone has any objections, please let me know.

    ------------------


    This reverts commit 961bd13539b9e7ca5d2e667668141496b7a1d6bc.

    Both Satoshi-san and Cal reported a kernel crash due to this commit.

    Reported-by: Satoshi Iwamoto <satoshi.iwamoto@nifty.ne.jp>
    Reported-by: Cal Peake <cp@absolutedigital.net>
    Signed-off-by: Zefan Li <lizefan@huawei.com>
    ---
    drivers/gpu/drm/radeon/radeon_cs.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c
    index d66d2cd..f3ee360 100644
    --- a/drivers/gpu/drm/radeon/radeon_cs.c
    +++ b/drivers/gpu/drm/radeon/radeon_cs.c
    @@ -49,7 +49,7 @@ int radeon_cs_parser_relocs(struct radeon_cs_parser *p)
    if (p->relocs_ptr == NULL) {
    return -ENOMEM;
    }
    - p->relocs = drm_calloc_large(p->nrelocs, sizeof(struct radeon_bo_list));
    + p->relocs = kcalloc(p->nrelocs, sizeof(struct radeon_cs_reloc), GFP_KERNEL);
    if (p->relocs == NULL) {
    return -ENOMEM;
    }
    @@ -324,7 +324,7 @@ static void radeon_cs_parser_fini(struct radeon_cs_parser *parser, int error)
    }
    }
    kfree(parser->track);
    - drm_free_large(parser->relocs);
    + kfree(parser->relocs);
    kfree(parser->relocs_ptr);
    for (i = 0; i < parser->nchunks; i++) {
    kfree(parser->chunks[i].kdata);
    --
    1.9.1


    \
     
     \ /
      Last update: 2015-10-20 03:01    [W:7.890 / U:0.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site