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

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

amdgpu/dc: make stream encoder constructor return void. 



The checks weren't useful here really.

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 ca19d1a6

drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c

+1 −8
Original line number Diff line number Diff line
@@ -1605,7 +1605,7 @@ static const struct stream_encoder_funcs dce110_str_enc_funcs = { 


};



bool dce110_stream_encoder_construct(

void dce110_stream_encoder_construct(

	struct dce110_stream_encoder *enc110,

	struct dc_context *ctx,

	struct dc_bios *bp,
@@ -1614,11 +1614,6 @@ bool dce110_stream_encoder_construct( 
	const struct dce_stream_encoder_shift *se_shift,

	const struct dce_stream_encoder_mask *se_mask)

{

	if (!enc110)

		return false;

	if (!bp)

		return false;



	enc110->base.funcs = &dce110_str_enc_funcs;

	enc110->base.ctx = ctx;

	enc110->base.id = eng_id;
@@ -1626,6 +1621,4 @@ bool dce110_stream_encoder_construct( 
	enc110->regs = regs;

	enc110->se_shift = se_shift;

	enc110->se_mask = se_mask;



	return true;

}

drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.h

+1 −1
Original line number Diff line number Diff line
@@ -697,7 +697,7 @@ struct dce110_stream_encoder { 
	const struct dce_stream_encoder_mask *se_mask;

};



bool dce110_stream_encoder_construct(

void dce110_stream_encoder_construct(

	struct dce110_stream_encoder *enc110,

	struct dc_context *ctx,

	struct dc_bios *bp,

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

+3 −8
Original line number Diff line number Diff line
@@ -389,14 +389,9 @@ static struct stream_encoder *dce100_stream_encoder_create( 
	if (!enc110)

		return NULL;



	if (dce110_stream_encoder_construct(

			enc110, ctx, ctx->dc_bios, eng_id,

			&stream_enc_regs[eng_id], &se_shift, &se_mask))

	dce110_stream_encoder_construct(enc110, ctx, ctx->dc_bios, eng_id,

					&stream_enc_regs[eng_id], &se_shift, &se_mask);

	return &enc110->base;



	BREAK_TO_DEBUGGER();

	kfree(enc110);

	return NULL;

}



#define SRII(reg_name, block, id)\

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

+4 −8
Original line number Diff line number Diff line
@@ -424,14 +424,10 @@ static struct stream_encoder *dce110_stream_encoder_create( 
	if (!enc110)

		return NULL;



	if (dce110_stream_encoder_construct(

			enc110, ctx, ctx->dc_bios, eng_id,

			&stream_enc_regs[eng_id], &se_shift, &se_mask))

	dce110_stream_encoder_construct(enc110, ctx, ctx->dc_bios, eng_id,

					&stream_enc_regs[eng_id],

					&se_shift, &se_mask);

	return &enc110->base;



	BREAK_TO_DEBUGGER();

	kfree(enc110);

	return NULL;

}



#define SRII(reg_name, block, id)\

drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c

+5 −9
Original line number Diff line number Diff line
@@ -429,14 +429,10 @@ static struct stream_encoder *dce112_stream_encoder_create( 
	if (!enc110)

		return NULL;

	

	if (dce110_stream_encoder_construct(

			enc110, ctx, ctx->dc_bios, eng_id,

			&stream_enc_regs[eng_id], &se_shift, &se_mask))

	dce110_stream_encoder_construct(enc110, ctx, ctx->dc_bios, eng_id,

					&stream_enc_regs[eng_id],

					&se_shift, &se_mask);

	return &enc110->base;



	BREAK_TO_DEBUGGER();

	kfree(enc110);

	return NULL;

}



#define SRII(reg_name, block, id)\