nouveau.lists.freedesktop.org archive mirror
 help / color / mirror / Atom feed
From: Sean Paul <sean@poorly.run>
To: Fernando Ramos <greenfoo@u92.eu>
Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org,
	sean@poorly.run, linux-doc@vger.kernel.org,
	amd-gfx@lists.freedesktop.org, intel-gfx@lists.freedesktop.org,
	linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org,
	nouveau@lists.freedesktop.org, linux-renesas-soc@vger.kernel.org,
	linux-tegra@vger.kernel.org
Subject: Re: [Nouveau] [PATCH 13/15] drm/gma500: cleanup: drm_modeset_lock_all() --> DRM_MODESET_LOCK_ALL_BEGIN()
Date: Fri, 17 Sep 2021 11:49:08 -0400	[thread overview]
Message-ID: <20210917154908.GN2515@art_vandelay> (raw)
In-Reply-To: <20210916211552.33490-14-greenfoo@u92.eu>

On Thu, Sep 16, 2021 at 11:15:50PM +0200, Fernando Ramos wrote:
> As requested in Documentation/gpu/todo.rst, replace driver calls to
> drm_modeset_lock_all() with DRM_MODESET_LOCK_ALL_BEGIN() and
> DRM_MODESET_LOCK_ALL_END()
> 
> Signed-off-by: Fernando Ramos <greenfoo@u92.eu>
> ---
>  drivers/gpu/drm/gma500/psb_device.c | 14 ++++++++++----
>  1 file changed, 10 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/gpu/drm/gma500/psb_device.c b/drivers/gpu/drm/gma500/psb_device.c
> index 951725a0f7a3..4e27f65a1f16 100644
> --- a/drivers/gpu/drm/gma500/psb_device.c
> +++ b/drivers/gpu/drm/gma500/psb_device.c
> @@ -8,6 +8,7 @@
>  #include <linux/backlight.h>
>  
>  #include <drm/drm.h>
> +#include <drm/drm_drv.h>
>  
>  #include "gma_device.h"
>  #include "intel_bios.h"
> @@ -169,8 +170,10 @@ static int psb_save_display_registers(struct drm_device *dev)
>  {
>  	struct drm_psb_private *dev_priv = dev->dev_private;
>  	struct drm_crtc *crtc;
> +	struct drm_modeset_acquire_ctx ctx;
>  	struct gma_connector *connector;
>  	struct psb_state *regs = &dev_priv->regs.psb;
> +	int ret;
>  
>  	/* Display arbitration control + watermarks */
>  	regs->saveDSPARB = PSB_RVDC32(DSPARB);
> @@ -183,7 +186,7 @@ static int psb_save_display_registers(struct drm_device *dev)
>  	regs->saveCHICKENBIT = PSB_RVDC32(DSPCHICKENBIT);
>  
>  	/* Save crtc and output state */
> -	drm_modeset_lock_all(dev);
> +	DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, 0, ret);
>  	list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
>  		if (drm_helper_crtc_in_use(crtc))
>  			dev_priv->ops->save_crtc(crtc);
> @@ -193,7 +196,8 @@ static int psb_save_display_registers(struct drm_device *dev)
>  		if (connector->save)
>  			connector->save(&connector->base);
>  
> -	drm_modeset_unlock_all(dev);
> +	DRM_MODESET_LOCK_ALL_END(dev, ctx, ret);
> +
>  	return 0;

Return ret here please

>  }
>  
> @@ -207,8 +211,10 @@ static int psb_restore_display_registers(struct drm_device *dev)
>  {
>  	struct drm_psb_private *dev_priv = dev->dev_private;
>  	struct drm_crtc *crtc;
> +	struct drm_modeset_acquire_ctx ctx;
>  	struct gma_connector *connector;
>  	struct psb_state *regs = &dev_priv->regs.psb;
> +	int ret;
>  
>  	/* Display arbitration + watermarks */
>  	PSB_WVDC32(regs->saveDSPARB, DSPARB);
> @@ -223,7 +229,7 @@ static int psb_restore_display_registers(struct drm_device *dev)
>  	/*make sure VGA plane is off. it initializes to on after reset!*/
>  	PSB_WVDC32(0x80000000, VGACNTRL);
>  
> -	drm_modeset_lock_all(dev);
> +	DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, 0, ret);
>  	list_for_each_entry(crtc, &dev->mode_config.crtc_list, head)
>  		if (drm_helper_crtc_in_use(crtc))
>  			dev_priv->ops->restore_crtc(crtc);
> @@ -232,7 +238,7 @@ static int psb_restore_display_registers(struct drm_device *dev)
>  		if (connector->restore)
>  			connector->restore(&connector->base);
>  
> -	drm_modeset_unlock_all(dev);
> +	DRM_MODESET_LOCK_ALL_END(dev, ctx, ret);
>  	return 0;

Here too

>  }
>  
> -- 
> 2.33.0
> 

-- 
Sean Paul, Software Engineer, Google / Chromium OS

  reply	other threads:[~2021-09-17 15:49 UTC|newest]

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-16 21:15 [Nouveau] [PATCH 00/15] drm: cleanup: Use DRM_MODESET_LOCK_ALL_* helpers where possible Fernando Ramos
2021-09-16 21:15 ` [Nouveau] [PATCH 01/15] dmr: cleanup: drm_modeset_lock_all_ctx() --> DRM_MODESET_LOCK_ALL_BEGIN() Fernando Ramos
2021-09-17 15:28   ` Sean Paul
2021-09-17 22:07     ` Fernando Ramos
2021-09-16 21:15 ` [Nouveau] [PATCH 02/15] dmr/i915: " Fernando Ramos
2021-09-17 15:31   ` Sean Paul
2021-09-16 21:15 ` [Nouveau] [PATCH 03/15] dmr/msm: " Fernando Ramos
2021-09-17 15:29   ` Sean Paul
2021-09-20  1:54   ` kernel test robot
2021-09-20 21:25     ` Fernando Ramos
2021-09-16 21:15 ` [Nouveau] [PATCH 04/15] drm: cleanup: drm_modeset_lock_all() " Fernando Ramos
2021-09-17 15:35   ` Sean Paul
2021-09-16 21:15 ` [Nouveau] [PATCH 05/15] drm/vmwgfx: " Fernando Ramos
2021-09-17 15:37   ` Sean Paul
2021-09-16 21:15 ` [Nouveau] [PATCH 06/15] drm/tegra: " Fernando Ramos
2021-09-17 15:38   ` Sean Paul
2021-09-17 22:34     ` Fernando Ramos
2021-09-16 21:15 ` [Nouveau] [PATCH 07/15] drm/shmobile: " Fernando Ramos
2021-09-17 15:38   ` Sean Paul
2021-09-16 21:15 ` [Nouveau] [PATCH 08/15] drm/radeon: " Fernando Ramos
2021-09-17 15:40   ` Sean Paul
2021-09-17 22:32     ` Fernando Ramos
2021-09-16 21:15 ` [Nouveau] [PATCH 09/15] drm/omapdrm: " Fernando Ramos
2021-09-17 15:40   ` Sean Paul
2021-09-17 15:41   ` Sean Paul
2021-09-17 22:37     ` Fernando Ramos
2021-09-16 21:15 ` [Nouveau] [PATCH 10/15] drm/nouveau: " Fernando Ramos
2021-09-17 15:42   ` Sean Paul
2021-09-16 21:15 ` [Nouveau] [PATCH 11/15] drm/msm: " Fernando Ramos
2021-09-17 15:42   ` Sean Paul
2021-09-17 22:41     ` Fernando Ramos
2021-09-16 21:15 ` [Nouveau] [PATCH 12/15] drm/i915: " Fernando Ramos
2021-09-17 15:48   ` Sean Paul
2021-09-17 22:57     ` Fernando Ramos
2021-09-16 21:15 ` [Nouveau] [PATCH 13/15] drm/gma500: " Fernando Ramos
2021-09-17 15:49   ` Sean Paul [this message]
2021-09-16 21:15 ` [Nouveau] [PATCH 14/15] drm/amd: " Fernando Ramos
2021-09-17 15:55   ` Sean Paul
2021-09-17 23:17     ` Fernando Ramos
2021-09-18  9:42       ` Fernando Ramos
2021-09-16 21:15 ` [Nouveau] [PATCH 15/15] doc: drm: remove TODO entry regarding DRM_MODSET_LOCK_ALL cleanup Fernando Ramos
2021-09-17 15:56   ` Sean Paul
2021-09-17 23:21     ` Fernando Ramos
2021-09-17 15:24 ` [Nouveau] [PATCH 00/15] drm: cleanup: Use DRM_MODESET_LOCK_ALL_* helpers where possible Daniel Vetter
2021-09-17 21:41   ` Fernando Ramos

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=20210917154908.GN2515@art_vandelay \
    --to=sean@poorly.run \
    --cc=amd-gfx@lists.freedesktop.org \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=freedreno@lists.freedesktop.org \
    --cc=greenfoo@u92.eu \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=linux-arm-msm@vger.kernel.org \
    --cc=linux-doc@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-renesas-soc@vger.kernel.org \
    --cc=linux-tegra@vger.kernel.org \
    --cc=nouveau@lists.freedesktop.org \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).