]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
drm/amd/display: fix bug from last commit for hubbub
authorYue Hin Lau <Yuehin.Lau@amd.com>
Tue, 24 Oct 2017 15:40:50 +0000 (11:40 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Mon, 4 Dec 2017 21:41:38 +0000 (16:41 -0500)
fix memory leak

Signed-off-by: Yue Hin Lau <Yuehin.Lau@amd.com>
Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
Acked-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c

index 256632cce52013e13a6112cf2169aecce8d0c627..dd834fdf7ce715f92c6abe33867ffdd37bb189d6 100644 (file)
@@ -730,6 +730,12 @@ static void destruct(struct dcn10_resource_pool *pool)
                kfree(TO_DCN10_MPC(pool->base.mpc));
                pool->base.mpc = NULL;
        }
+
+       if (pool->base.hubbub != NULL) {
+               kfree(pool->base.hubbub);
+               pool->base.hubbub = NULL;
+       }
+
        for (i = 0; i < pool->base.pipe_count; i++) {
                if (pool->base.opps[i] != NULL)
                        pool->base.opps[i]->funcs->opp_destroy(&pool->base.opps[i]);
@@ -1453,7 +1459,7 @@ static bool construct(
        }
 
        pool->base.hubbub = dcn10_hubbub_create(ctx);
-       if (pool->base.mpc == NULL) {
+       if (pool->base.hubbub == NULL) {
                BREAK_TO_DEBUGGER();
                dm_error("DC: failed to create mpc!\n");
                goto fail;