drm/amd/display: Remove mpc from bios left over, keep double buffer disabled.

Signed-off-by: Yongqiang Sun <yongqiang.sun@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>

diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.c
index ce408ccb428ec886fcc6d8f70bfe9339f569af47..082b39a65e6ad6b7ff86c4445104d61023a8fe0a 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.c
@@ -127,10 +127,18 @@ static void mpc10_mpcc_remove(
        for (z_idx = 0; z_idx < opp->mpc_tree.num_pipes; z_idx++)
                if (opp->mpc_tree.dpp[z_idx] == dpp_id)
                        break;
+
        if (z_idx == opp->mpc_tree.num_pipes) {
-               ASSERT(0);
+               /* In case of resume from S3/S4, remove mpcc from bios left over */
+               REG_SET(MPCC_OPP_ID[dpp_id], 0,
+                               MPCC_OPP_ID, 0xf);
+               REG_SET(MPCC_TOP_SEL[dpp_id], 0,
+                               MPCC_TOP_SEL, 0xf);
+               REG_SET(MPCC_BOT_SEL[dpp_id], 0,
+                               MPCC_BOT_SEL, 0xf);
                return;
        }
+
        mpcc_id = opp->mpc_tree.mpcc[z_idx];
 
        REG_SET(MPCC_OPP_ID[mpcc_id], 0,

diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_timing_generator.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_timing_generator.c
index cc58f43400d703fb00d63295bba554e88f90ba10..6a5f2683c2e5f91782aa0b31d26a3db5cac25c7b 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_timing_generator.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_timing_generator.c
@@ -289,9 +289,6 @@ static void tgn10_unblank_crtc(struct timing_generator *tg)
 {
        struct dcn10_timing_generator *tgn10 = DCN10TG_FROM_TG(tg);
 
-       REG_UPDATE(OTG_DOUBLE_BUFFER_CONTROL,
-                       OTG_BLANK_DATA_DOUBLE_BUFFER_EN, 1);
-
        REG_UPDATE_2(OTG_BLANK_CONTROL,
                        OTG_BLANK_DATA_EN, 0,
                        OTG_BLANK_DE_MODE, 0);