On 2024-01-15 11:05, Andri Yngvason wrote: > From: Werner Sembach <wse@xxxxxxxxxxxxxxxxxxx> > > Remove unnecessary SIGNAL_TYPE_HDMI_TYPE_A check that was performed in the > drm_mode_is_420_only() case, but not in the drm_mode_is_420_also() && > force_yuv420_output case. > > Without further knowledge if YCbCr 4:2:0 is supported outside of HDMI, > there is no reason to use RGB when the display > reports drm_mode_is_420_only() even on a non HDMI connection. > > This patch also moves both checks in the same if-case. This eliminates an > extra else-if-case. > > Signed-off-by: Werner Sembach <wse@xxxxxxxxxxxxxxxxxxx> > Signed-off-by: Andri Yngvason <andri@xxxxxxxxxxx> > Tested-by: Andri Yngvason <andri@xxxxxxxxxxx> > --- > drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 6 +----- > 1 file changed, 1 insertion(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > index f6575d7dee971..cc4d1f7f97b98 100644 > --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > @@ -5575,11 +5575,7 @@ static void fill_stream_properties_from_drm_display_mode( > 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) > - timing_out->pixel_encoding = PIXEL_ENCODING_YCBCR420; > - else if (drm_mode_is_420_also(info, mode_in) > - && aconnector > - && aconnector->force_yuv420_output) > + || (drm_mode_is_420_also(info, mode_in) && aconnector->force_yuv420_output)) We need to keep the && aconnector NULL check here, otherwise writeback connectors will blow up. Harry > timing_out->pixel_encoding = PIXEL_ENCODING_YCBCR420; > else if ((connector->display_info.color_formats & DRM_COLOR_FORMAT_YCBCR444) > && stream->signal == SIGNAL_TYPE_HDMI_TYPE_A)
