[PATCH 4/6] drm/gud: Split up gud_flush_work()

[Thomas Zimmermann]

Am 22.11.22 um 21:58 schrieb Noralf Trønnes via B4 Submission Endpoint:
> From: Noralf Trønnes <noralf at tronnes.org>
> 
> In preparation for inlining synchronous flushing split out the part of
> gud_flush_work() that can be shared by the sync and async code paths.
> 
> Signed-off-by: Noralf Trønnes <noralf at tronnes.org>

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

> ---
>   drivers/gpu/drm/gud/gud_pipe.c | 72 +++++++++++++++++++++++-------------------
>   1 file changed, 39 insertions(+), 33 deletions(-)
> 
> diff --git a/drivers/gpu/drm/gud/gud_pipe.c b/drivers/gpu/drm/gud/gud_pipe.c
> index ff1358815af5..d2af9947494f 100644
> --- a/drivers/gpu/drm/gud/gud_pipe.c
> +++ b/drivers/gpu/drm/gud/gud_pipe.c
> @@ -333,15 +333,49 @@ void gud_clear_damage(struct gud_device *gdrm)
>   	gdrm->damage.y2 = 0;
>   }
>   
> +static void gud_flush_damage(struct gud_device *gdrm, struct drm_framebuffer *fb,
> +			     struct drm_rect *damage)
> +{
> +	const struct drm_format_info *format;
> +	unsigned int i, lines;
> +	size_t pitch;
> +	int ret;
> +
> +	format = fb->format;
> +	if (format->format == DRM_FORMAT_XRGB8888 && gdrm->xrgb8888_emulation_format)
> +		format = gdrm->xrgb8888_emulation_format;
> +
> +	/* Split update if it's too big */
> +	pitch = drm_format_info_min_pitch(format, 0, drm_rect_width(damage));
> +	lines = drm_rect_height(damage);
> +
> +	if (gdrm->bulk_len < lines * pitch)
> +		lines = gdrm->bulk_len / pitch;
> +
> +	for (i = 0; i < DIV_ROUND_UP(drm_rect_height(damage), lines); i++) {
> +		struct drm_rect rect = *damage;
> +
> +		rect.y1 += i * lines;
> +		rect.y2 = min_t(u32, rect.y1 + lines, damage->y2);
> +
> +		ret = gud_flush_rect(gdrm, fb, format, &rect);
> +		if (ret) {
> +			if (ret != -ENODEV && ret != -ECONNRESET &&
> +			    ret != -ESHUTDOWN && ret != -EPROTO)
> +				dev_err_ratelimited(fb->dev->dev,
> +						    "Failed to flush framebuffer: error=%d\n", ret);
> +			gdrm->prev_flush_failed = true;
> +			break;
> +		}
> +	}
> +}
> +
>   void gud_flush_work(struct work_struct *work)
>   {
>   	struct gud_device *gdrm = container_of(work, struct gud_device, work);
> -	const struct drm_format_info *format;
>   	struct drm_framebuffer *fb;
>   	struct drm_rect damage;
> -	unsigned int i, lines;
> -	int idx, ret = 0;
> -	size_t pitch;
> +	int idx;
>   
>   	if (!drm_dev_enter(&gdrm->drm, &idx))
>   		return;
> @@ -356,35 +390,7 @@ void gud_flush_work(struct work_struct *work)
>   	if (!fb)
>   		goto out;
>   
> -	format = fb->format;
> -	if (format->format == DRM_FORMAT_XRGB8888 && gdrm->xrgb8888_emulation_format)
> -		format = gdrm->xrgb8888_emulation_format;
> -
> -	/* Split update if it's too big */
> -	pitch = drm_format_info_min_pitch(format, 0, drm_rect_width(&damage));
> -	lines = drm_rect_height(&damage);
> -
> -	if (gdrm->bulk_len < lines * pitch)
> -		lines = gdrm->bulk_len / pitch;
> -
> -	for (i = 0; i < DIV_ROUND_UP(drm_rect_height(&damage), lines); i++) {
> -		struct drm_rect rect = damage;
> -
> -		rect.y1 += i * lines;
> -		rect.y2 = min_t(u32, rect.y1 + lines, damage.y2);
> -
> -		ret = gud_flush_rect(gdrm, fb, format, &rect);
> -		if (ret) {
> -			if (ret != -ENODEV && ret != -ECONNRESET &&
> -			    ret != -ESHUTDOWN && ret != -EPROTO)
> -				dev_err_ratelimited(fb->dev->dev,
> -						    "Failed to flush framebuffer: error=%d\n", ret);
> -			gdrm->prev_flush_failed = true;
> -			break;
> -		}
> -
> -		gdrm->prev_flush_failed = false;
> -	}
> +	gud_flush_damage(gdrm, fb, &damage);
>   
>   	drm_framebuffer_put(fb);
>   out:
> 

-- 
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Ivo Totev
-------------- 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/20221123/520e0985/attachment.sig>