drm/amd/display: HDR dynamic meta should be treated as stream update
authorKrunoslav Kovac <Krunoslav.Kovac@amd.com>
Fri, 20 Jul 2018 19:44:08 +0000 (15:44 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Mon, 27 Aug 2018 16:10:59 +0000 (11:10 -0500)
[Why]
Recently we fixed HDR static meta using AFMT registers to be treated as
fast stream update.
Dynamic meta is still being treated as (full) surface update because it
touches HUBP and it travels with pipe data.
Here we change it to be (fast) stream update.
Note, originally we also wanted to redesign here a bit, but without OS
level support for true dynamic meta, it's left the same. We are simply
using HW that can do dynamic meta to send HDR static meta, I still prefer
keeping it in one static meta type then defining dynamic meta types to
hold the same info. Once we know how OS interfaces look like, we can
do proper design.

[How]
Move dyn meta update from update_hubp_dpp to commit_planes_do_stream_update

Signed-off-by: Krunoslav Kovac <Krunoslav.Kovac@amd.com>
Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
Acked-by: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/display/dc/core/dc.c

index 9a947f8341bfc05944332c788d81286aec15773c..b5c7be1cdd81ae5ddc1d9788f82a5fde61dacecc 100644 (file)
@@ -1357,7 +1357,7 @@ static void commit_planes_do_stream_update(struct dc *dc,
                                        pipe_ctx->stream_res.tg, &pipe_ctx->stream->timing,
                                        pipe_ctx->stream->periodic_fn_vsync_delta);
 
-                       if (stream_update->hdr_static_metadata ||
+                       if ((stream_update->hdr_static_metadata && !stream->use_dynamic_meta) ||
                                        stream_update->vrr_infopacket ||
                                        stream_update->vsc_infopacket) {
                                resource_build_info_frame(pipe_ctx);