> -----Original Message----- > From: Intel-gfx <[email protected]> On Behalf Of Ville > Syrjala > Sent: Friday, September 25, 2020 12:12 AM > To: [email protected] > Subject: [Intel-gfx] [PATCH 3/3] drm/i915: Inline intel_dp_ycbcr420_config() > > From: Ville Syrjälä <[email protected]> > > intel_dp_ycbcr420_config() is rather pointless. Just inline it directly into > intel_dp_compute_config(). This gets rid of the ugly double assignment of > output_format. > > Not really sure what the best policy would be when the user supplies a mode > classiefied by the display as "YCbCr 4:2:0 only", but we know that we can't do
Nit: Typo in "classified" Rest all looks good to me. Reviewed-by: Uma Shankar <[email protected]> > YCbCr 4:2:0 output. For now keep the current behaviour of just silently > upgrade > it to RGB 4:4:4. > > Signed-off-by: Ville Syrjälä <[email protected]> > --- > drivers/gpu/drm/i915/display/intel_dp.c | 33 +++++++------------------ > 1 file changed, 9 insertions(+), 24 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_dp.c > b/drivers/gpu/drm/i915/display/intel_dp.c > index f58df4994d92..a50e502dedf8 100644 > --- a/drivers/gpu/drm/i915/display/intel_dp.c > +++ b/drivers/gpu/drm/i915/display/intel_dp.c > @@ -599,7 +599,8 @@ intel_dp_output_format(struct drm_connector > *connector, > struct intel_dp *intel_dp = > intel_attached_dp(to_intel_connector(connector)); > const struct drm_display_info *info = &connector->display_info; > > - if (!drm_mode_is_420_only(info, mode)) > + if (!connector->ycbcr_420_allowed || > + !drm_mode_is_420_only(info, mode)) > return INTEL_OUTPUT_FORMAT_RGB; > > if (intel_dp->dfp.ycbcr_444_to_420) > @@ -2456,25 +2457,6 @@ intel_dp_compute_link_config(struct intel_encoder > *encoder, > return 0; > } > > -static int > -intel_dp_ycbcr420_config(struct intel_crtc_state *crtc_state, > - const struct drm_connector_state *conn_state) > -{ > - struct drm_connector *connector = conn_state->connector; > - const struct drm_display_mode *adjusted_mode = > - &crtc_state->hw.adjusted_mode; > - > - if (!connector->ycbcr_420_allowed) > - return 0; > - > - crtc_state->output_format = intel_dp_output_format(connector, > adjusted_mode); > - > - if (crtc_state->output_format != INTEL_OUTPUT_FORMAT_YCBCR420) > - return 0; > - > - return intel_pch_panel_fitting(crtc_state, conn_state); > -} > - > bool intel_dp_limited_color_range(const struct intel_crtc_state *crtc_state, > const struct drm_connector_state *conn_state) > { @@ -2724,11 +2706,14 @@ intel_dp_compute_config(struct intel_encoder > *encoder, > if (HAS_PCH_SPLIT(dev_priv) && !HAS_DDI(dev_priv) && port != PORT_A) > pipe_config->has_pch_encoder = true; > > - pipe_config->output_format = INTEL_OUTPUT_FORMAT_RGB; > + pipe_config->output_format = > intel_dp_output_format(&intel_connector->base, > + adjusted_mode); > > - ret = intel_dp_ycbcr420_config(pipe_config, conn_state); > - if (ret) > - return ret; > + if (pipe_config->output_format == INTEL_OUTPUT_FORMAT_YCBCR420) { > + ret = intel_pch_panel_fitting(pipe_config, conn_state); > + if (ret) > + return ret; > + } > > if (!intel_dp_port_has_audio(dev_priv, port)) > pipe_config->has_audio = false; > -- > 2.26.2 > > _______________________________________________ > Intel-gfx mailing list > [email protected] > https://lists.freedesktop.org/mailman/listinfo/intel-gfx _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
