Skip to content

Commit 79601b8

Browse files
misyltoadalexdeucher
authored andcommitted
drm/amd/display: Calculate output_color_space after pixel encoding adjustment
Code in get_output_color_space depends on knowing the pixel encoding to determine whether to pick between eg. COLOR_SPACE_SRGB or COLOR_SPACE_YCBCR709 for transparent RGB -> YCbCr 4:4:4 in the driver. v2: Fixed patch being accidentally based on a personal feature branch, oops! Fixes: ea11731 ("drm/amd/display: Reduce HDMI pixel encoding if max clock is exceeded") Reviewed-by: Melissa Wen <[email protected]> Signed-off-by: Joshua Ashton <[email protected]> Signed-off-by: Alex Deucher <[email protected]> Cc: [email protected]
1 parent 4463b1e commit 79601b8

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5311,8 +5311,6 @@ static void fill_stream_properties_from_drm_display_mode(
53115311

53125312
timing_out->aspect_ratio = get_aspect_ratio(mode_in);
53135313

5314-
stream->output_color_space = get_output_color_space(timing_out);
5315-
53165314
stream->out_transfer_func->type = TF_TYPE_PREDEFINED;
53175315
stream->out_transfer_func->tf = TRANSFER_FUNCTION_SRGB;
53185316
if (stream->signal == SIGNAL_TYPE_HDMI_TYPE_A) {
@@ -5323,6 +5321,8 @@ static void fill_stream_properties_from_drm_display_mode(
53235321
adjust_colour_depth_from_display_info(timing_out, info);
53245322
}
53255323
}
5324+
5325+
stream->output_color_space = get_output_color_space(timing_out);
53265326
}
53275327

53285328
static void fill_audio_info(struct audio_info *audio_info,

0 commit comments

Comments
 (0)