diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2433-amdgpu-dc-remove-pointless-return-from-build_pipe_hw.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2433-amdgpu-dc-remove-pointless-return-from-build_pipe_hw.patch | 186 |
1 files changed, 186 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2433-amdgpu-dc-remove-pointless-return-from-build_pipe_hw.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2433-amdgpu-dc-remove-pointless-return-from-build_pipe_hw.patch new file mode 100644 index 00000000..a7d1617b --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2433-amdgpu-dc-remove-pointless-return-from-build_pipe_hw.patch @@ -0,0 +1,186 @@ +From 9881ba4ee8baa295e1236b32a49f03518c27252f Mon Sep 17 00:00:00 2001 +From: Dave Airlie <airlied@redhat.com> +Date: Fri, 29 Sep 2017 14:34:40 +1000 +Subject: [PATCH 2433/4131] amdgpu/dc: remove pointless return from + build_pipe_hw_param + +This never returned anything else. + +Signed-off-by: Dave Airlie <airlied@redhat.com> +Reviewed-by: Harry Wentland <harry.wentland@amd.com> +--- + drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c | 6 +----- + drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c | 10 ++-------- + drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.h | 2 +- + drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c | 6 +----- + drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c | 6 +----- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 11 ++--------- + 6 files changed, 8 insertions(+), 33 deletions(-) + +diff --git a/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c b/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c +index 0db987d..b1cf591 100644 +--- a/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c ++++ b/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c +@@ -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); + +diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c +index 017a1fd..89036af 100644 +--- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c ++++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c +@@ -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 */ + +diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.h b/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.h +index 5bb692d..e5f168c 100644 +--- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.h ++++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.h +@@ -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, +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 11902a2..663e0a0 100644 +--- a/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c ++++ b/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c +@@ -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); + +diff --git a/drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c b/drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c +index c6571a9..9c18efd 100644 +--- a/drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c ++++ b/drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c +@@ -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); + +diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c +index 4fa883f..3a51e13 100644 +--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c ++++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c +@@ -805,7 +805,7 @@ static void build_clamping_params(struct dc_stream_state *stream) + 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); +@@ -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, + &pipe_ctx->stream->bit_depth_params); + build_clamping_params(pipe_ctx->stream); +- +- return DC_OK; + } + + static enum dc_status build_mapped_resource( +@@ -829,7 +827,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); + + /*TODO Seems unneeded anymore */ +@@ -853,11 +850,7 @@ static enum dc_status build_mapped_resource( + if (!pipe_ctx) + return DC_ERROR_UNEXPECTED; + +- status = build_pipe_hw_param(pipe_ctx); +- +- if (status != DC_OK) +- return status; +- ++ build_pipe_hw_param(pipe_ctx); + return DC_OK; + } + +-- +2.7.4 + |