On Mon, Jan 25, 2021 at 08:48:15AM -0600, Joseph Schulte wrote:
> This patch helps complete Use DRM_MODESET_LOCK_ALL* helpers instead of
> boilerplate todo in Documentation/gpu/todo.rst
>
> Signed-off-by: Joseph Schulte <joeschulte...@gmail.com>
Applied to drm-misc-next, thanks for your patch.
-Daniel
> ---
> drivers/gpu/drm/drm_client_modeset.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_client_modeset.c
> b/drivers/gpu/drm/drm_client_modeset.c
> index b7e9e1c2564c..ced09c7c06f9 100644
> --- a/drivers/gpu/drm/drm_client_modeset.c
> +++ b/drivers/gpu/drm/drm_client_modeset.c
> @@ -7,6 +7,7 @@
> * Copyright (c) 2007 Dave Airlie <airl...@linux.ie>
> */
>
> +#include "drm/drm_modeset_lock.h"
> #include <linux/module.h>
> #include <linux/mutex.h>
> #include <linux/slab.h>
> @@ -1181,9 +1182,11 @@ static void drm_client_modeset_dpms_legacy(struct
> drm_client_dev *client, int dp
> struct drm_device *dev = client->dev;
> struct drm_connector *connector;
> struct drm_mode_set *modeset;
> + struct drm_modeset_acquire_ctx ctx;
> int j;
> + int ret;
>
> - drm_modeset_lock_all(dev);
> + DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, 0, ret);
> drm_client_for_each_modeset(modeset, client) {
> if (!modeset->crtc->enabled)
> continue;
> @@ -1195,7 +1198,7 @@ static void drm_client_modeset_dpms_legacy(struct
> drm_client_dev *client, int dp
> dev->mode_config.dpms_property, dpms_mode);
> }
> }
> - drm_modeset_unlock_all(dev);
> + DRM_MODESET_LOCK_ALL_END(dev, ctx, ret);
> }
>
> /**
> --
> 2.30.0
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
