Commit 88ed9fb7 authored by Jun Lei's avatar Jun Lei Committed by Alex Deucher
Browse files

drm/amd/display: fix memory leak in resource pools 



[why]
ddc engines were recently changed to be independently tracked
from pipe count.  the change was reflected in resource constructor
but not in destructor.  this manifests as a memory leak when
pipe harvesting is enabled, since not all constructed ddc engines
are freed

[how]
make destructor symmetric with constructor for all dcX_resource

Signed-off-by: default avatarJun Lei <Jun.Lei@amd.com>
Reviewed-by: default avatarAric Cyr <Aric.Cyr@amd.com>
Acked-by: default avatarLeo Li <sunpeng.li@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 5e174ce6

drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c

+2 −0
Original line number Diff line number Diff line
@@ -689,7 +689,9 @@ static void destruct(struct dce110_resource_pool *pool) 
			kfree(DCE110TG_FROM_TG(pool->base.timing_generators[i]));

			pool->base.timing_generators[i] = NULL;

		}

	}



	for (i = 0; i < pool->base.res_cap->num_ddc; i++) {

		if (pool->base.engines[i] != NULL)

			dce110_engine_destroy(&pool->base.engines[i]);

		if (pool->base.hw_i2cs[i] != NULL) {

drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c

+2 −0
Original line number Diff line number Diff line
@@ -719,7 +719,9 @@ static void destruct(struct dce110_resource_pool *pool) 
			kfree(DCE110TG_FROM_TG(pool->base.timing_generators[i]));

			pool->base.timing_generators[i] = NULL;

		}

	}



	for (i = 0; i < pool->base.res_cap->num_ddc; i++) {

		if (pool->base.engines[i] != NULL)

			dce110_engine_destroy(&pool->base.engines[i]);

		if (pool->base.hw_i2cs[i] != NULL) {

drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c

+5 −3
Original line number Diff line number Diff line
@@ -693,9 +693,6 @@ static void destruct(struct dce110_resource_pool *pool) 
		if (pool->base.opps[i] != NULL)

			dce110_opp_destroy(&pool->base.opps[i]);



		if (pool->base.engines[i] != NULL)

			dce110_engine_destroy(&pool->base.engines[i]);



		if (pool->base.transforms[i] != NULL)

			dce112_transform_destroy(&pool->base.transforms[i]);
@@ -711,6 +708,11 @@ static void destruct(struct dce110_resource_pool *pool) 
			kfree(DCE110TG_FROM_TG(pool->base.timing_generators[i]));

			pool->base.timing_generators[i] = NULL;

		}

	}



	for (i = 0; i < pool->base.res_cap->num_ddc; i++) {

		if (pool->base.engines[i] != NULL)

			dce110_engine_destroy(&pool->base.engines[i]);

		if (pool->base.hw_i2cs[i] != NULL) {

			kfree(pool->base.hw_i2cs[i]);

			pool->base.hw_i2cs[i] = NULL;

drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c

+2 −0
Original line number Diff line number Diff line
@@ -533,7 +533,9 @@ static void destruct(struct dce110_resource_pool *pool) 
			kfree(DCE110TG_FROM_TG(pool->base.timing_generators[i]));

			pool->base.timing_generators[i] = NULL;

		}

	}



	for (i = 0; i < pool->base.res_cap->num_ddc; i++) {

		if (pool->base.engines[i] != NULL)

			dce110_engine_destroy(&pool->base.engines[i]);

		if (pool->base.hw_i2cs[i] != NULL) {

drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c

+2 −0
Original line number Diff line number Diff line
@@ -738,7 +738,9 @@ static void destruct(struct dce110_resource_pool *pool) 
			kfree(DCE110TG_FROM_TG(pool->base.timing_generators[i]));

			pool->base.timing_generators[i] = NULL;

		}

	}



	for (i = 0; i < pool->base.res_cap->num_ddc; i++) {

		if (pool->base.engines[i] != NULL)

			dce110_engine_destroy(&pool->base.engines[i]);

		if (pool->base.hw_i2cs[i] != NULL) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE