Merge tag 'drm-misc-next-fixes-2021-09-09' of git://anongit.freedesktop.org/drm/drm...

[linux-2.6-microblaze.git] / drivers / gpu / drm / amd / display / dc / core / dc.c

diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c
index 605e297..c798c65 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/core/dc.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
@@ -1481,6 +1481,22 @@ bool dc_validate_seamless_boot_timing(const struct dc *dc,
        return true;
 }
 
+static inline bool should_update_pipe_for_stream(
+               struct dc_state *context,
+               struct pipe_ctx *pipe_ctx,
+               struct dc_stream_state *stream)
+{
+       return (pipe_ctx->stream && pipe_ctx->stream == stream);
+}
+
+static inline bool should_update_pipe_for_plane(
+               struct dc_state *context,
+               struct pipe_ctx *pipe_ctx,
+               struct dc_plane_state *plane_state)
+{
+       return (pipe_ctx->plane_state == plane_state);
+}
+
 void dc_enable_stereo(
        struct dc *dc,
        struct dc_state *context,
@@ -1491,12 +1507,15 @@ void dc_enable_stereo(
        struct pipe_ctx *pipe;
 
        for (i = 0; i < MAX_PIPES; i++) {
-               if (context != NULL)
+               if (context != NULL) {
                        pipe = &context->res_ctx.pipe_ctx[i];
-               else
+               } else {
+                       context = dc->current_state;
                        pipe = &dc->current_state->res_ctx.pipe_ctx[i];
-               for (j = 0 ; pipe && j < stream_count; j++)  {
-                       if (streams[j] && streams[j] == pipe->stream &&
+               }
+
+               for (j = 0; pipe && j < stream_count; j++)  {
+                       if (should_update_pipe_for_stream(context, pipe, streams[j]) &&
                                dc->hwss.setup_stereo)
                                dc->hwss.setup_stereo(pipe, dc);
                }
@@ -1530,6 +1549,12 @@ void dc_z10_restore(struct dc *dc)
        if (dc->hwss.z10_restore)
                dc->hwss.z10_restore(dc);
 }
+
+void dc_z10_save_init(struct dc *dc)
+{
+       if (dc->hwss.z10_save_init)
+               dc->hwss.z10_save_init(dc);
+}
 #endif
 /*
  * Applies given context to HW and copy it into current context.
@@ -2623,6 +2648,7 @@ static void commit_planes_for_stream(struct dc *dc,
 {
        int i, j;
        struct pipe_ctx *top_pipe_to_program = NULL;
+       bool should_lock_all_pipes = (update_type != UPDATE_TYPE_FAST);
 
 #if defined(CONFIG_DRM_AMD_DC_DCN)
        dc_z10_restore(dc);
@@ -2694,7 +2720,7 @@ static void commit_planes_for_stream(struct dc *dc,
                                                top_pipe_to_program->stream_res.tg);
                }
 
-       if ((update_type != UPDATE_TYPE_FAST) && dc->hwss.interdependent_update_lock)
+       if (should_lock_all_pipes && dc->hwss.interdependent_update_lock)
                dc->hwss.interdependent_update_lock(dc, context, true);
        else
                /* Lock the top pipe while updating plane addrs, since freesync requires
@@ -2717,7 +2743,7 @@ static void commit_planes_for_stream(struct dc *dc,
                if (dc->hwss.program_front_end_for_ctx)
                        dc->hwss.program_front_end_for_ctx(dc, context);
 
-               if ((update_type != UPDATE_TYPE_FAST) && dc->hwss.interdependent_update_lock)
+               if (should_lock_all_pipes && dc->hwss.interdependent_update_lock)
                        dc->hwss.interdependent_update_lock(dc, context, false);
                else
                        dc->hwss.pipe_control_lock(dc, top_pipe_to_program, false);
@@ -2733,14 +2759,14 @@ static void commit_planes_for_stream(struct dc *dc,
                                struct pipe_ctx *pipe_ctx = &context->res_ctx.pipe_ctx[j];
                                if (!pipe_ctx->plane_state)
                                        continue;
-                               if (pipe_ctx->plane_state != plane_state)
+                               if (should_update_pipe_for_plane(context, pipe_ctx, plane_state))
                                        continue;
-                               plane_state->triplebuffer_flips = false;
+                               pipe_ctx->plane_state->triplebuffer_flips = false;
                                if (update_type == UPDATE_TYPE_FAST &&
                                        dc->hwss.program_triplebuffer != NULL &&
-                                       !plane_state->flip_immediate && dc->debug.enable_tri_buf) {
+                                       !pipe_ctx->plane_state->flip_immediate && dc->debug.enable_tri_buf) {
                                                /*triple buffer for VUpdate  only*/
-                                               plane_state->triplebuffer_flips = true;
+                                               pipe_ctx->plane_state->triplebuffer_flips = true;
                                }
                        }
                        if (update_type == UPDATE_TYPE_FULL) {
@@ -2756,8 +2782,7 @@ static void commit_planes_for_stream(struct dc *dc,
 
                if (!pipe_ctx->top_pipe &&
                        !pipe_ctx->prev_odm_pipe &&
-                       pipe_ctx->stream &&
-                       pipe_ctx->stream == stream) {
+                       should_update_pipe_for_stream(context, pipe_ctx, stream)) {
                        struct dc_stream_status *stream_status = NULL;
 
                        if (!pipe_ctx->plane_state)
@@ -2810,15 +2835,15 @@ static void commit_planes_for_stream(struct dc *dc,
                                for (j = 0; j < dc->res_pool->pipe_count; j++) {
                                        struct pipe_ctx *pipe_ctx = &context->res_ctx.pipe_ctx[j];
 
-                                       if (pipe_ctx->stream != stream)
+                                       if (!should_update_pipe_for_stream(context, pipe_ctx, stream))
                                                continue;
 
-                                       if (pipe_ctx->plane_state != plane_state)
+                                       if (!should_update_pipe_for_plane(context, pipe_ctx, plane_state))
                                                continue;
 
                                        // GSL has to be used for flip immediate
                                        dc->hwss.set_flip_control_gsl(pipe_ctx,
-                                                       plane_state->flip_immediate);
+                                                       pipe_ctx->plane_state->flip_immediate);
                                }
                        }
 
@@ -2829,25 +2854,26 @@ static void commit_planes_for_stream(struct dc *dc,
                        for (j = 0; j < dc->res_pool->pipe_count; j++) {
                                struct pipe_ctx *pipe_ctx = &context->res_ctx.pipe_ctx[j];
 
-                               if (pipe_ctx->stream != stream)
+                               if (!should_update_pipe_for_stream(context, pipe_ctx, stream))
                                        continue;
 
-                               if (pipe_ctx->plane_state != plane_state)
+                               if (!should_update_pipe_for_plane(context, pipe_ctx, plane_state))
                                        continue;
+
                                /*program triple buffer after lock based on flip type*/
                                if (dc->hwss.program_triplebuffer != NULL && dc->debug.enable_tri_buf) {
                                        /*only enable triplebuffer for  fast_update*/
                                        dc->hwss.program_triplebuffer(
-                                               dc, pipe_ctx, plane_state->triplebuffer_flips);
+                                               dc, pipe_ctx, pipe_ctx->plane_state->triplebuffer_flips);
                                }
-                               if (srf_updates[i].flip_addr)
+                               if (pipe_ctx->plane_state->update_flags.bits.addr_update)
                                        dc->hwss.update_plane_addr(dc, pipe_ctx);
                        }
                }
 
        }
 
-       if ((update_type != UPDATE_TYPE_FAST) && dc->hwss.interdependent_update_lock)
+       if (should_lock_all_pipes && dc->hwss.interdependent_update_lock)
                dc->hwss.interdependent_update_lock(dc, context, false);
        else
                dc->hwss.pipe_control_lock(dc, top_pipe_to_program, false);
@@ -2891,7 +2917,7 @@ static void commit_planes_for_stream(struct dc *dc,
                        continue;
 
                if (pipe_ctx->bottom_pipe || pipe_ctx->next_odm_pipe ||
-                               !pipe_ctx->stream || pipe_ctx->stream != stream ||
+                               !pipe_ctx->stream || !should_update_pipe_for_stream(context, pipe_ctx, stream) ||
                                !pipe_ctx->plane_state->update_flags.bits.addr_update ||
                                pipe_ctx->plane_state->skip_manual_trigger)
                        continue;