26 lines
1.2 KiB
Diff
26 lines
1.2 KiB
Diff
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
|
|
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
|
|
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
|
|
@@ -7020,16 +7020,11 @@ static void fill_stream_properties_from_drm_display_mode(
|
|
timing_out->v_border_top = 0;
|
|
timing_out->v_border_bottom = 0;
|
|
/* TODO: un-hardcode */
|
|
- if (drm_mode_is_420_only(info, mode_in)
|
|
- && (stream->signal == SIGNAL_TYPE_HDMI_TYPE_A ||
|
|
- stream->signal == SIGNAL_TYPE_HDMI_FRL)
|
|
- && aconnector
|
|
- && aconnector->force_yuv_pixel_format == PIXEL_ENCODING_YCBCR420)
|
|
- timing_out->pixel_encoding = PIXEL_ENCODING_YCBCR420;
|
|
- else if (drm_mode_is_420_also(info, mode_in)
|
|
- && aconnector
|
|
- && (aconnector->force_yuv_pixel_format == PIXEL_ENCODING_YCBCR420
|
|
- || aconnector->force_yuv420_output))
|
|
+ if (drm_mode_is_420_only(info, mode_in) ||
|
|
+ (aconnector &&
|
|
+ (aconnector->force_yuv_pixel_format == PIXEL_ENCODING_YCBCR420 ||
|
|
+ aconnector->force_yuv420_output) &&
|
|
+ drm_mode_is_420_also(info, mode_in)))
|
|
timing_out->pixel_encoding = PIXEL_ENCODING_YCBCR420;
|
|
else if ((connector->display_info.color_formats & BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR422))
|
|
&& aconnector
|