diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0722-drm-amd-display-Move-encoder_info_frame-to-stream_re.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0722-drm-amd-display-Move-encoder_info_frame-to-stream_re.patch | 142 |
1 files changed, 0 insertions, 142 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0722-drm-amd-display-Move-encoder_info_frame-to-stream_re.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0722-drm-amd-display-Move-encoder_info_frame-to-stream_re.patch deleted file mode 100644 index e756f7fd..00000000 --- a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0722-drm-amd-display-Move-encoder_info_frame-to-stream_re.patch +++ /dev/null @@ -1,142 +0,0 @@ -From 93abcd7db69f7405c9dd0f94cbf69eb140801d88 Mon Sep 17 00:00:00 2001 -From: Harry Wentland <harry.wentland@amd.com> -Date: Sun, 30 Jul 2017 15:58:26 -0400 -Subject: [PATCH 0722/4131] drm/amd/display: Move encoder_info_frame to - stream_res - -find -name Makefile -o -name Kconfig -o -name "*.c" -o -name "*.h" \ --o -name "*.cpp" -o -name "*.hpp" | \ -xargs sed -i -'s/pipes->encoder_info_frame/pipes->stream_res\.encoder_info_frame/g' - -find -name Makefile -o -name Kconfig -o -name "*.c" -o -name "*.h" \ --o -name "*.cpp" -o -name "*.hpp" | \ -xargs sed -i -'s/pipe_with_clk_src->encoder_info_frame/pipe_with_clk_src->stream_res\.encoder_info_frame/g' - -find -name Makefile -o -name Kconfig -o -name "*.c" -o -name "*.h" \ --o -name "*.cpp" -o -name "*.hpp" | \ -xargs sed -i -'s/ctx->encoder_info_frame->/ctx->stream_res\.encoder_info_frame->/g' - -find -name Makefile -o -name Kconfig -o -name "*.c" -o -name "*.h" \ --o -name "*.cpp" -o -name "*.hpp" | \ -xargs sed -i -'s/pipe->encoder_info_frame/pipe->stream_res\.encoder_info_frame/g' - -find -name Makefile -o -name Kconfig -o -name "*.c" -o -name "*.h" \ --o -name "*.cpp" -o -name "*.hpp" | \ -xargs sed -i -'s/pipe_ctx->encoder_info_frame/pipe_ctx->stream_res\.encoder_info_frame/g' - -find -name Makefile -o -name Kconfig -o -name "*.c" -o -name "*.h" \ --o -name "*.cpp" -o -name "*.hpp" | \ -xargs sed -i \ -'s/pipe_ctx\[pipe_offset\]\.encoder_info_frame/pipe_ctx\[pipe_offset\]\.stream_res\.encoder_info_frame/g' - -find -name Makefile -o -name Kconfig -o -name "*.c" -o -name "*.h" \ --o -name "*.cpp" -o -name "*.hpp" | \ -xargs sed -i \ -'s/grouped_pipes\[i\]->encoder_info_frame/grouped_pipes\[i\]->stream_^Cs\.encoder_info_frame/g' - -find -name Makefile -o -name Kconfig -o -name "*.c" -o -name "*.h" \ --o -name "*.cpp" -o -name "*.hpp" | \ -xargs sed -i \ -'s/grouped_pipes\[0\]->encoder_info_frame/grouped_pipes\[0\]->stream_res\.encoder_info_frame/g' - -find -name Makefile -o -name Kconfig -o -name "*.c" -o -name "*.h" \ --o -name "*.cpp" -o -name "*.hpp" | \ -xargs sed -i \ -'s/grouped_pipes\[1\]->encoder_info_frame/grouped_pipes\[1\]->stream_res\.encoder_info_frame/g' - -find -name Makefile -o -name Kconfig -o -name "*.c" -o -name "*.h" \ --o -name "*.cpp" -o -name "*.hpp" | \ -xargs sed -i \ -'s/pipe_ctx\[i\]->encoder_info_frame/pipe_ctx\[i\]->stream_res\.encoder_info_frame/g' - -find -name Makefile -o -name Kconfig -o -name "*.c" -o -name "*.h" \ --o -name "*.cpp" -o -name "*.hpp" | \ -xargs sed -i \ -'s/pipe_ctx_old->encoder_info_frame/pipe_ctx_old->stream_res\.encoder_info_frame/g' - -find -name Makefile -o -name Kconfig -o -name "*.c" -o -name "*.h" \ --o -name "*.cpp" -o -name "*.hpp" | \ -xargs sed -i \ -'s/pipe_set\[j\]->encoder_info_frame/pipe_set\[j\]->stream_res\.encoder_info_frame/g' - -find -name Makefile -o -name Kconfig -o -name "*.c" -o -name "*.h" \ --o -name "*.cpp" -o -name "*.hpp" | \ -xargs sed -i \ -'s/pipe_ctx\[i\]\.encoder_info_frame/pipe_ctx\[i\]\.stream_res\.encoder_info_frame/g' - -find -name Makefile -o -name Kconfig -o -name "*.c" -o -name "*.h" \ --o -name "*.cpp" -o -name "*.hpp" | \ -xargs sed -i \ -'s/pipes\[i\]\.encoder_info_frame/pipes\[i\]\.stream_res\.encoder_info_frame/g' - -Signed-off-by: Harry Wentland <harry.wentland@amd.com> -Reviewed-by: Tony Cheng <Tony.Cheng@amd.com> -Acked-by: Harry Wentland <Harry.Wentland@amd.com> -Signed-off-by: Alex Deucher <alexander.deucher@amd.com> ---- - drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 2 +- - drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c | 4 ++-- - drivers/gpu/drm/amd/display/dc/inc/core_types.h | 4 +--- - 3 files changed, 4 insertions(+), 6 deletions(-) - -diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c -index 8bfaca7..b2086be 100644 ---- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c -+++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c -@@ -2267,7 +2267,7 @@ struct clock_source *dc_resource_find_first_free_pll( - void resource_build_info_frame(struct pipe_ctx *pipe_ctx) - { - enum signal_type signal = SIGNAL_TYPE_NONE; -- struct encoder_info_frame *info = &pipe_ctx->encoder_info_frame; -+ struct encoder_info_frame *info = &pipe_ctx->stream_res.encoder_info_frame; - - /* default all packets to invalid */ - info->avi.valid = false; -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 93161a9..d3368a8 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 -@@ -690,11 +690,11 @@ void dce110_update_info_frame(struct pipe_ctx *pipe_ctx) - if (dc_is_hdmi_signal(pipe_ctx->stream->signal)) - pipe_ctx->stream_res.stream_enc->funcs->update_hdmi_info_packets( - pipe_ctx->stream_res.stream_enc, -- &pipe_ctx->encoder_info_frame); -+ &pipe_ctx->stream_res.encoder_info_frame); - else if (dc_is_dp_signal(pipe_ctx->stream->signal)) - pipe_ctx->stream_res.stream_enc->funcs->update_dp_info_packets( - pipe_ctx->stream_res.stream_enc, -- &pipe_ctx->encoder_info_frame); -+ &pipe_ctx->stream_res.encoder_info_frame); - } - - void dce110_enable_stream(struct pipe_ctx *pipe_ctx) -diff --git a/drivers/gpu/drm/amd/display/dc/inc/core_types.h b/drivers/gpu/drm/amd/display/dc/inc/core_types.h -index 9688351..b300562 100644 ---- a/drivers/gpu/drm/amd/display/dc/inc/core_types.h -+++ b/drivers/gpu/drm/amd/display/dc/inc/core_types.h -@@ -159,6 +159,7 @@ struct stream_resource { - struct audio *audio; - - struct pixel_clk_params pix_clk_params; -+ struct encoder_info_frame encoder_info_frame; - }; - - struct plane_resource { -@@ -181,9 +182,6 @@ struct pipe_ctx { - - struct pll_settings pll_settings; - -- /*fmt*/ -- struct encoder_info_frame encoder_info_frame; -- - uint8_t pipe_idx; - - struct pipe_ctx *top_pipe; --- -2.7.4 - |