[PATCH 31/77] drm/amd/display: fix hubp mpcc and opp tracking

[Harry Wentland]

From: Dmytro Laktyushkin <dmytro.laktyush...@amd.com>

This should be handled by mi and mpc only

Signed-off-by: Dmytro Laktyushkin <dmytro.laktyush...@amd.com>
Reviewed-by: Tony Cheng <tony.ch...@amd.com>
Acked-by: Harry Wentland <harry.wentl...@amd.com>
---
 drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c        | 2 ++
 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 6 ++----
 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mem_input.c    | 3 +--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c 
b/drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c
index 627669749740..83d9caa4f438 100644
--- a/drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c
+++ b/drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c
@@ -686,6 +686,8 @@ void dce_mem_input_construct(
        dce_mi->shifts = mi_shift;
        dce_mi->masks = mi_mask;
 
+       dce_mi->base.mpcc_id = 0xf;
+       dce_mi->base.opp_id = 0xf;
 }
 
 void dce112_mem_input_construct(
diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c 
b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c
index ddfa6a8d087b..69f67f6e27b1 100644
--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c
@@ -1066,9 +1066,6 @@ static void plane_atomic_disable(struct dc *dc,
                        fe_idx);*/
 
        mi->funcs->set_blank(mi, true);
-       /*todo: unhack this*/
-       mi->opp_id = 0xf;
-       mi->mpcc_id = 0xf;
 
        if (dc->debug.sanity_checks)
                verify_allow_pstate_change_high(dc->hwseq);
@@ -2304,7 +2301,8 @@ static void update_dchubp_dpp(
                &plane_state->dcc,
                plane_state->horizontal_mirror);
 
-       mi->funcs->set_blank(mi, !is_pipe_tree_visible(pipe_ctx));
+       if (is_pipe_tree_visible(pipe_ctx))
+               mi->funcs->set_blank(mi, false);
 }
 
 
diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mem_input.c 
b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mem_input.c
index 11daf6b5c7d8..0a47e6ad4286 100644
--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mem_input.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mem_input.c
@@ -51,9 +51,8 @@ static void min10_set_blank(struct mem_input *mem_input, bool 
blank)
                REG_WAIT(DCHUBP_CNTL,
                                HUBP_NO_OUTSTANDING_REQ, 1,
                                1, 200);
-               /*todo: unhack this
                mem_input->mpcc_id = 0xf;
-               mem_input->opp_id = 0xf;*/
+               mem_input->opp_id = 0xf;
        }
 }
 
-- 
2.11.0

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx