diff options
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.14.71/4454-drm-amd-display-Cleanup-unused-SetPlaneConfig.patch')
-rw-r--r-- | common/recipes-kernel/linux/linux-yocto-4.14.71/4454-drm-amd-display-Cleanup-unused-SetPlaneConfig.patch | 148 |
1 files changed, 148 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.14.71/4454-drm-amd-display-Cleanup-unused-SetPlaneConfig.patch b/common/recipes-kernel/linux/linux-yocto-4.14.71/4454-drm-amd-display-Cleanup-unused-SetPlaneConfig.patch new file mode 100644 index 00000000..b1bc3554 --- /dev/null +++ b/common/recipes-kernel/linux/linux-yocto-4.14.71/4454-drm-amd-display-Cleanup-unused-SetPlaneConfig.patch @@ -0,0 +1,148 @@ +From d70c2583735eb9e63155c67ec8cbc752a2234a4e Mon Sep 17 00:00:00 2001 +From: Anthony Koo <Anthony.Koo@amd.com> +Date: Thu, 12 Apr 2018 22:40:02 -0400 +Subject: [PATCH 4454/5725] drm/amd/display: Cleanup unused SetPlaneConfig + +Signed-off-by: Anthony Koo <Anthony.Koo@amd.com> +Reviewed-by: Aric Cyr <Aric.Cyr@amd.com> +Acked-by: Harry Wentland <harry.wentland@amd.com> +--- + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 69 ---------------------- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 10 ---- + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 5 -- + 3 files changed, 84 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 45578d4..8a61b10 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 +@@ -2286,74 +2286,6 @@ static void program_gamut_remap(struct pipe_ctx *pipe_ctx) + + pipe_ctx->plane_res.xfm->funcs->transform_set_gamut_remap(pipe_ctx->plane_res.xfm, &adjust); + } +- +-/** +- * TODO REMOVE, USE UPDATE INSTEAD +- */ +-static void set_plane_config( +- const struct dc *dc, +- struct pipe_ctx *pipe_ctx, +- struct resource_context *res_ctx) +-{ +- struct mem_input *mi = pipe_ctx->plane_res.mi; +- struct dc_plane_state *plane_state = pipe_ctx->plane_state; +- struct xfm_grph_csc_adjustment adjust; +- struct out_csc_color_matrix tbl_entry; +- unsigned int i; +- +- memset(&adjust, 0, sizeof(adjust)); +- memset(&tbl_entry, 0, sizeof(tbl_entry)); +- adjust.gamut_adjust_type = GRAPHICS_GAMUT_ADJUST_TYPE_BYPASS; +- +- dce_enable_fe_clock(dc->hwseq, mi->inst, true); +- +- set_default_colors(pipe_ctx); +- if (pipe_ctx->stream->csc_color_matrix.enable_adjustment == true) { +- tbl_entry.color_space = +- pipe_ctx->stream->output_color_space; +- +- for (i = 0; i < 12; i++) +- tbl_entry.regval[i] = +- pipe_ctx->stream->csc_color_matrix.matrix[i]; +- +- pipe_ctx->plane_res.xfm->funcs->opp_set_csc_adjustment +- (pipe_ctx->plane_res.xfm, &tbl_entry); +- } +- +- if (pipe_ctx->stream->gamut_remap_matrix.enable_remap == true) { +- adjust.gamut_adjust_type = GRAPHICS_GAMUT_ADJUST_TYPE_SW; +- +- for (i = 0; i < CSC_TEMPERATURE_MATRIX_SIZE; i++) +- adjust.temperature_matrix[i] = +- pipe_ctx->stream->gamut_remap_matrix.matrix[i]; +- } +- +- pipe_ctx->plane_res.xfm->funcs->transform_set_gamut_remap(pipe_ctx->plane_res.xfm, &adjust); +- +- pipe_ctx->plane_res.scl_data.lb_params.alpha_en = pipe_ctx->bottom_pipe != 0; +- program_scaler(dc, pipe_ctx); +- +- program_surface_visibility(dc, pipe_ctx); +- +- mi->funcs->mem_input_program_surface_config( +- mi, +- plane_state->format, +- &plane_state->tiling_info, +- &plane_state->plane_size, +- plane_state->rotation, +- NULL, +- false); +- if (mi->funcs->set_blank) +- mi->funcs->set_blank(mi, pipe_ctx->plane_state->visible); +- +- if (dc->config.gpu_vm_support) +- mi->funcs->mem_input_program_pte_vm( +- pipe_ctx->plane_res.mi, +- plane_state->format, +- &plane_state->tiling_info, +- plane_state->rotation); +-} +- + static void update_plane_addr(const struct dc *dc, + struct pipe_ctx *pipe_ctx) + { +@@ -3040,7 +2972,6 @@ static const struct hw_sequencer_funcs dce110_funcs = { + .init_hw = init_hw, + .apply_ctx_to_hw = dce110_apply_ctx_to_hw, + .apply_ctx_for_surface = dce110_apply_ctx_for_surface, +- .set_plane_config = set_plane_config, + .update_plane_addr = update_plane_addr, + .update_pending_status = dce110_update_pending_status, + .set_input_transfer_func = dce110_set_input_transfer_func, +diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c +index fe52cbc..b88e020 100644 +--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c ++++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c +@@ -2510,15 +2510,6 @@ static void set_static_screen_control(struct pipe_ctx **pipe_ctx, + set_static_screen_control(pipe_ctx[i]->stream_res.tg, value); + } + +-static void set_plane_config( +- const struct dc *dc, +- struct pipe_ctx *pipe_ctx, +- struct resource_context *res_ctx) +-{ +- /* TODO */ +- program_gamut_remap(pipe_ctx); +-} +- + static void dcn10_config_stereo_parameters( + struct dc_stream_state *stream, struct crtc_stereo_flags *flags) + { +@@ -2696,7 +2687,6 @@ static const struct hw_sequencer_funcs dcn10_funcs = { + .init_hw = dcn10_init_hw, + .apply_ctx_to_hw = dce110_apply_ctx_to_hw, + .apply_ctx_for_surface = dcn10_apply_ctx_for_surface, +- .set_plane_config = set_plane_config, + .update_plane_addr = dcn10_update_plane_addr, + .update_dchub = dcn10_update_dchub, + .update_pending_status = dcn10_update_pending_status, +diff --git a/drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h b/drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h +index 29abf3e..63fc6c4 100644 +--- a/drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h ++++ b/drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h +@@ -83,11 +83,6 @@ struct hw_sequencer_funcs { + int num_planes, + struct dc_state *context); + +- void (*set_plane_config)( +- const struct dc *dc, +- struct pipe_ctx *pipe_ctx, +- struct resource_context *res_ctx); +- + void (*program_gamut_remap)( + struct pipe_ctx *pipe_ctx); + +-- +2.7.4 + |