diff options
| author | Andrew Jiang <Andrew.Jiang@amd.com> | 2017-09-01 16:03:16 -0400 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2017-09-26 18:17:32 -0400 |
| commit | aeff7ab11e2516bfa41c77b9ea57bc2c07bb3b62 (patch) | |
| tree | a16bc903ad8405fbff539face1475cc57fc8583c | |
| parent | 603767f903bf5bf301728b197dcde63cf880fe2e (diff) | |
| download | linux-stable-aeff7ab11e2516bfa41c77b9ea57bc2c07bb3b62.tar.gz linux-stable-aeff7ab11e2516bfa41c77b9ea57bc2c07bb3b62.tar.bz2 linux-stable-aeff7ab11e2516bfa41c77b9ea57bc2c07bb3b62.zip | |
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>
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/core/dc.c | 9 |
1 files 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 d5320f7162b4..5579d2167a9a 100644 --- 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) |