drm/amd/display: Add use_dynamic_meta flag to stream_state

Signed-off-by: Krunoslav Kovac <Krunoslav.Kovac@amd.com>
Reviewed-by: Anthony Koo <Anthony.Koo@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_resource.c b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
index 1d716171e581b82396d52da9ea82f13b7102edb0..fca22550417a941976fd33383dba833ea52e1f1e 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
@@ -2506,7 +2506,8 @@ static void set_hdr_static_info_packet(
 {
        /* HDR Static Metadata info packet for HDR10 */
 
-       if (!stream->hdr_static_metadata.valid)
+       if (!stream->hdr_static_metadata.valid ||
+                       stream->use_dynamic_meta)
                return;
 
        *info_packet = stream->hdr_static_metadata;

diff --git a/drivers/gpu/drm/amd/display/dc/dc_stream.h b/drivers/gpu/drm/amd/display/dc/dc_stream.h
index e6e944423b3c121de7a39a21a4663615bbac7c54..065450c445c5839576373399c7432c6a4f5a86d0 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dc_stream.h
+++ b/drivers/gpu/drm/amd/display/dc/dc_stream.h
@@ -60,6 +60,7 @@ struct dc_stream_state {
 
        struct dc_info_packet hdr_static_metadata;
        PHYSICAL_ADDRESS_LOC dmdata_address;
+       bool   use_dynamic_meta;
 
        struct dc_transfer_func *out_transfer_func;
        struct colorspace_transform gamut_remap_matrix;