From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.2 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C599DC43219 for ; Fri, 17 Sep 2021 15:42:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id ADF6A61244 for ; Fri, 17 Sep 2021 15:42:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241374AbhIQPne (ORCPT ); Fri, 17 Sep 2021 11:43:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53788 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239438AbhIQPnd (ORCPT ); Fri, 17 Sep 2021 11:43:33 -0400 Received: from mail-qk1-x730.google.com (mail-qk1-x730.google.com [IPv6:2607:f8b0:4864:20::730]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BD8C7C061767 for ; Fri, 17 Sep 2021 08:42:11 -0700 (PDT) Received: by mail-qk1-x730.google.com with SMTP id t4so18698692qkb.9 for ; Fri, 17 Sep 2021 08:42:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=poorly.run; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=QZO8NMAjMQkXQJzuQx47mPXuOG2i+pU24PwiydWpDeM=; b=QSUPKbjlIZXzcgl73QzCldp54G6vcvodAvbVZuE3jtlcyyYXYA1Nti1qUlSPg4uUiB 0I/Iq6SJFmn1IttowvF/JMR79YSGKAeBrdjW+CCxmrvXfIWEgMwxsqvKB1QK9GIqGyAV SMJdcHsj5HUav2SDLNCQR71lQwEdIjxJRmaLPa/oBq9kV/9cq2ycR60owTGUyRXWD8tR 5Hnc0X90MeyQI3BmpnJ4dje2o+63d3K8WVZKD+j9pbfPZq/5+ejWGTnPp/Btb9SukgLZ G+5y9BLcPfSxlDAhiL7q3cjZrBKUErLPUu4Rehtr5GHRXT7jxlCqIzodKSNW/8NAP6zY K34w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=QZO8NMAjMQkXQJzuQx47mPXuOG2i+pU24PwiydWpDeM=; b=TXfwVnN7b5gTLId16p+8g971KQXtIrdBHWPTcIwejKOfi0Abi9ZWSGqnE0SGBP2kaB 5q1k94BC3GiFpTM5jFQKeoOwtQeQ8F5Kec35GTaHwLmLw3HcvJUqGOYVIRacDLK1lu0R DvpKvCLIew0gVhzcV2rCsyR/SXDC/p1pBrIcAHHT50DP0ORU4ThriCBQhVg389AWhTVr SJF+ekBSsLK/zT7L4bUuhUy1EwuEnf6UUYTi5oWZHGD1EFf9zBnMBL137u+OzqOo4wJC dZnkR9aYEmPigETJcnjZO8Tpur1RKjskMDDYiB2lAtlIH1HDpvLN/0oeTrZYhb7gEtyu K/sQ== X-Gm-Message-State: AOAM531VShH9Elg25UDP0gASSHBEUOsagyB3rtLpTE9XGxN3JO1/HYfS aNg76ULqSrgYIzIJlr2/XiSUAQ== X-Google-Smtp-Source: ABdhPJwVL52VyuqCVGcaprqDlGNhVkaTAyCEiksVmivD0l81s38J2EgeSKuszuc5vwmoVtFSDEVnAQ== X-Received: by 2002:a05:620a:2185:: with SMTP id g5mr11148090qka.244.1631893330985; Fri, 17 Sep 2021 08:42:10 -0700 (PDT) Received: from localhost ([167.100.64.199]) by smtp.gmail.com with ESMTPSA id p10sm916118qkk.10.2021.09.17.08.42.10 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 17 Sep 2021 08:42:10 -0700 (PDT) Date: Fri, 17 Sep 2021 11:42:09 -0400 From: Sean Paul To: Fernando Ramos 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: [PATCH 10/15] drm/nouveau: cleanup: drm_modeset_lock_all() --> DRM_MODESET_LOCK_ALL_BEGIN() Message-ID: <20210917154209.GK2515@art_vandelay> References: <20210916211552.33490-1-greenfoo@u92.eu> <20210916211552.33490-11-greenfoo@u92.eu> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210916211552.33490-11-greenfoo@u92.eu> User-Agent: Mutt/1.9.4 (2018-02-28) Precedence: bulk List-ID: X-Mailing-List: linux-doc@vger.kernel.org On Thu, Sep 16, 2021 at 11:15:47PM +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 > --- > drivers/gpu/drm/nouveau/dispnv50/disp.c | 12 ++++++++---- > 1 file changed, 8 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c > index d7b9f7f8c9e3..eb613af4cdd5 100644 > --- a/drivers/gpu/drm/nouveau/dispnv50/disp.c > +++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c > @@ -667,15 +667,17 @@ nv50_audio_component_bind(struct device *kdev, struct device *hda_kdev, > struct drm_device *drm_dev = dev_get_drvdata(kdev); > struct nouveau_drm *drm = nouveau_drm(drm_dev); > struct drm_audio_component *acomp = data; > + struct drm_modeset_acquire_ctx ctx; > + int ret; > > if (WARN_ON(!device_link_add(hda_kdev, kdev, DL_FLAG_STATELESS))) > return -ENOMEM; > > - drm_modeset_lock_all(drm_dev); > + DRM_MODESET_LOCK_ALL_BEGIN(drm_dev, ctx, 0, ret); > acomp->ops = &nv50_audio_component_ops; > acomp->dev = kdev; > drm->audio.component = acomp; > - drm_modeset_unlock_all(drm_dev); > + DRM_MODESET_LOCK_ALL_END(drm_dev, ctx, ret); > return 0; Return ret here, with that fixed, Reviewed-by: Sean Paul > } > > @@ -686,12 +688,14 @@ nv50_audio_component_unbind(struct device *kdev, struct device *hda_kdev, > struct drm_device *drm_dev = dev_get_drvdata(kdev); > struct nouveau_drm *drm = nouveau_drm(drm_dev); > struct drm_audio_component *acomp = data; > + struct drm_modeset_acquire_ctx ctx; > + int ret; > > - drm_modeset_lock_all(drm_dev); > + DRM_MODESET_LOCK_ALL_BEGIN(drm_dev, ctx, 0, ret); > drm->audio.component = NULL; > acomp->ops = NULL; > acomp->dev = NULL; > - drm_modeset_unlock_all(drm_dev); > + DRM_MODESET_LOCK_ALL_END(drm_dev, ctx, ret); > } > > static const struct component_ops nv50_audio_component_bind_ops = { > -- > 2.33.0 > -- Sean Paul, Software Engineer, Google / Chromium OS