drm/amd/display: Add check update surfaces for stream wrapper

This allows us to properly clear and set the update flags for all cases.

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>

diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c
index 369a5e7..63872ce 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/core/dc.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
@@ -1310,7 +1310,7 @@ static enum surface_update_type det_surface_update(const struct dc *dc,
        return overall_type;
 }
 
-enum surface_update_type dc_check_update_surfaces_for_stream(
+static enum surface_update_type check_update_surfaces_for_stream(
                struct dc *dc,
                struct dc_surface_update *updates,
                int surface_count,
@@ -1330,7 +1330,6 @@ enum surface_update_type dc_check_update_surfaces_for_stream(
                enum surface_update_type type =
                                det_surface_update(dc, &updates[i]);
 
-               updates[i].surface->update_type = type;
                if (type == UPDATE_TYPE_FULL)
                        return type;
 
@@ -1340,6 +1339,27 @@ enum surface_update_type dc_check_update_surfaces_for_stream(
        return overall_type;
 }
 
+enum surface_update_type dc_check_update_surfaces_for_stream(
+               struct dc *dc,
+               struct dc_surface_update *updates,
+               int surface_count,
+               struct dc_stream_update *stream_update,
+               const struct dc_stream_status *stream_status)
+{
+       int i;
+       enum surface_update_type type;
+
+       for (i = 0; i < surface_count; i++)
+               updates[i].surface->update_flags.raw = 0;
+
+       type = check_update_surfaces_for_stream(dc, updates, surface_count, stream_update, stream_status);
+       if (type == UPDATE_TYPE_FULL)
+               for (i = 0; i < surface_count; i++)
+                       updates[i].surface->update_flags.bits.full_update = 1;
+
+       return type;
+}
+
 static struct dc_stream_status *stream_get_status(
        struct dc_state *ctx,
        struct dc_stream_state *stream)

diff --git a/drivers/gpu/drm/amd/display/dc/dc.h b/drivers/gpu/drm/amd/display/dc/dc.h
index fb45e11..5fe86fa 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dc.h
+++ b/drivers/gpu/drm/amd/display/dc/dc.h
@@ -453,6 +453,7 @@ union surface_update_flags {
                uint32_t bandwidth_change:1;
                uint32_t clock_change:1;
                uint32_t stereo_format_change:1;
+               uint32_t full_update:1;
        } bits;
 
        uint32_t raw;
@@ -492,7 +493,6 @@ struct dc_plane_state {
        bool horizontal_mirror;
 
        union surface_update_flags update_flags;
-       enum surface_update_type update_type;
        /* private to DC core */
        struct dc_plane_status status;
        struct dc_context *ctx;