diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3016-drm-amd-display-Call-validate_fbc-should_enable_fbc.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3016-drm-amd-display-Call-validate_fbc-should_enable_fbc.patch | 113 |
1 files changed, 113 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3016-drm-amd-display-Call-validate_fbc-should_enable_fbc.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3016-drm-amd-display-Call-validate_fbc-should_enable_fbc.patch new file mode 100644 index 00000000..3e7161d9 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3016-drm-amd-display-Call-validate_fbc-should_enable_fbc.patch @@ -0,0 +1,113 @@ +From 3e6b7cc579ad4e0361ac2a9e226f5cac9d1c937f Mon Sep 17 00:00:00 2001 +From: Harry Wentland <harry.wentland@amd.com> +Date: Fri, 1 Dec 2017 09:49:46 -0500 +Subject: [PATCH 3016/4131] drm/amd/display: Call validate_fbc + should_enable_fbc + +validate_fbc never fails a modeset. It's simply used to decide whether +to use FBC or not. Calling it validate_fbc might be confusing to some so +rename it to should_enable_fbc. + +With that let's also remove the DC_STATUS return code and return bool +and make enable_fbc a void function since we never check it's return +value and probably never want to anyways. + +Signed-off-by: Harry Wentland <harry.wentland@amd.com> +Reviewed-by: Roman Li <Roman.Li@amd.com> +Acked-by: Harry Wentland <harry.wentland@amd.com> +--- + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 39 +++++++++------------- + 1 file changed, 16 insertions(+), 23 deletions(-) + +diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c +index f0002d6..86cdd7b4 100644 +--- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c ++++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c +@@ -1689,60 +1689,54 @@ static void apply_min_clocks( + /* + * Check if FBC can be enabled + */ +-static enum dc_status validate_fbc(struct dc *dc, +- struct dc_state *context) ++static bool should_enable_fbc(struct dc *dc, ++ struct dc_state *context) + { +- struct pipe_ctx *pipe_ctx = +- &context->res_ctx.pipe_ctx[0]; ++ struct pipe_ctx *pipe_ctx = &context->res_ctx.pipe_ctx[0]; + + ASSERT(dc->fbc_compressor); + + /* FBC memory should be allocated */ + if (!dc->ctx->fbc_gpu_addr) +- return DC_ERROR_UNEXPECTED; ++ return false; + + /* Only supports single display */ + if (context->stream_count != 1) +- return DC_ERROR_UNEXPECTED; ++ return false; + + /* Only supports eDP */ + if (pipe_ctx->stream->sink->link->connector_signal != SIGNAL_TYPE_EDP) +- return DC_ERROR_UNEXPECTED; ++ return false; + + /* PSR should not be enabled */ + if (pipe_ctx->stream->sink->link->psr_enabled) +- return DC_ERROR_UNEXPECTED; ++ return false; + + /* Nothing to compress */ + if (!pipe_ctx->plane_state) +- return DC_ERROR_UNEXPECTED; ++ return false; + + /* Only for non-linear tiling */ + if (pipe_ctx->plane_state->tiling_info.gfx8.array_mode == DC_ARRAY_LINEAR_GENERAL) +- return DC_ERROR_UNEXPECTED; ++ return false; + +- return DC_OK; ++ return true; + } + + /* + * Enable FBC + */ +-static enum dc_status enable_fbc(struct dc *dc, +- struct dc_state *context) ++static void enable_fbc(struct dc *dc, ++ struct dc_state *context) + { +- enum dc_status status = validate_fbc(dc, context); +- +- if (status == DC_OK) { ++ if (should_enable_fbc(dc, context)) { + /* Program GRPH COMPRESSED ADDRESS and PITCH */ + struct compr_addr_and_pitch_params params = {0, 0, 0}; + struct compressor *compr = dc->fbc_compressor; +- struct pipe_ctx *pipe_ctx = +- &context->res_ctx.pipe_ctx[0]; ++ struct pipe_ctx *pipe_ctx = &context->res_ctx.pipe_ctx[0]; + +- params.source_view_width = +- pipe_ctx->stream->timing.h_addressable; +- params.source_view_height = +- pipe_ctx->stream->timing.v_addressable; ++ params.source_view_width = pipe_ctx->stream->timing.h_addressable; ++ params.source_view_height = pipe_ctx->stream->timing.v_addressable; + + compr->compr_surface_address.quad_part = dc->ctx->fbc_gpu_addr; + +@@ -1751,7 +1745,6 @@ static enum dc_status enable_fbc(struct dc *dc, + + compr->funcs->enable_fbc(compr, ¶ms); + } +- return status; + } + #endif + +-- +2.7.4 + |