drm/amd/display: Do post_update_surfaces on new state

Signed-off-by: Charlene Liu <[email protected]>
Reviewed-by: Anthony Koo <[email protected]>
Acked-by: Harry Wentland <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>

diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c
index 507b1171d65f4c628364036a3d9379e142406bc8..01ec1edd1c69bd68165beb404c7d0037d1010a28 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/core/dc.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
@@ -1469,10 +1469,7 @@ void dc_commit_updates_for_stream(struct dc *dc,
                                stream_update,
                                update_type,
                                context);
-
-       if (update_type >= UPDATE_TYPE_FULL)
-               dc_post_update_surfaces_to_stream(dc);
-
+       /*update current_State*/
        if (dc->current_state != context) {
 
                struct dc_state *old = dc->current_state;
@@ -1481,6 +1478,9 @@ void dc_commit_updates_for_stream(struct dc *dc,
                dc_release_state(old);
 
        }
+       /*let's use current_state to update watermark etc*/
+       if (update_type >= UPDATE_TYPE_FULL)
+               dc_post_update_surfaces_to_stream(dc);
 
        return;