]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm/amd/display: limit clear_update_flags to dcn32 and above
authorCharlene Liu <Charlene.Liu@amd.com>
Thu, 26 Jun 2025 20:36:17 +0000 (16:36 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 20 Aug 2025 16:30:30 +0000 (18:30 +0200)
[ Upstream commit f354556e29f40ef44fa8b13dc914817db3537e20 ]

[why]
dc has some code out of sync:
dc_commit_updates_for_stream handles v1/v2/v3,
but dc_update_planes_and_stream makes v1 asic to use v2.

as a reression fix: limit clear_update_flags to dcn32 or newer asic.
need to follow up that v1 asic using v2 issue.

Reviewed-by: Syed Hassan <syed.hassan@amd.com>
Signed-off-by: Charlene Liu <Charlene.Liu@amd.com>
Signed-off-by: Ivan Lipski <ivan.lipski@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/gpu/drm/amd/display/dc/core/dc.c

index a99d3e2256f196cf75d493dae94153ffcafbaf4f..b87f3e2d51179d8a981c823eacfde77b5a39f02d 100644 (file)
@@ -5121,8 +5121,7 @@ bool dc_update_planes_and_stream(struct dc *dc,
        else
                ret = update_planes_and_stream_v2(dc, srf_updates,
                        surface_count, stream, stream_update);
-
-       if (ret)
+       if (ret && dc->ctx->dce_version >= DCN_VERSION_3_2)
                clear_update_flags(srf_updates, surface_count, stream);
 
        return ret;
@@ -5153,7 +5152,7 @@ void dc_commit_updates_for_stream(struct dc *dc,
                ret = update_planes_and_stream_v1(dc, srf_updates, surface_count, stream,
                                stream_update, state);
 
-       if (ret)
+       if (ret && dc->ctx->dce_version >= DCN_VERSION_3_2)
                clear_update_flags(srf_updates, surface_count, stream);
 }