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: Andrew Jiang <Andrew.Jiang@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>

diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c
index d5320f7162b43fc5bca0025262de8c219df0cd90..5579d2167a9ae4c0ff71fd4a0bc075b0b4bdd89a 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/core/dc.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
@@ -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)