diff options
author | Dave Airlie | 2017-09-29 06:34:39 +0200 |
---|---|---|
committer | Alex Deucher | 2017-09-29 19:02:34 +0200 |
commit | c13b408b81f8a101501d78ca499afee98e0f0ab9 (patch) | |
tree | 48612c10946d477ae7f7ae12242f3ee7ea5a4683 /drivers/gpu/drm/amd/display/dc/dce112 | |
parent | amdgpu/dc: cleanup construct returns in gpio. (diff) | |
download | kernel-qcow2-linux-c13b408b81f8a101501d78ca499afee98e0f0ab9.tar.gz kernel-qcow2-linux-c13b408b81f8a101501d78ca499afee98e0f0ab9.tar.xz kernel-qcow2-linux-c13b408b81f8a101501d78ca499afee98e0f0ab9.zip |
amdgpu/dc: another round of dce/dcn construct cleanups.
This removes any remaining pointless return codepaths from the
DCE code.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/display/dc/dce112')
5 files changed, 7 insertions, 15 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/dce112/dce112_compressor.c b/drivers/gpu/drm/amd/display/dc/dce112/dce112_compressor.c index e75895baa132..69649928768c 100644 --- a/drivers/gpu/drm/amd/display/dc/dce112/dce112_compressor.c +++ b/drivers/gpu/drm/amd/display/dc/dce112/dce112_compressor.c @@ -791,7 +791,7 @@ void dce112_compressor_set_fbc_invalidation_triggers( dm_write_reg(compressor->ctx, addr, value); } -bool dce112_compressor_construct(struct dce112_compressor *compressor, +void dce112_compressor_construct(struct dce112_compressor *compressor, struct dc_context *ctx) { struct dc_bios *bp = ctx->dc_bios; @@ -833,7 +833,6 @@ bool dce112_compressor_construct(struct dce112_compressor *compressor, compressor->base.embedded_panel_v_size = panel_info.lcd_timing.vertical_addressable; } - return true; } struct compressor *dce112_compressor_create(struct dc_context *ctx) @@ -844,12 +843,8 @@ struct compressor *dce112_compressor_create(struct dc_context *ctx) if (!cp110) return NULL; - if (dce112_compressor_construct(cp110, ctx)) - return &cp110->base; - - BREAK_TO_DEBUGGER(); - kfree(cp110); - return NULL; + dce112_compressor_construct(cp110, ctx); + return &cp110->base; } void dce112_compressor_destroy(struct compressor **compressor) diff --git a/drivers/gpu/drm/amd/display/dc/dce112/dce112_compressor.h b/drivers/gpu/drm/amd/display/dc/dce112/dce112_compressor.h index 106506387270..f1227133f6df 100644 --- a/drivers/gpu/drm/amd/display/dc/dce112/dce112_compressor.h +++ b/drivers/gpu/drm/amd/display/dc/dce112/dce112_compressor.h @@ -42,7 +42,7 @@ struct dce112_compressor { struct compressor *dce112_compressor_create(struct dc_context *ctx); -bool dce112_compressor_construct(struct dce112_compressor *cp110, +void dce112_compressor_construct(struct dce112_compressor *cp110, struct dc_context *ctx); void dce112_compressor_destroy(struct compressor **cp); diff --git a/drivers/gpu/drm/amd/display/dc/dce112/dce112_hw_sequencer.c b/drivers/gpu/drm/amd/display/dc/dce112/dce112_hw_sequencer.c index 8816e09110e1..1e4a7c13f0ed 100644 --- a/drivers/gpu/drm/amd/display/dc/dce112/dce112_hw_sequencer.c +++ b/drivers/gpu/drm/amd/display/dc/dce112/dce112_hw_sequencer.c @@ -152,14 +152,12 @@ static bool dce112_enable_display_power_gating( return false; } -bool dce112_hw_sequencer_construct(struct dc *dc) +void dce112_hw_sequencer_construct(struct dc *dc) { /* All registers used by dce11.2 match those in dce11 in offset and * structure */ dce110_hw_sequencer_construct(dc); dc->hwss.enable_display_power_gating = dce112_enable_display_power_gating; - - return true; } diff --git a/drivers/gpu/drm/amd/display/dc/dce112/dce112_hw_sequencer.h b/drivers/gpu/drm/amd/display/dc/dce112/dce112_hw_sequencer.h index 37bd60cc93f9..e646f4a37fa2 100644 --- a/drivers/gpu/drm/amd/display/dc/dce112/dce112_hw_sequencer.h +++ b/drivers/gpu/drm/amd/display/dc/dce112/dce112_hw_sequencer.h @@ -30,7 +30,7 @@ struct dc; -bool dce112_hw_sequencer_construct(struct dc *dc); +void dce112_hw_sequencer_construct(struct dc *dc); #endif /* __DC_HWSS_DCE112_H__ */ diff --git a/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c b/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c index 251e4a29d56f..11902a2fdaa4 100644 --- a/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c +++ b/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c @@ -1256,8 +1256,7 @@ static bool construct( dc->caps.max_planes = pool->base.pipe_count; /* Create hardware sequencer */ - if (!dce112_hw_sequencer_construct(dc)) - goto res_create_fail; + dce112_hw_sequencer_construct(dc); bw_calcs_init(dc->bw_dceip, dc->bw_vbios, dc->ctx->asic_id); |