From: Andrew Jiang <[email protected]> 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: Andrew Jiang <[email protected]> Reviewed-by: Tony Cheng <[email protected]> Acked-by: Harry Wentland <[email protected]> --- drivers/gpu/drm/amd/display/dc/core/dc.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c index 0187188dafd6..dd86b864efe6 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc.c @@ -1270,8 +1270,10 @@ void dc_update_planes_and_stream(struct dc *dc, /* initialize scratch memory for building context */ context = dm_alloc(sizeof(*context)); - if (context == NULL) - goto context_alloc_fail; + if (context == NULL) { + DC_ERROR("Failed to allocate new validate context!\n"); + return; + } atomic_inc(&context->ref_count); @@ -1527,9 +1529,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) -- 2.11.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
