drm/amd/display: Remove switching of clk sources at end of commit
authorHarry Wentland <harry.wentland@amd.com>
Mon, 28 Aug 2017 23:44:38 +0000 (19:44 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Tue, 26 Sep 2017 22:17:34 +0000 (18:17 -0400)
This should be taken care of in validate now.

All of timing sync is quite broken at the moment anyways. Will submit
another patch set to address that.

Signed-off-by: Harry Wentland <harry.wentland@amd.com>
Reviewed-by: Andrey Grodzovsky <Andrey.Grodzovsky@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/dce110/dce110_hw_sequencer.c

index 96db166..c57dc45 100644 (file)
@@ -1344,40 +1344,6 @@ static void set_safe_displaymarks(
        }
 }
 
-static void switch_dp_clock_sources(
-       const struct dc *dc,
-       struct resource_context *res_ctx)
-{
-       uint8_t i;
-       for (i = 0; i < MAX_PIPES; i++) {
-               struct pipe_ctx *pipe_ctx = &res_ctx->pipe_ctx[i];
-
-               if (pipe_ctx->stream == NULL || pipe_ctx->top_pipe)
-                       continue;
-
-               if (dc_is_dp_signal(pipe_ctx->stream->signal)) {
-                       struct clock_source *clk_src =
-                               resource_find_used_clk_src_for_sharing(
-                                               res_ctx, pipe_ctx);
-
-                       if (clk_src &&
-                               clk_src != pipe_ctx->clock_source) {
-                               if (resource_unreference_clock_source(res_ctx,
-                                   dc->res_pool, pipe_ctx->clock_source)) {
-                                       pipe_ctx->clock_source->funcs->cs_power_down(pipe_ctx->clock_source);
-                                       pipe_ctx->clock_source = NULL;
-                               }
-
-                               pipe_ctx->clock_source = clk_src;
-                               resource_reference_clock_source(
-                                               res_ctx, dc->res_pool, clk_src);
-
-                               dce_crtc_switch_to_clk_src(dc->hwseq, clk_src, i);
-                       }
-               }
-       }
-}
-
 /*******************************************************************************
  * Public functions
  ******************************************************************************/
@@ -1939,8 +1905,6 @@ enum dc_status dce110_apply_ctx_to_hw(
 
        dcb->funcs->set_scratch_critical_state(dcb, false);
 
-       switch_dp_clock_sources(dc, &context->res_ctx);
-
 #ifdef ENABLE_FBC
        if (dc->fbc_compressor)
                enable_fbc(dc, context);