]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
drm/amd/display: pass pipe_ctx straight to blank_pixel_data
authorEric Bernstein <eric.bernstein@amd.com>
Tue, 1 May 2018 19:21:42 +0000 (15:21 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Fri, 15 Jun 2018 17:20:21 +0000 (12:20 -0500)
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>
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c
drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h

index f8e0576af6e0b327b9f685370b4c752f7ecd3d1c..52924ef50db6a138f23f6215bb08a4b5448a20df 100644 (file)
@@ -2063,12 +2063,13 @@ static void update_dchubp_dpp(
 
 static void dcn10_blank_pixel_data(
                struct dc *dc,
-               struct stream_resource *stream_res,
-               struct dc_stream_state *stream,
+               struct pipe_ctx *pipe_ctx,
                bool blank)
 {
        enum dc_color_space color_space;
        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 */
        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);
 
-               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) {
@@ -2247,7 +2247,7 @@ static void dcn10_apply_ctx_for_surface(
 
        if (num_planes == 0) {
                /* 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 */
index 63fc6c4997892d73b1bb6c25b3261d5ac22b8ee8..52db80fbe98764a30e1e6e885d4902ac7b360ff6 100644 (file)
@@ -160,8 +160,7 @@ struct hw_sequencer_funcs {
                                bool lock);
        void (*blank_pixel_data)(
                        struct dc *dc,
-                       struct stream_resource *stream_res,
-                       struct dc_stream_state *stream,
+                       struct pipe_ctx *pipe_ctx,
                        bool blank);
 
        void (*set_bandwidth)(