[PATCH 17/18] drm/vc4: hdmi: Move the pixel rate calculation to a helper

[Thomas Zimmermann]

Am 17.03.21 um 16:43 schrieb Maxime Ripard:
> In order to implement a fallback mechanism to YUV422 when the pixel rate
> is too high, let's move the pixel rate computation to a function of its
> own that will be shared across two functions.
> 
> Signed-off-by: Maxime Ripard <maxime at cerno.tech>

Acked-by: Thomas Zimmermann <tzimmermann at suse.de>

> ---
>   drivers/gpu/drm/vc4/vc4_hdmi.c | 36 +++++++++++++++++++++++-----------
>   1 file changed, 25 insertions(+), 11 deletions(-)
> 
> diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
> index 407b468dab67..c4f91d39d91c 100644
> --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
> +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
> @@ -991,22 +991,16 @@ static void vc4_hdmi_bridge_post_crtc_enable(struct drm_bridge *bridge,
>   #define WIFI_2_4GHz_CH1_MIN_FREQ	2400000000ULL
>   #define WIFI_2_4GHz_CH1_MAX_FREQ	2422000000ULL
>   
> -static int vc4_hdmi_bridge_atomic_check(struct drm_bridge *bridge,
> -					struct drm_bridge_state *bridge_state,
> -					struct drm_crtc_state *crtc_state,
> -					struct drm_connector_state *conn_state)
> +static unsigned long vc4_hdmi_calc_pixel_rate(struct drm_bridge *bridge,
> +					      struct drm_bridge_state *bridge_state,
> +					      struct drm_crtc_state *crtc_state,
> +					      struct drm_connector_state *conn_state)
>   {
> -	struct vc4_hdmi_connector_state *vc4_state = conn_state_to_vc4_hdmi_conn_state(conn_state);
>   	struct drm_display_mode *mode = &crtc_state->adjusted_mode;
> -	struct vc4_hdmi *vc4_hdmi = bridge_to_vc4_hdmi(bridge);
>   	unsigned long long pixel_rate = mode->clock * 1000;
> +	struct vc4_hdmi *vc4_hdmi = bridge_to_vc4_hdmi(bridge);
>   	unsigned long long tmds_rate;
>   
> -	if (vc4_hdmi->variant->unsupported_odd_h_timings &&
> -	    ((mode->hdisplay % 2) || (mode->hsync_start % 2) ||
> -	     (mode->hsync_end % 2) || (mode->htotal % 2)))
> -		return -EINVAL;
> -
>   	/*
>   	 * The 1440p at 60 pixel rate is in the same range than the first
>   	 * WiFi channel (between 2.4GHz and 2.422GHz with 22MHz
> @@ -1032,6 +1026,26 @@ static int vc4_hdmi_bridge_atomic_check(struct drm_bridge *bridge,
>   	if (mode->flags & DRM_MODE_FLAG_DBLCLK)
>   		pixel_rate = pixel_rate * 2;
>   
> +	return pixel_rate;
> +}
> +
> +static int vc4_hdmi_bridge_atomic_check(struct drm_bridge *bridge,
> +					struct drm_bridge_state *bridge_state,
> +					struct drm_crtc_state *crtc_state,
> +					struct drm_connector_state *conn_state)
> +{
> +	struct vc4_hdmi *vc4_hdmi = bridge_to_vc4_hdmi(bridge);
> +	struct vc4_hdmi_connector_state *vc4_state =
> +		conn_state_to_vc4_hdmi_conn_state(conn_state);
> +	struct drm_display_mode *mode = &crtc_state->adjusted_mode;
> +	unsigned long long pixel_rate;
> +
> +	if (vc4_hdmi->variant->unsupported_odd_h_timings &&
> +	    ((mode->hdisplay % 2) || (mode->hsync_start % 2) ||
> +	     (mode->hsync_end % 2) || (mode->htotal % 2)))
> +		return -EINVAL;
> +
> +	pixel_rate = vc4_hdmi_calc_pixel_rate(bridge, bridge_state, crtc_state, conn_state);
>   	if (pixel_rate > vc4_hdmi->variant->max_pixel_clock)
>   		return -EINVAL;
>   
> 

-- 
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Felix Imendörffer

-------------- next part --------------
A non-text attachment was scrubbed...
Name: OpenPGP_signature
Type: application/pgp-signature
Size: 840 bytes
Desc: OpenPGP digital signature
URL: <https://lists.freedesktop.org/archives/dri-devel/attachments/20210415/102f6a00/attachment.sig>