lkml.org 
[lkml]   [2022]   [Sep]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
SubjectRe: [PATCH v2 11/11] drm/udl: Sync pending URBs at the end of suspend
From
Hi

Am 06.09.22 um 09:39 schrieb Takashi Iwai:
> It's better to perform the sync at the very last of the suspend
> instead of the pipe-disable function, so that we can catch all pending
> URBs (if any).
>
> While we're at it, drop the error code from udl_sync_pending_urb()
> since we basically ignore it; instead, give a clear error message
> indicating a problem.
>
> Signed-off-by: Takashi Iwai <tiwai@suse.de>

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

> ---
> drivers/gpu/drm/udl/udl_drv.c | 8 +++++++-
> drivers/gpu/drm/udl/udl_drv.h | 2 +-
> drivers/gpu/drm/udl/udl_main.c | 6 ++----
> drivers/gpu/drm/udl/udl_modeset.c | 2 --
> 4 files changed, 10 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/udl/udl_drv.c b/drivers/gpu/drm/udl/udl_drv.c
> index 0ba88e5472a9..91effdcefb6d 100644
> --- a/drivers/gpu/drm/udl/udl_drv.c
> +++ b/drivers/gpu/drm/udl/udl_drv.c
> @@ -21,8 +21,14 @@ static int udl_usb_suspend(struct usb_interface *interface,
> pm_message_t message)
> {
> struct drm_device *dev = usb_get_intfdata(interface);
> + int ret;
>
> - return drm_mode_config_helper_suspend(dev);
> + ret = drm_mode_config_helper_suspend(dev);
> + if (ret)
> + return ret;
> +
> + udl_sync_pending_urbs(dev);
> + return 0;
> }
>
> static int udl_usb_resume(struct usb_interface *interface)
> diff --git a/drivers/gpu/drm/udl/udl_drv.h b/drivers/gpu/drm/udl/udl_drv.h
> index d943684b5bbb..b4cc7cc568c7 100644
> --- a/drivers/gpu/drm/udl/udl_drv.h
> +++ b/drivers/gpu/drm/udl/udl_drv.h
> @@ -77,7 +77,7 @@ struct drm_connector *udl_connector_init(struct drm_device *dev);
> struct urb *udl_get_urb(struct drm_device *dev);
>
> int udl_submit_urb(struct drm_device *dev, struct urb *urb, size_t len);
> -int udl_sync_pending_urbs(struct drm_device *dev);
> +void udl_sync_pending_urbs(struct drm_device *dev);
> void udl_urb_completion(struct urb *urb);
>
> int udl_init(struct udl_device *udl);
> diff --git a/drivers/gpu/drm/udl/udl_main.c b/drivers/gpu/drm/udl/udl_main.c
> index 808a5ab5e14e..442080fa1061 100644
> --- a/drivers/gpu/drm/udl/udl_main.c
> +++ b/drivers/gpu/drm/udl/udl_main.c
> @@ -290,10 +290,9 @@ int udl_submit_urb(struct drm_device *dev, struct urb *urb, size_t len)
> }
>
> /* wait until all pending URBs have been processed */
> -int udl_sync_pending_urbs(struct drm_device *dev)
> +void udl_sync_pending_urbs(struct drm_device *dev)
> {
> struct udl_device *udl = to_udl(dev);
> - int ret = 0;
>
> spin_lock_irq(&udl->urbs.lock);
> /* 2 seconds as a sane timeout */
> @@ -301,9 +300,8 @@ int udl_sync_pending_urbs(struct drm_device *dev)
> udl->urbs.available == udl->urbs.count,
> udl->urbs.lock,
> msecs_to_jiffies(2000)))
> - ret = -ETIMEDOUT;
> + drm_err(dev, "Timeout for syncing pending URBs\n");
> spin_unlock_irq(&udl->urbs.lock);
> - return ret;
> }
>
> int udl_init(struct udl_device *udl)
> diff --git a/drivers/gpu/drm/udl/udl_modeset.c b/drivers/gpu/drm/udl/udl_modeset.c
> index 9896c16c74f5..c506fff8f0c4 100644
> --- a/drivers/gpu/drm/udl/udl_modeset.c
> +++ b/drivers/gpu/drm/udl/udl_modeset.c
> @@ -383,8 +383,6 @@ udl_simple_display_pipe_disable(struct drm_simple_display_pipe *pipe)
> buf = udl_dummy_render(buf);
>
> udl_submit_urb(dev, urb, buf - (char *)urb->transfer_buffer);
> -
> - udl_sync_pending_urbs(dev);
> }
>
> static void

--
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
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2022-09-07 09:35    [W:0.240 / U:0.032 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site