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 544A4C4321E for ; Fri, 17 Sep 2021 15:49:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3C91F61244 for ; Fri, 17 Sep 2021 15:49:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343706AbhIQPud (ORCPT ); Fri, 17 Sep 2021 11:50:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55510 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245723AbhIQPuc (ORCPT ); Fri, 17 Sep 2021 11:50:32 -0400 Received: from mail-qt1-x835.google.com (mail-qt1-x835.google.com [IPv6:2607:f8b0:4864:20::835]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B32B1C061766 for ; Fri, 17 Sep 2021 08:49:10 -0700 (PDT) Received: by mail-qt1-x835.google.com with SMTP id b14so9182138qtb.0 for ; Fri, 17 Sep 2021 08:49:10 -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=yNboy2nybDEpZvjijJhKd+CeyrFg+AJ7CoANY2kY7TA=; b=PcnJ/QqxvMhMi9fyasgFvHa/sLaqYyMYOz6DJJFEFQCw9HGFfs7KGZWZUzOBnTccxd 2huaYpg3OXmPPgfhte1FwhCmhiI1kHSKEMbOEuKXXLM0yyR27/Pwox4unL+9FMs1qOyb rIGWayOPNyBFDBUlcmls4Q2wkFtbnCln6p7D2IWxdz6t6c5j5DaRVb2hBnqH5mSKvU1W vZFKE+JlnHA+HCiXhV+958t5hyEY439/W0qFxVKpGnZ4N0z8NlcCs119QpJw+JOP16BX E1zOKeTf6iaVRYQkRIzB3Fs/fdm5Y0Lv7oUvQSoSZhgwoQqhXoMeqfoDChjMr2cxoIxY ZU+Q== 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=yNboy2nybDEpZvjijJhKd+CeyrFg+AJ7CoANY2kY7TA=; b=Ih3kyvtcayvC5JXHcZx1qjJc0WoltX9UTr2neTHqs1CB0jbFvCaSDcI8GgiaY2awUo aD4o1DMS+ZhghSOvyLZw6cm0a3Lz8TKrjGxaUKh+2wOLmI+gObRnhXe3cspPNJytvIlp CT5UNnsek6NP+R2sPdRAhHJaxfSmULyjrtzNrCsY0FbaRnloNsV6KjorqmO2dA30bFPh z/0sMulNf4rYpo97a6lVN97HCnY/nI+zIkW2xbaXnzjxvsrYiKOdDgITa8p2sqU4S96d CMFeargwd8nhCkJLMqdjV3AUEDY/IIsaCT+gDuTRS8XA40MnVvcllo0m7bp6EAH9cHuR ya1Q== X-Gm-Message-State: AOAM531kpJYcR2Ed0iiRInxxPHGUmr6W+FYaXWY2VJzjG5k14+mv4Q1b XGpstLqBkz9zor/KkcfdCY/SYg== X-Google-Smtp-Source: ABdhPJyLyH366vADUu+ohTu5GzEnkgYuK5GA75CUu1ovLPgTG4KG0LqyBAV0jarYEVHHFThFOm/VWg== X-Received: by 2002:ac8:7558:: with SMTP id b24mr11241149qtr.160.1631893749909; Fri, 17 Sep 2021 08:49:09 -0700 (PDT) Received: from localhost ([167.100.64.199]) by smtp.gmail.com with ESMTPSA id c10sm4408958qtb.20.2021.09.17.08.49.09 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 17 Sep 2021 08:49:09 -0700 (PDT) Date: Fri, 17 Sep 2021 11:49:08 -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 13/15] drm/gma500: cleanup: drm_modeset_lock_all() --> DRM_MODESET_LOCK_ALL_BEGIN() Message-ID: <20210917154908.GN2515@art_vandelay> References: <20210916211552.33490-1-greenfoo@u92.eu> <20210916211552.33490-14-greenfoo@u92.eu> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210916211552.33490-14-greenfoo@u92.eu> User-Agent: Mutt/1.9.4 (2018-02-28) Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org 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 > --- > 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 > > #include > +#include > > #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 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=-15.0 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham 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 2ADE1C433EF for ; Fri, 17 Sep 2021 15:49:12 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id ED7C261248 for ; Fri, 17 Sep 2021 15:49:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org ED7C261248 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=poorly.run Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6299D6EE39; Fri, 17 Sep 2021 15:49:11 +0000 (UTC) Received: from mail-qt1-x82d.google.com (mail-qt1-x82d.google.com [IPv6:2607:f8b0:4864:20::82d]) by gabe.freedesktop.org (Postfix) with ESMTPS id BA1F06EE39 for ; Fri, 17 Sep 2021 15:49:10 +0000 (UTC) Received: by mail-qt1-x82d.google.com with SMTP id s32so9091217qtc.12 for ; Fri, 17 Sep 2021 08:49:10 -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=yNboy2nybDEpZvjijJhKd+CeyrFg+AJ7CoANY2kY7TA=; b=PcnJ/QqxvMhMi9fyasgFvHa/sLaqYyMYOz6DJJFEFQCw9HGFfs7KGZWZUzOBnTccxd 2huaYpg3OXmPPgfhte1FwhCmhiI1kHSKEMbOEuKXXLM0yyR27/Pwox4unL+9FMs1qOyb rIGWayOPNyBFDBUlcmls4Q2wkFtbnCln6p7D2IWxdz6t6c5j5DaRVb2hBnqH5mSKvU1W vZFKE+JlnHA+HCiXhV+958t5hyEY439/W0qFxVKpGnZ4N0z8NlcCs119QpJw+JOP16BX E1zOKeTf6iaVRYQkRIzB3Fs/fdm5Y0Lv7oUvQSoSZhgwoQqhXoMeqfoDChjMr2cxoIxY ZU+Q== 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=yNboy2nybDEpZvjijJhKd+CeyrFg+AJ7CoANY2kY7TA=; b=H/HxJkJ1aS0gP5x5fLrm0WCpOVIgsuo8wzXg1PducCYlTMqOhWWq579i43nTGNimND 4RkihVuEAdrgyLoWBGTjAiNuFyi8PfnDmj5TpW5X3Wz16LB2QlK/TaprePIWqqmO4+i7 KTCE8pln/6v9pxi8QRN6pN792t9kvIhtxBYpsxGglhr3Z42K/cVYZyflFdwwV3qGGWpm IRDrzpLGPhiUeyHp4Bc99weXdQdF5NPotjZfVFDQr3CO4wKVP2TUiJ7KRLVuHkk4Vo/v nItl8f8PIz3R5qzf04/sYBEACzI/cBw2BLQHzHaWEFAIJ7mS1jdZ3BXO4xC3OCOVfgG8 iahg== X-Gm-Message-State: AOAM531bwbZifaf0cCjcoAHviDmDaG3mZp52ZIEsg8CxwykZERYz9cKb 8Ak7DlzVRy2BESsSfkT5hc8dnQ== X-Google-Smtp-Source: ABdhPJyLyH366vADUu+ohTu5GzEnkgYuK5GA75CUu1ovLPgTG4KG0LqyBAV0jarYEVHHFThFOm/VWg== X-Received: by 2002:ac8:7558:: with SMTP id b24mr11241149qtr.160.1631893749909; Fri, 17 Sep 2021 08:49:09 -0700 (PDT) Received: from localhost ([167.100.64.199]) by smtp.gmail.com with ESMTPSA id c10sm4408958qtb.20.2021.09.17.08.49.09 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 17 Sep 2021 08:49:09 -0700 (PDT) Date: Fri, 17 Sep 2021 11:49:08 -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 Message-ID: <20210917154908.GN2515@art_vandelay> References: <20210916211552.33490-1-greenfoo@u92.eu> <20210916211552.33490-14-greenfoo@u92.eu> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210916211552.33490-14-greenfoo@u92.eu> User-Agent: Mutt/1.9.4 (2018-02-28) Subject: Re: [Nouveau] [PATCH 13/15] drm/gma500: cleanup: drm_modeset_lock_all() --> DRM_MODESET_LOCK_ALL_BEGIN() X-BeenThere: nouveau@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Nouveau development list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: nouveau-bounces@lists.freedesktop.org Sender: "Nouveau" 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 > --- > 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 > > #include > +#include > > #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 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=-15.0 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,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 E1810C43217 for ; Fri, 17 Sep 2021 15:49:13 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B5DB961244 for ; Fri, 17 Sep 2021 15:49:13 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org B5DB961244 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=poorly.run Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 930746EE3B; Fri, 17 Sep 2021 15:49:11 +0000 (UTC) Received: from mail-qt1-x82c.google.com (mail-qt1-x82c.google.com [IPv6:2607:f8b0:4864:20::82c]) by gabe.freedesktop.org (Postfix) with ESMTPS id BC9D06EE3B for ; Fri, 17 Sep 2021 15:49:10 +0000 (UTC) Received: by mail-qt1-x82c.google.com with SMTP id d11so9136626qtw.3 for ; Fri, 17 Sep 2021 08:49:10 -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=yNboy2nybDEpZvjijJhKd+CeyrFg+AJ7CoANY2kY7TA=; b=PcnJ/QqxvMhMi9fyasgFvHa/sLaqYyMYOz6DJJFEFQCw9HGFfs7KGZWZUzOBnTccxd 2huaYpg3OXmPPgfhte1FwhCmhiI1kHSKEMbOEuKXXLM0yyR27/Pwox4unL+9FMs1qOyb rIGWayOPNyBFDBUlcmls4Q2wkFtbnCln6p7D2IWxdz6t6c5j5DaRVb2hBnqH5mSKvU1W vZFKE+JlnHA+HCiXhV+958t5hyEY439/W0qFxVKpGnZ4N0z8NlcCs119QpJw+JOP16BX E1zOKeTf6iaVRYQkRIzB3Fs/fdm5Y0Lv7oUvQSoSZhgwoQqhXoMeqfoDChjMr2cxoIxY ZU+Q== 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=yNboy2nybDEpZvjijJhKd+CeyrFg+AJ7CoANY2kY7TA=; b=0Hzg80gqq1QKBrLM7vX4oLSVpQqdtRK+1ooVCZIQ4YQWnPPvCBDYFlVl024GWz1jsP x9T9yC5qFw9O10R7lsPBeM4IlEz2/xW+DnU3NwhzPUk5HO/hxKvUIZgyCIwNzjOmODMX lIDNBs4i0S8XqglnZqW9pmkdUzE8e7UhKS//kU1Lv/nb/P5KVmNs8YnBPb2T8zW6HRZn bKiqSgjFvfvCs/UK6jYgtq036L584ylTFvXCS8VNWlJOOzvoOn/uWifjc1sm2ctvTOq/ cDEudxVIax5vlshfosDLUghWbgZso0JrXWr/5CK9TF3DHvMS2kvakH1wnOVzUGQp6rMM HlQw== X-Gm-Message-State: AOAM5302wdH+0XT2ic9/rV3K6DB3tjZJth8tBZFgqtg3GRbStyVxh7PT nQLw48Lw5F8QIE6nKuP1McAXnqpO+PN5WA== X-Google-Smtp-Source: ABdhPJyLyH366vADUu+ohTu5GzEnkgYuK5GA75CUu1ovLPgTG4KG0LqyBAV0jarYEVHHFThFOm/VWg== X-Received: by 2002:ac8:7558:: with SMTP id b24mr11241149qtr.160.1631893749909; Fri, 17 Sep 2021 08:49:09 -0700 (PDT) Received: from localhost ([167.100.64.199]) by smtp.gmail.com with ESMTPSA id c10sm4408958qtb.20.2021.09.17.08.49.09 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 17 Sep 2021 08:49:09 -0700 (PDT) Date: Fri, 17 Sep 2021 11:49:08 -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 Message-ID: <20210917154908.GN2515@art_vandelay> References: <20210916211552.33490-1-greenfoo@u92.eu> <20210916211552.33490-14-greenfoo@u92.eu> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210916211552.33490-14-greenfoo@u92.eu> User-Agent: Mutt/1.9.4 (2018-02-28) Subject: Re: [Intel-gfx] [PATCH 13/15] drm/gma500: cleanup: drm_modeset_lock_all() --> DRM_MODESET_LOCK_ALL_BEGIN() X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" 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 > --- > 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 > > #include > +#include > > #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