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=-9.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 81B2EC4363D for ; Wed, 21 Oct 2020 00:49:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1C40C22251 for ; Wed, 21 Oct 2020 00:49:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=mg.codeaurora.org header.i=@mg.codeaurora.org header.b="qP/wzNaF" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2439768AbgJUAtt (ORCPT ); Tue, 20 Oct 2020 20:49:49 -0400 Received: from z5.mailgun.us ([104.130.96.5]:52660 "EHLO z5.mailgun.us" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2439760AbgJUAts (ORCPT ); Tue, 20 Oct 2020 20:49:48 -0400 DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=mg.codeaurora.org; q=dns/txt; s=smtp; t=1603241388; h=Message-ID: References: In-Reply-To: Subject: Cc: To: From: Date: Content-Transfer-Encoding: Content-Type: MIME-Version: Sender; bh=3XFNLBbM72ThQINa/MBg5gJYLpGf8UCxBG+6itIFgOM=; b=qP/wzNaFqYJKtDdVDYP8xQB0aoGZlcwrZMyaRMVb3mxPiAg30j7hGYv5WjDpDsWO6DIkvrxL va3shwkqof/V3lvg6J1Xdgq4KhzrnKJjdVddPNAq+09r4WSBaATjrX6EyTxb/eWnFfTBa9ua p4M7lviKI7ITIKavNdsfNaMMTU0= X-Mailgun-Sending-Ip: 104.130.96.5 X-Mailgun-Sid: WyI0MWYwYSIsICJsaW51eC1rZXJuZWxAdmdlci5rZXJuZWwub3JnIiwgImJlOWU0YSJd Received: from smtp.codeaurora.org (ec2-35-166-182-171.us-west-2.compute.amazonaws.com [35.166.182.171]) by smtp-out-n01.prod.us-east-1.postgun.com with SMTP id 5f8f855b588858a3047e8bd8 (version=TLS1.2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256); Wed, 21 Oct 2020 00:48:27 GMT Sender: abhinavk=codeaurora.org@mg.codeaurora.org Received: by smtp.codeaurora.org (Postfix, from userid 1001) id 8AD8FC433F1; Wed, 21 Oct 2020 00:48:26 +0000 (UTC) Received: from mail.codeaurora.org (localhost.localdomain [127.0.0.1]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: abhinavk) by smtp.codeaurora.org (Postfix) with ESMTPSA id 69F87C433C9; Wed, 21 Oct 2020 00:48:24 +0000 (UTC) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit Date: Tue, 20 Oct 2020 17:48:24 -0700 From: abhinavk@codeaurora.org To: Rob Clark Cc: dri-devel@lists.freedesktop.org, Rob Clark , Krishna Manikandan , Thomas Zimmermann , David Airlie , "open list:DRM DRIVER FOR MSM ADRENO GPU" , Maarten Lankhorst , open list , Maxime Ripard , Daniel Vetter , "open list:DRM DRIVER FOR MSM ADRENO GPU" , Sean Paul Subject: Re: [Freedreno] [PATCH] drm/msm/atomic: Drop per-CRTC locks in reverse order In-Reply-To: <20201020222600.264876-1-robdclark@gmail.com> References: <20201020222600.264876-1-robdclark@gmail.com> Message-ID: <185473dc6ac6abc9a343db07a1031170@codeaurora.org> X-Sender: abhinavk@codeaurora.org User-Agent: Roundcube Webmail/1.3.9 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2020-10-20 15:26, Rob Clark wrote: > From: Rob Clark > > lockdep dislikes seeing locks unwound in a non-nested fashion. > > Fixes: 37c2016e3608 ("drm/msm: Fix race condition in msm driver with > async layer updates") > Signed-off-by: Rob Clark Reviewed-by: Abhinav Kumar > --- > drivers/gpu/drm/msm/msm_atomic.c | 2 +- > drivers/gpu/drm/msm/msm_kms.h | 4 ++++ > include/drm/drm_crtc.h | 10 ++++++++++ > 3 files changed, 15 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/msm/msm_atomic.c > b/drivers/gpu/drm/msm/msm_atomic.c > index b03d6ab6b19b..6a326761dc4a 100644 > --- a/drivers/gpu/drm/msm/msm_atomic.c > +++ b/drivers/gpu/drm/msm/msm_atomic.c > @@ -67,7 +67,7 @@ static void unlock_crtcs(struct msm_kms *kms, > unsigned int crtc_mask) > { > struct drm_crtc *crtc; > > - for_each_crtc_mask(kms->dev, crtc, crtc_mask) > + for_each_crtc_mask_reverse(kms->dev, crtc, crtc_mask) > mutex_unlock(&kms->commit_lock[drm_crtc_index(crtc)]); > } > > diff --git a/drivers/gpu/drm/msm/msm_kms.h > b/drivers/gpu/drm/msm/msm_kms.h > index 8d3e626c9fee..d8151a89e163 100644 > --- a/drivers/gpu/drm/msm/msm_kms.h > +++ b/drivers/gpu/drm/msm/msm_kms.h > @@ -211,4 +211,8 @@ int dpu_mdss_init(struct drm_device *dev); > drm_for_each_crtc(crtc, dev) \ > for_each_if (drm_crtc_mask(crtc) & (crtc_mask)) > > +#define for_each_crtc_mask_reverse(dev, crtc, crtc_mask) \ > + drm_for_each_crtc_reverse(crtc, dev) \ > + for_each_if (drm_crtc_mask(crtc) & (crtc_mask)) > + > #endif /* __MSM_KMS_H__ */ > diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h > index dfdb04619b0d..25f5958f2882 100644 > --- a/include/drm/drm_crtc.h > +++ b/include/drm/drm_crtc.h > @@ -1274,4 +1274,14 @@ static inline struct drm_crtc > *drm_crtc_find(struct drm_device *dev, > #define drm_for_each_crtc(crtc, dev) \ > list_for_each_entry(crtc, &(dev)->mode_config.crtc_list, head) > > +/** > + * drm_for_each_crtc_reverse - iterate over all CRTCs in reverse order > + * @crtc: a &struct drm_crtc as the loop cursor > + * @dev: the &struct drm_device > + * > + * Iterate over all CRTCs of @dev. > + */ > +#define drm_for_each_crtc_reverse(crtc, dev) \ > + list_for_each_entry_reverse(crtc, &(dev)->mode_config.crtc_list, > head) > + > #endif /* __DRM_CRTC_H__ */