[Intel-gfx] [PATCH 1/6] drm/i915: Extract intel_hdmi_bpc_possible()

[Souza, Jose]

On Tue, 2021-05-11 at 19:05 +0300, Ville Syrjala wrote:
> From: Ville Syrjälä <ville.syrjala at linux.intel.com>
> 
> Extract intel_hdmi_bpc_possible() from intel_hdmi_deep_color_possible()
> so that we can reuse it for mode validation.
> 

Reviewed-by: José Roberto de Souza <jose.souza at intel.com>

> Cc: Werner Sembach <wse at tuxedocomputers.com>
> Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
> ---
>  drivers/gpu/drm/i915/display/intel_hdmi.c | 46 +++++++++++++----------
>  1 file changed, 27 insertions(+), 19 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c
> index 91b03fe21387..3dec3307c2b5 100644
> --- a/drivers/gpu/drm/i915/display/intel_hdmi.c
> +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c
> @@ -1862,6 +1862,31 @@ static int intel_hdmi_port_clock(int clock, int bpc)
>  	return clock * bpc / 8;
>  }
>  
> +static bool intel_hdmi_bpc_possible(struct drm_connector *connector,
> +				    int bpc, bool has_hdmi_sink, bool ycbcr420_output)
> +{
> +	const struct drm_display_info *info = &connector->display_info;
> +	const struct drm_hdmi_info *hdmi = &info->hdmi;
> +
> +	switch (bpc) {
> +	case 12:
> +		if (ycbcr420_output)
> +			return hdmi->y420_dc_modes & DRM_EDID_YCBCR420_DC_36;
> +		else
> +			return info->edid_hdmi_dc_modes & DRM_EDID_HDMI_DC_36;
> +	case 10:
> +		if (ycbcr420_output)
> +			return hdmi->y420_dc_modes & DRM_EDID_YCBCR420_DC_30;
> +		else
> +			return info->edid_hdmi_dc_modes & DRM_EDID_HDMI_DC_30;
> +	case 8:
> +		return true;
> +	default:
> +		MISSING_CASE(bpc);
> +		return false;
> +	}
> +}
> +
>  static enum drm_mode_status
>  intel_hdmi_mode_clock_valid(struct intel_hdmi *hdmi, int clock, bool has_hdmi_sink)
>  {
> @@ -1951,28 +1976,11 @@ bool intel_hdmi_deep_color_possible(const struct intel_crtc_state *crtc_state,
>  		return false;
>  
>  	for_each_new_connector_in_state(state, connector, connector_state, i) {
> -		const struct drm_display_info *info = &connector->display_info;
> -
>  		if (connector_state->crtc != crtc_state->uapi.crtc)
>  			continue;
>  
> -		if (ycbcr420_output) {
> -			const struct drm_hdmi_info *hdmi = &info->hdmi;
> -
> -			if (bpc == 12 && !(hdmi->y420_dc_modes &
> -					   DRM_EDID_YCBCR420_DC_36))
> -				return false;
> -			else if (bpc == 10 && !(hdmi->y420_dc_modes &
> -						DRM_EDID_YCBCR420_DC_30))
> -				return false;
> -		} else {
> -			if (bpc == 12 && !(info->edid_hdmi_dc_modes &
> -					   DRM_EDID_HDMI_DC_36))
> -				return false;
> -			else if (bpc == 10 && !(info->edid_hdmi_dc_modes &
> -						DRM_EDID_HDMI_DC_30))
> -				return false;
> -		}
> +		if (!intel_hdmi_bpc_possible(connector, bpc, has_hdmi_sink, ycbcr420_output))
> +			return false;
>  	}
>  
>  	return true;