Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp2393854pxb; Fri, 17 Sep 2021 08:48:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyW7QvfxkFj8ARI35O38oM28RjDw7JdQzGNwsDKMR5rdvVcHkkZ3Pjlyaeug0jmNnwbTG0v X-Received: by 2002:aa7:d814:: with SMTP id v20mr13435124edq.169.1631893739450; Fri, 17 Sep 2021 08:48:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631893739; cv=none; d=google.com; s=arc-20160816; b=QSAA+jtaRubvIod5QTPptA2m/QnU3Fh1X0lIws2Md/FPKJ0vRdTNP3nVPaqAZKHZG+ dqDS2XEVxW5gKAvyuM+7+OpheYOVR8Lib7WUnGsWhgUj/Pnmy1J+4+pbPc/DmPc0h3ts 9PUbIqE238NFq4WxA1A96IIAPLK4io1sXScntES7OCa9oLRgTkAwsuajg3Jg9RS2nNAG WiIlfnK43myHnrj6G4CtoJ8qguhURgM0aEp1zRNUnUw9Nh3eYNrL50tWKlKWYpzukLY8 X16C8SwKRnptibNjAiCSQKpYd3SZg7DjHKOdGSCZJPQGsWAv1bsGQeWaO4VVDp5q8qFa dwTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:user-agent:in-reply-to:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :dkim-signature; bh=m0dCFB/mfZ3NoW8jcV3Ey7Co+ujM9o+NXfiHm7bltGo=; b=zjN+T3Cz1hOrsMfFwT+lvVw9yl8/pP2sSZKz6Mi4vvZuipn7UVykIvzfx8Zmc+PoAO A/FjkVUyZBh34qkrHrGeWqmtFlfZMrSBsYtNQe4OrwhKoxbdpbmicwIeK8Jux2jobV4T cWs8FLNHNyOv4qQnY22PrAmhZyIcIMawGhFzlc23E2pw3vw0asdWVAWt11rSTkVEhILE dYpsZfMe9kvPKPCewuPVzXQb13DxQU/kvKAH3Ys4Il+YvRXD3hhswwHb0qKP5YLIhm+K y9jsBlHSkrKniPuAfeniff6aNzJ+xG/iVRHZOKBbvTh8NIXpIsjzSMjMTy/8pceTu8uM QCBw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@poorly.run header.s=google header.b=F8nNi3y2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id b1si7345833ejl.25.2021.09.17.08.48.30; Fri, 17 Sep 2021 08:48:59 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@poorly.run header.s=google header.b=F8nNi3y2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244376AbhIQPoS (ORCPT + 99 others); Fri, 17 Sep 2021 11:44:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53966 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243443AbhIQPoP (ORCPT ); Fri, 17 Sep 2021 11:44:15 -0400 Received: from mail-qk1-x72b.google.com (mail-qk1-x72b.google.com [IPv6:2607:f8b0:4864:20::72b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9322BC061767 for ; Fri, 17 Sep 2021 08:42:52 -0700 (PDT) Received: by mail-qk1-x72b.google.com with SMTP id y144so18735582qkb.6 for ; Fri, 17 Sep 2021 08:42:52 -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=m0dCFB/mfZ3NoW8jcV3Ey7Co+ujM9o+NXfiHm7bltGo=; b=F8nNi3y2k7UHCutwkJnFaKCmLrIPkAilYWnn8NJfGMKZdgWTNzSRB41BT8XEaF4EN9 zOqDbAw5kNzn0+XX5xgzKH7Z+5F3OSvxQf+Da/YnNgbXHoCpcdAqvqZ89foRH4ceGuR9 4MrUsTpwBBhQ716EZr0jkZaf/pHgWVEWLAEG9EPUIOG5kGq06LEEzsgiFXGPZF250+gq 20HCNXynRp2jJEyHbBqtLHvXdrUHfmgV3H8J14hbv2sXxLeZxXf4JQyMM2a98i0fBNiZ zWdZ84jgIMcG6m/w+H3U8iTX8s6PosdiH+IDiKj3/nfb7JLb9ntMCfEaZDTkXALQ/oRu w5Cg== 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=m0dCFB/mfZ3NoW8jcV3Ey7Co+ujM9o+NXfiHm7bltGo=; b=QY9XHH9HvOE65RmMz64NTQNH3gpZPwARPPeCgdkB8UBX49cqCbNJZKA6PH4YzjH+LV H8Pck+4jLnRNgRiuoa8KsaCg3lyFcej4AMh0AK9lCFSa2c2jeBLVoM4VMA9y3SfL9elI +6nLskzGgpcfRo8+6RBvrK6dYW9GObgbg/90CMe7qUdm5Zo3N99fjeBVWzNr6bDBdIAK WQhoTpPtBk3WW/mjm2KLSbOXZN9g+MKkvN6qYEFCyhvkHhpqZ4uH4k2X7O+0/bsWSY9p 1JVSHR3ELgyP4bOVC0OMtZxbb/+ZhU96y7rrZRTw8YmhgREjX1A63fE6mrFLUT7r/I4B F6kw== X-Gm-Message-State: AOAM532VjI+EGTHlx/2QFOQ2HMsPPBWSZeHSqWcZaOZQMjODiekbxvz+ apmcqBaUNYe+CbEXUvSosij2yQ== X-Received: by 2002:a05:620a:c4d:: with SMTP id u13mr11076334qki.411.1631893371837; Fri, 17 Sep 2021 08:42:51 -0700 (PDT) Received: from localhost ([167.100.64.199]) by smtp.gmail.com with ESMTPSA id z6sm4242154qtq.78.2021.09.17.08.42.51 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 17 Sep 2021 08:42:51 -0700 (PDT) Date: Fri, 17 Sep 2021 11:42:50 -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 11/15] drm/msm: cleanup: drm_modeset_lock_all() --> DRM_MODESET_LOCK_ALL_BEGIN() Message-ID: <20210917154250.GL2515@art_vandelay> References: <20210916211552.33490-1-greenfoo@u92.eu> <20210916211552.33490-12-greenfoo@u92.eu> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210916211552.33490-12-greenfoo@u92.eu> User-Agent: Mutt/1.9.4 (2018-02-28) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Sep 16, 2021 at 11:15:48PM +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/msm/disp/dpu1/dpu_crtc.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c > index 768012243b44..4cbc79eaee17 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c > @@ -1172,14 +1172,16 @@ static int _dpu_debugfs_status_show(struct seq_file *s, void *data) > struct drm_display_mode *mode; > struct drm_framebuffer *fb; > struct drm_plane_state *state; > + struct drm_modeset_acquire_ctx ctx; > struct dpu_crtc_state *cstate; > > int i, out_width; > + int ret; Please put ret with i & out_width > > dpu_crtc = s->private; > crtc = &dpu_crtc->base; > > - drm_modeset_lock_all(crtc->dev); > + DRM_MODESET_LOCK_ALL_BEGIN(crtc->dev, ctx, 0, ret); > cstate = to_dpu_crtc_state(crtc->state); > > mode = &crtc->state->adjusted_mode; > @@ -1263,7 +1265,7 @@ static int _dpu_debugfs_status_show(struct seq_file *s, void *data) > dpu_crtc->vblank_cb_time = ktime_set(0, 0); > } > > - drm_modeset_unlock_all(crtc->dev); > + DRM_MODESET_LOCK_ALL_END(crtc->dev, ctx, ret); > > return 0; Return ret here > } > -- > 2.33.0 > -- Sean Paul, Software Engineer, Google / Chromium OS