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.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 49B6EC433E2 for ; Thu, 17 Sep 2020 13:15:46 +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 D3402204FD for ; Thu, 17 Sep 2020 13:15:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="bI0SHrfG" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D3402204FD Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 041616EC44; Thu, 17 Sep 2020 13:15:44 +0000 (UTC) Received: from mail-oi1-x242.google.com (mail-oi1-x242.google.com [IPv6:2607:f8b0:4864:20::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4826E6EC44 for ; Thu, 17 Sep 2020 13:15:43 +0000 (UTC) Received: by mail-oi1-x242.google.com with SMTP id y6so2409101oie.5 for ; Thu, 17 Sep 2020 06:15:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=CREpsFwnlRokcG6H35zF+6z20U4xUwHGwMPLudH5dfg=; b=bI0SHrfGTy54mKFtgwyUlqSlka0zevPpnUHfSMG3R2rQZyfvJsUtmN3IXigONpsweu wm7O/BkIDVUZMrP6Vxji/SUBwml2V7iaz/SC8phN17s1fgTr3u2/0RHnne45eQ/r6GfD gE63yEub7xahJJ82uPXAKEygc5lR89OiQG/io= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=CREpsFwnlRokcG6H35zF+6z20U4xUwHGwMPLudH5dfg=; b=ntGFRXbGZkfYfhqtyPb+YFe0niUaMikV5njqMmWoSFcChDFlW40ennv5/VM3ajwQSo 7YFliUrDrhxDZb5aoiWa8zIsWBpSGGhNJYugIOO2lWQGpvlUuB46j/U/JaMGbiSWqbyp 9W/8QEmaN6yHehhN7bqbO69L1ZNwrAATuDCJ4Cm4BtVjRaOB08AYjx+TCrn5JtPcIuNN j6nXsmXo6KgVS7tbIroOckDEysZdSlnykUK53kGPAdNuZEsUqhDmIhxiEzwume6VX72F s00oL/L51lbAH2wDTEUvJBsefMQ0LdEdF+QCeGLBNVa6eNbJdhwYajqsKdCadDSpyE7N 8iCg== X-Gm-Message-State: AOAM5325Du40ncNYV8+CqwBFBpDpAabFKiRw6SBCpe0YMSEra2dKVj6q LnUESRsuN9ux7dEY5gKzV2GWJCx91ZeEoKZSJv12Sw== X-Google-Smtp-Source: ABdhPJwh/xpv4EaHS/C5Vakvo23Yj6nV8rJSwmXwV09kTIZfYvaDpiRM2cphKiJ6UXJ9r+XrmfIcegnJdbnfWcExEQg= X-Received: by 2002:aca:5106:: with SMTP id f6mr5888580oib.101.1600348542650; Thu, 17 Sep 2020 06:15:42 -0700 (PDT) MIME-Version: 1.0 References: <20200802181849.1586281-1-daniel.vetter@ffwll.ch> <579702ca-4b4e-0b05-1b93-25b99554d464@linux.intel.com> In-Reply-To: <579702ca-4b4e-0b05-1b93-25b99554d464@linux.intel.com> From: Daniel Vetter Date: Thu, 17 Sep 2020 15:15:31 +0200 Message-ID: Subject: Re: [PATCH] drm/nouveau: Drop mutex_lock_nested for atomic To: Maarten Lankhorst X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Maarten Lankhorst , Nouveau Dev , DRI Development , Ben Skeggs , Daniel Vetter Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Ben, did you have a chance to look at this? -Daniel On Mon, Aug 3, 2020 at 1:22 PM Maarten Lankhorst wrote: > > Op 02-08-2020 om 20:18 schreef Daniel Vetter: > > Purely conjecture, but I think the original locking inversion with the > > legacy page flip code between flipping and ttm's bo move function > > shoudn't exist anymore with atomic: With atomic the bo pinning and > > actual modeset commit is completely separated in the code patsh. > > > > This annotation was originally added in > > > > commit 060810d7abaabcab282e062c595871d661561400 > > Author: Ben Skeggs > > Date: Mon Jul 8 14:15:51 2013 +1000 > > > > drm/nouveau: fix locking issues in page flipping paths > > > > due to > > > > commit b580c9e2b7ba5030a795aa2fb73b796523d65a78 > > Author: Maarten Lankhorst > > Date: Thu Jun 27 13:48:18 2013 +0200 > > > > drm/nouveau: make flipping lockdep safe > > > > Signed-off-by: Daniel Vetter > > Cc: Maarten Lankhorst > > Cc: Ben Skeggs > > Cc: Dave Airlie > > Cc: nouveau@lists.freedesktop.org > > --- > > I might be totally wrong, so this definitely needs testing :-) > > > > Cheers, Daniel > > --- > > drivers/gpu/drm/nouveau/nouveau_bo.c | 6 +++++- > > 1 file changed, 5 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c > > index 7806278dce57..a7b2a9bb0ffe 100644 > > --- a/drivers/gpu/drm/nouveau/nouveau_bo.c > > +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c > > @@ -776,7 +776,11 @@ nouveau_bo_move_m2mf(struct ttm_buffer_object *bo, int evict, bool intr, > > return ret; > > } > > > > - mutex_lock_nested(&cli->mutex, SINGLE_DEPTH_NESTING); > > + if (drm_drv_uses_atomic_modeset(drm->dev)) > > + mutex_lock(&cli->mutex); > > + else > > + mutex_lock_nested(&cli->mutex, SINGLE_DEPTH_NESTING); > > + > > ret = nouveau_fence_sync(nouveau_bo(bo), chan, true, intr); > > if (ret == 0) { > > ret = drm->ttm.move(chan, bo, &bo->mem, new_reg); > > Well if you're certain it works now. :) > > Reviewed-by: Maarten Lankhorst > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel