From: Daniel Vetter <daniel@ffwll.ch>
To: Joseph Schulte <joeschulte.js@gmail.com>
Cc: tzimmermann@suse.de, dri-devel@lists.freedesktop.org
Subject: Re: [PATCH] drm: replace drm_modeset_lock_all() in drm_client_modeset_dpms_legacy()
Date: Tue, 2 Feb 2021 16:18:41 +0100 [thread overview]
Message-ID: <YBltUVYGd+3Y2o5L@phenom.ffwll.local> (raw)
In-Reply-To: <20210125144815.8389-1-joeschulte.js@gmail.com>
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.js@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 <airlied@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
prev parent reply other threads:[~2021-02-02 15:18 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-25 14:48 [PATCH] drm: replace drm_modeset_lock_all() in drm_client_modeset_dpms_legacy() Joseph Schulte
2021-02-02 15:18 ` Daniel Vetter [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YBltUVYGd+3Y2o5L@phenom.ffwll.local \
--to=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=joeschulte.js@gmail.com \
--cc=tzimmermann@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.