Commit aeff7ab1 authored by Andrew Jiang's avatar Andrew Jiang Committed by Alex Deucher
Browse files

drm/amd/display: Fix context alloc failed logging 



Since there was no return statement in the fail block immediately
preceding the context_alloc_fail block, any failure within the
function caused a context alloc failed error message to be printed.
Since the context_alloc_fail block is only used once, move it to
where the goto is directly and accompany it with a return statement.

Signed-off-by: default avatarAndrew Jiang <Andrew.Jiang@amd.com>
Reviewed-by: default avatarTony Cheng <Tony.Cheng@amd.com>
Acked-by: default avatarHarry Wentland <Harry.Wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 603767f9

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

+4 −5
Original line number Diff line number Diff line
@@ -1279,8 +1279,10 @@ void dc_update_planes_and_stream(struct dc *dc, 


		/* initialize scratch memory for building context */

		context = dc_create_state();

		if (context == NULL)

				goto context_alloc_fail;

		if (context == NULL) {

			DC_ERROR("Failed to allocate new validate context!\n");

			return;

		}



		dc_resource_state_copy_construct(

				dc->current_state, context);
@@ -1534,9 +1536,6 @@ void dc_update_planes_and_stream(struct dc *dc, 


fail:

	dc_release_state(context);



context_alloc_fail:

	DC_ERROR("Failed to allocate new validate context!\n");

}



uint8_t dc_get_current_stream_count(struct dc *dc)