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

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

amdgpu/dc: remove pointless return from build_pipe_hw_param 



This never returned anything else.

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 c13b408b

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

+1 −5
Original line number Diff line number Diff line
@@ -631,16 +631,12 @@ static enum dc_status build_mapped_resource( 
		struct dc_state *context,

		struct dc_stream_state *stream)

{

	enum dc_status status = DC_OK;

	struct pipe_ctx *pipe_ctx = resource_get_head_pipe_for_stream(&context->res_ctx, stream);



	if (!pipe_ctx)

		return DC_ERROR_UNEXPECTED;



	status = dce110_resource_build_pipe_hw_param(pipe_ctx);



	if (status != DC_OK)

		return status;

	dce110_resource_build_pipe_hw_param(pipe_ctx);



	resource_build_info_frame(pipe_ctx);

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

+2 −8
Original line number Diff line number Diff line
@@ -724,7 +724,7 @@ static void get_pixel_clock_parameters( 
	}

}



enum dc_status dce110_resource_build_pipe_hw_param(struct pipe_ctx *pipe_ctx)

void dce110_resource_build_pipe_hw_param(struct pipe_ctx *pipe_ctx)

{

	get_pixel_clock_parameters(pipe_ctx, &pipe_ctx->stream_res.pix_clk_params);

	pipe_ctx->clock_source->funcs->get_pix_clk_dividers(
@@ -734,8 +734,6 @@ enum dc_status dce110_resource_build_pipe_hw_param(struct pipe_ctx *pipe_ctx) 
	resource_build_bit_depth_reduction_params(pipe_ctx->stream,

			&pipe_ctx->stream->bit_depth_params);

	pipe_ctx->stream->clamping.pixel_encoding = pipe_ctx->stream->timing.pixel_encoding;



	return DC_OK;

}



static bool is_surface_pixel_format_supported(struct pipe_ctx *pipe_ctx, unsigned int underlay_idx)
@@ -754,7 +752,6 @@ static enum dc_status build_mapped_resource( 
		struct dc_state *context,

		struct dc_stream_state *stream)

{

	enum dc_status status = DC_OK;

	struct pipe_ctx *pipe_ctx = resource_get_head_pipe_for_stream(&context->res_ctx, stream);



	if (!pipe_ctx)
@@ -764,10 +761,7 @@ static enum dc_status build_mapped_resource( 
			dc->res_pool->underlay_pipe_index))

		return DC_SURFACE_PIXEL_FORMAT_UNSUPPORTED;



	status = dce110_resource_build_pipe_hw_param(pipe_ctx);



	if (status != DC_OK)

		return status;

	dce110_resource_build_pipe_hw_param(pipe_ctx);



	/* TODO: validate audio ASIC caps, encoder */

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

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ struct dce110_resource_pool { 
	struct resource_pool base;

};



enum dc_status dce110_resource_build_pipe_hw_param(struct pipe_ctx *pipe_ctx);

void dce110_resource_build_pipe_hw_param(struct pipe_ctx *pipe_ctx);



struct resource_pool *dce110_create_resource_pool(

	uint8_t num_virtual_links,

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

+1 −5
Original line number Diff line number Diff line
@@ -704,16 +704,12 @@ static enum dc_status build_mapped_resource( 
		struct dc_state *context,

		struct dc_stream_state *stream)

{

	enum dc_status status = DC_OK;

	struct pipe_ctx *pipe_ctx = resource_get_head_pipe_for_stream(&context->res_ctx, stream);



	if (!pipe_ctx)

		return DC_ERROR_UNEXPECTED;



	status = dce110_resource_build_pipe_hw_param(pipe_ctx);



	if (status != DC_OK)

		return status;

	dce110_resource_build_pipe_hw_param(pipe_ctx);



	resource_build_info_frame(pipe_ctx);

drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c

+1 −5
Original line number Diff line number Diff line
@@ -665,16 +665,12 @@ static enum dc_status build_mapped_resource( 
		struct dc_state *context,

		struct dc_stream_state *stream)

{

	enum dc_status status = DC_OK;

	struct pipe_ctx *pipe_ctx = resource_get_head_pipe_for_stream(&context->res_ctx, stream);



	if (!pipe_ctx)

		return DC_ERROR_UNEXPECTED;



	status = dce110_resource_build_pipe_hw_param(pipe_ctx);



	if (status != DC_OK)

		return status;

	dce110_resource_build_pipe_hw_param(pipe_ctx);



	resource_build_info_frame(pipe_ctx);