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

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
...@@ -631,16 +631,12 @@ static enum dc_status build_mapped_resource( ...@@ -631,16 +631,12 @@ static enum dc_status build_mapped_resource(
struct dc_state *context, struct dc_state *context,
struct dc_stream_state *stream) 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); struct pipe_ctx *pipe_ctx = resource_get_head_pipe_for_stream(&context->res_ctx, stream);
if (!pipe_ctx) if (!pipe_ctx)
return DC_ERROR_UNEXPECTED; return DC_ERROR_UNEXPECTED;
status = dce110_resource_build_pipe_hw_param(pipe_ctx); dce110_resource_build_pipe_hw_param(pipe_ctx);
if (status != DC_OK)
return status;
resource_build_info_frame(pipe_ctx); resource_build_info_frame(pipe_ctx);
......
...@@ -724,7 +724,7 @@ static void get_pixel_clock_parameters( ...@@ -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); get_pixel_clock_parameters(pipe_ctx, &pipe_ctx->stream_res.pix_clk_params);
pipe_ctx->clock_source->funcs->get_pix_clk_dividers( 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) ...@@ -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, resource_build_bit_depth_reduction_params(pipe_ctx->stream,
&pipe_ctx->stream->bit_depth_params); &pipe_ctx->stream->bit_depth_params);
pipe_ctx->stream->clamping.pixel_encoding = pipe_ctx->stream->timing.pixel_encoding; 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) 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( ...@@ -754,7 +752,6 @@ static enum dc_status build_mapped_resource(
struct dc_state *context, struct dc_state *context,
struct dc_stream_state *stream) 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); struct pipe_ctx *pipe_ctx = resource_get_head_pipe_for_stream(&context->res_ctx, stream);
if (!pipe_ctx) if (!pipe_ctx)
...@@ -764,10 +761,7 @@ static enum dc_status build_mapped_resource( ...@@ -764,10 +761,7 @@ static enum dc_status build_mapped_resource(
dc->res_pool->underlay_pipe_index)) dc->res_pool->underlay_pipe_index))
return DC_SURFACE_PIXEL_FORMAT_UNSUPPORTED; return DC_SURFACE_PIXEL_FORMAT_UNSUPPORTED;
status = dce110_resource_build_pipe_hw_param(pipe_ctx); dce110_resource_build_pipe_hw_param(pipe_ctx);
if (status != DC_OK)
return status;
/* TODO: validate audio ASIC caps, encoder */ /* TODO: validate audio ASIC caps, encoder */
......
...@@ -38,7 +38,7 @@ struct dce110_resource_pool { ...@@ -38,7 +38,7 @@ struct dce110_resource_pool {
struct resource_pool base; 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( struct resource_pool *dce110_create_resource_pool(
uint8_t num_virtual_links, uint8_t num_virtual_links,
......
...@@ -704,16 +704,12 @@ static enum dc_status build_mapped_resource( ...@@ -704,16 +704,12 @@ static enum dc_status build_mapped_resource(
struct dc_state *context, struct dc_state *context,
struct dc_stream_state *stream) 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); struct pipe_ctx *pipe_ctx = resource_get_head_pipe_for_stream(&context->res_ctx, stream);
if (!pipe_ctx) if (!pipe_ctx)
return DC_ERROR_UNEXPECTED; return DC_ERROR_UNEXPECTED;
status = dce110_resource_build_pipe_hw_param(pipe_ctx); dce110_resource_build_pipe_hw_param(pipe_ctx);
if (status != DC_OK)
return status;
resource_build_info_frame(pipe_ctx); resource_build_info_frame(pipe_ctx);
......
...@@ -665,16 +665,12 @@ static enum dc_status build_mapped_resource( ...@@ -665,16 +665,12 @@ static enum dc_status build_mapped_resource(
struct dc_state *context, struct dc_state *context,
struct dc_stream_state *stream) 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); struct pipe_ctx *pipe_ctx = resource_get_head_pipe_for_stream(&context->res_ctx, stream);
if (!pipe_ctx) if (!pipe_ctx)
return DC_ERROR_UNEXPECTED; return DC_ERROR_UNEXPECTED;
status = dce110_resource_build_pipe_hw_param(pipe_ctx); dce110_resource_build_pipe_hw_param(pipe_ctx);
if (status != DC_OK)
return status;
resource_build_info_frame(pipe_ctx); resource_build_info_frame(pipe_ctx);
......
...@@ -805,7 +805,7 @@ static void build_clamping_params(struct dc_stream_state *stream) ...@@ -805,7 +805,7 @@ static void build_clamping_params(struct dc_stream_state *stream)
stream->clamping.pixel_encoding = stream->timing.pixel_encoding; stream->clamping.pixel_encoding = stream->timing.pixel_encoding;
} }
static enum dc_status build_pipe_hw_param(struct pipe_ctx *pipe_ctx) static void build_pipe_hw_param(struct pipe_ctx *pipe_ctx)
{ {
get_pixel_clock_parameters(pipe_ctx, &pipe_ctx->stream_res.pix_clk_params); get_pixel_clock_parameters(pipe_ctx, &pipe_ctx->stream_res.pix_clk_params);
...@@ -820,8 +820,6 @@ static enum dc_status build_pipe_hw_param(struct pipe_ctx *pipe_ctx) ...@@ -820,8 +820,6 @@ static enum dc_status build_pipe_hw_param(struct pipe_ctx *pipe_ctx)
resource_build_bit_depth_reduction_params(pipe_ctx->stream, resource_build_bit_depth_reduction_params(pipe_ctx->stream,
&pipe_ctx->stream->bit_depth_params); &pipe_ctx->stream->bit_depth_params);
build_clamping_params(pipe_ctx->stream); build_clamping_params(pipe_ctx->stream);
return DC_OK;
} }
static enum dc_status build_mapped_resource( static enum dc_status build_mapped_resource(
...@@ -829,7 +827,6 @@ static enum dc_status build_mapped_resource( ...@@ -829,7 +827,6 @@ static enum dc_status build_mapped_resource(
struct dc_state *context, struct dc_state *context,
struct dc_stream_state *stream) 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); struct pipe_ctx *pipe_ctx = resource_get_head_pipe_for_stream(&context->res_ctx, stream);
/*TODO Seems unneeded anymore */ /*TODO Seems unneeded anymore */
...@@ -853,11 +850,7 @@ static enum dc_status build_mapped_resource( ...@@ -853,11 +850,7 @@ static enum dc_status build_mapped_resource(
if (!pipe_ctx) if (!pipe_ctx)
return DC_ERROR_UNEXPECTED; return DC_ERROR_UNEXPECTED;
status = build_pipe_hw_param(pipe_ctx); build_pipe_hw_param(pipe_ctx);
if (status != DC_OK)
return status;
return DC_OK; return DC_OK;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment