]> git.baikalelectronics.ru Git - kernel.git/commitdiff
drm/amd/display: Set OPP default values in init_hw
authorAndrew Jiang <Andrew.Jiang@amd.com>
Tue, 14 Nov 2017 17:40:20 +0000 (12:40 -0500)
committerAlex Deucher <alexander.deucher@amd.com>
Wed, 6 Dec 2017 17:48:14 +0000 (12:48 -0500)
On S3 resume, we do not reconstruct OPP, but we do need to
reinitialize some of its values to the default ones.
Therefore, move those lines out of the OPP constructor and
into init_hw.

Also reset the hubp power gated flag, since nothing is
power gated at init_hw.

Signed-off-by: Andrew Jiang <Andrew.Jiang@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/dcn10/dcn10_hw_sequencer.c
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_opp.c

index 522adceaf5d044365721f4004d87c7d2299478b1..8e2ddbc2129cd3ead334f672d7cf6afb15e7711b 100644 (file)
@@ -743,13 +743,21 @@ static void dcn10_init_hw(struct dc *dc)
        for (i = 0; i < dc->res_pool->pipe_count; i++) {
                struct timing_generator *tg = dc->res_pool->timing_generators[i];
                struct pipe_ctx *pipe_ctx = &context->res_ctx.pipe_ctx[i];
+               struct output_pixel_processor *opp = dc->res_pool->opps[i];
+               struct mpc_tree_cfg *mpc_tree = &opp->mpc_tree;
+               struct hubp *hubp = dc->res_pool->hubps[i];
+
+               mpc_tree->dpp[0] = i;
+               mpc_tree->mpcc[0] = i;
+               mpc_tree->num_pipes = 1;
 
                pipe_ctx->stream_res.tg = tg;
                pipe_ctx->pipe_idx = i;
-               pipe_ctx->plane_res.hubp = dc->res_pool->hubps[i];
-               pipe_ctx->plane_res.hubp->mpcc_id = i;
-               pipe_ctx->plane_res.hubp->opp_id =
-                               dc->res_pool->mpc->funcs->get_opp_id(dc->res_pool->mpc, i);
+
+               pipe_ctx->plane_res.hubp = hubp;
+               hubp->mpcc_id = i;
+               hubp->opp_id = dc->res_pool->mpc->funcs->get_opp_id(dc->res_pool->mpc, i);
+               hubp->power_gated = false;
 
                plane_atomic_disconnect(dc, pipe_ctx);
        }
index 341210060cf7fc188fb2aa3b59fae0d2ace9e2d0..6d6f67b7d30e1bc7533175eb33f2b1c4c3d8f73f 100644 (file)
@@ -330,17 +330,10 @@ void dcn10_opp_construct(struct dcn10_opp *oppn10,
        const struct dcn10_opp_shift *opp_shift,
        const struct dcn10_opp_mask *opp_mask)
 {
-       int i;
        oppn10->base.ctx = ctx;
        oppn10->base.inst = inst;
        oppn10->base.funcs = &dcn10_opp_funcs;
 
-       oppn10->base.mpc_tree.dpp[0] = inst;
-       oppn10->base.mpc_tree.mpcc[0] = inst;
-       oppn10->base.mpc_tree.num_pipes = 1;
-       for (i = 0; i < MAX_PIPES; i++)
-               oppn10->base.mpcc_disconnect_pending[i] = false;
-
        oppn10->regs = regs;
        oppn10->opp_shift = opp_shift;
        oppn10->opp_mask = opp_mask;