Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c13b408b authored by Dave Airlie's avatar Dave Airlie Committed by Alex Deucher
Browse files

amdgpu/dc: another round of dce/dcn construct cleanups. 



This removes any remaining pointless return codepaths from the
DCE code.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
Reviewed-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 0e1c42fd

drivers/gpu/drm/amd/display/dc/dce100/dce100_hw_sequencer.c

+1 −3
Original line number Diff line number Diff line
@@ -142,13 +142,11 @@ void dce100_set_bandwidth( 


/**************************************************************************/



bool dce100_hw_sequencer_construct(struct dc *dc)

void dce100_hw_sequencer_construct(struct dc *dc)

{

	dce110_hw_sequencer_construct(dc);



	dc->hwss.enable_display_power_gating = dce100_enable_display_power_gating;

	dc->hwss.set_bandwidth = dce100_set_bandwidth;



	return true;

}

drivers/gpu/drm/amd/display/dc/dce100/dce100_hw_sequencer.h

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
struct dc;

struct dc_state;



bool dce100_hw_sequencer_construct(struct dc *dc);

void dce100_hw_sequencer_construct(struct dc *dc);



void dce100_set_bandwidth(

		struct dc *dc,

drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c

+1 −3
Original line number Diff line number Diff line
@@ -909,9 +909,7 @@ static bool construct( 
		goto res_create_fail;



	/* Create hardware sequencer */

	if (!dce100_hw_sequencer_construct(dc))

		goto res_create_fail;



	dce100_hw_sequencer_construct(dc);

	return true;



res_create_fail:

drivers/gpu/drm/amd/display/dc/dce110/dce110_compressor.c

+3 −8
Original line number Diff line number Diff line
@@ -393,12 +393,8 @@ struct compressor *dce110_compressor_create(struct dc_context *ctx) 
	if (!cp110)

		return NULL;



	if (dce110_compressor_construct(cp110, ctx))

	dce110_compressor_construct(cp110, ctx);

	return &cp110->base;



	BREAK_TO_DEBUGGER();

	kfree(cp110);

	return NULL;

}



void dce110_compressor_destroy(struct compressor **compressor)
@@ -485,7 +481,7 @@ static const struct compressor_funcs dce110_compressor_funcs = { 
};





bool dce110_compressor_construct(struct dce110_compressor *compressor,

void dce110_compressor_construct(struct dce110_compressor *compressor,

	struct dc_context *ctx)

{
@@ -522,6 +518,5 @@ bool dce110_compressor_construct(struct dce110_compressor *compressor, 
	compressor->base.funcs = &dce110_compressor_funcs;



#endif

	return true;

}

drivers/gpu/drm/amd/display/dc/dce110/dce110_compressor.h

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ struct dce110_compressor { 


struct compressor *dce110_compressor_create(struct dc_context *ctx);



bool dce110_compressor_construct(struct dce110_compressor *cp110,

void dce110_compressor_construct(struct dce110_compressor *cp110,

	struct dc_context *ctx);



void dce110_compressor_destroy(struct compressor **cp);