Commit 892abca6 authored by Chris Park's avatar Chris Park Committed by Alex Deucher
Browse files

drm/amd/display: Deallocate DML memory if allocation fails 



[Why]
When DC state create DML memory allocation fails, memory is not
deallocated subsequently, resulting in uninitialized structure
that is not NULL.

[How]
Deallocate memory if DML memory allocation fails.

Reviewed-by: default avatarJoshua Aberback <joshua.aberback@amd.com>
Signed-off-by: default avatarJerry Zuo <jerry.zuo@amd.com>
Signed-off-by: default avatarChris Park <chris.park@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 35ff747c

drivers/gpu/drm/amd/display/dc/core/dc_state.c

+8 −2
Original line number Diff line number Diff line
@@ -211,10 +211,16 @@ struct dc_state *dc_state_create(struct dc *dc, struct dc_state_create_params *p 
#ifdef CONFIG_DRM_AMD_DC_FP

	if (dc->debug.using_dml2) {

		dml2_opt->use_clock_dc_limits = false;

		dml2_create(dc, dml2_opt, &state->bw_ctx.dml2);

		if (!dml2_create(dc, dml2_opt, &state->bw_ctx.dml2)) {

			dc_state_release(state);

			return NULL;

		}



		dml2_opt->use_clock_dc_limits = true;

		dml2_create(dc, dml2_opt, &state->bw_ctx.dml2_dc_power_source);

		if (!dml2_create(dc, dml2_opt, &state->bw_ctx.dml2_dc_power_source)) {

			dc_state_release(state);

			return NULL;

		}

	}

#endif