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 5c1d3c5680902b6a2a68f4add7085569276c8b65..30237f049c9973640977229a3103fa6818a24f2d 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 93161a92a427c92a539c4160726eddd37d8c2f60..d3368a8bd1d56ec0f1c2e0ddd8012b11150f6db9 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 968835191da829b92d902d5073658472b8aca88e..b3005629ab21801d150833fd4eb78c4a5212520c 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;