浏览代码

drm/amd/display: pass pipe_ctx straight to blank_pixel_data

Signed-off-by: Eric Bernstein <eric.bernstein@amd.com>
Reviewed-by: Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Acked-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Eric Bernstein 7 年之前
父节点
当前提交
ea4a202053

+ 5 - 5
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c

@@ -2063,12 +2063,13 @@ static void update_dchubp_dpp(
 
 
 static void dcn10_blank_pixel_data(
 static void dcn10_blank_pixel_data(
 		struct dc *dc,
 		struct dc *dc,
-		struct stream_resource *stream_res,
-		struct dc_stream_state *stream,
+		struct pipe_ctx *pipe_ctx,
 		bool blank)
 		bool blank)
 {
 {
 	enum dc_color_space color_space;
 	enum dc_color_space color_space;
 	struct tg_color black_color = {0};
 	struct tg_color black_color = {0};
+	struct stream_resource *stream_res = &pipe_ctx->stream_res;
+	struct dc_stream_state *stream = pipe_ctx->stream;
 
 
 	/* program otg blank color */
 	/* program otg blank color */
 	color_space = stream->output_color_space;
 	color_space = stream->output_color_space;
@@ -2127,8 +2128,7 @@ static void program_all_pipe_in_tree(
 		pipe_ctx->stream_res.tg->funcs->program_global_sync(
 		pipe_ctx->stream_res.tg->funcs->program_global_sync(
 				pipe_ctx->stream_res.tg);
 				pipe_ctx->stream_res.tg);
 
 
-		dc->hwss.blank_pixel_data(dc, &pipe_ctx->stream_res,
-				pipe_ctx->stream, blank);
+		dc->hwss.blank_pixel_data(dc, pipe_ctx, blank);
 	}
 	}
 
 
 	if (pipe_ctx->plane_state != NULL) {
 	if (pipe_ctx->plane_state != NULL) {
@@ -2247,7 +2247,7 @@ static void dcn10_apply_ctx_for_surface(
 
 
 	if (num_planes == 0) {
 	if (num_planes == 0) {
 		/* OTG blank before remove all front end */
 		/* OTG blank before remove all front end */
-		dc->hwss.blank_pixel_data(dc, &top_pipe_to_program->stream_res, top_pipe_to_program->stream, true);
+		dc->hwss.blank_pixel_data(dc, top_pipe_to_program, true);
 	}
 	}
 
 
 	/* Disconnect unused mpcc */
 	/* Disconnect unused mpcc */

+ 1 - 2
drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h

@@ -160,8 +160,7 @@ struct hw_sequencer_funcs {
 				bool lock);
 				bool lock);
 	void (*blank_pixel_data)(
 	void (*blank_pixel_data)(
 			struct dc *dc,
 			struct dc *dc,
-			struct stream_resource *stream_res,
-			struct dc_stream_state *stream,
+			struct pipe_ctx *pipe_ctx,
 			bool blank);
 			bool blank);
 
 
 	void (*set_bandwidth)(
 	void (*set_bandwidth)(