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 42077C47423 for ; Tue, 29 Sep 2020 14:52:45 +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 2F7062075A for ; Tue, 29 Sep 2020 14:52:43 +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="Ho+XxXi5" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2F7062075A 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 BB95089CD4; Tue, 29 Sep 2020 14:52:39 +0000 (UTC) Received: from mail-ot1-x341.google.com (mail-ot1-x341.google.com [IPv6:2607:f8b0:4864:20::341]) by gabe.freedesktop.org (Postfix) with ESMTPS id 51FB289CD4 for ; Tue, 29 Sep 2020 14:52:38 +0000 (UTC) Received: by mail-ot1-x341.google.com with SMTP id n61so4674245ota.10 for ; Tue, 29 Sep 2020 07:52:38 -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=rPPXygZpzq9GUSfGOTbHR/oyN1//VICOUWLY0E6v4MM=; b=Ho+XxXi5ACUZ8esXVjJlwKAXFD0NTq6chJJ+WXCn4aiw6wOlh4ao4wDhWD9Rayb0+D UHdFvmqKv7DokFFXkV8AlD0+fLjf4+qIGdm72NgAo7lnl7wdKWurgoUqCaaT0esLGZC0 mICjE2tzQ9/6KC3m/9YCvsQMQDPW1OcKg86xI= 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=rPPXygZpzq9GUSfGOTbHR/oyN1//VICOUWLY0E6v4MM=; b=jQaruB+c1Uh+jpjWIUKIYcUDtBi6iCpdqIYpkwjxMolQC4w1S+K7WESyFqbcI7L1CE hKTk7nyhH/BaKx+XoUOPXgEoXvdr1IJ+PCFfq70lW7NXQSMaNGPw1RiWswbh8K2wcGCk upWhUUuFtiEH/EtqgO4QUPlivz2PtJrUZ9JkhKKrlKZW49yddAdI3q3cPAgPvzShDfgz 9C7Y5Wx5j4Q7MLisLFeuHW/hF6DtDLGBYB71WrG/iBM4HdIBw32+7x1szuDyTa/IX9AJ KTMaaAyDIAAsCY8F82ys5rJ6JTwEGkKrMbC/566CjjjezmJfwRqFFXG8gZjLF9w6p6Ow hyyQ== X-Gm-Message-State: AOAM530hwp7KiixlcclfzDxA2HhLV4XxPtbgG0Y5tlAheBH1guk3wLBf XnZCBgYQ8Slr4nfUUgtdY/6Wm/J48JgYSMhtA3SAUw== X-Google-Smtp-Source: ABdhPJycJt2AzY8h+0ku2hXxDhhkYoHhCQavBX1f/Wk0JEvpi81QFW8kiUFC9ek5T9COAOOJ2r6yEzHjl4rNTHmhGdQ= X-Received: by 2002:a9d:4b99:: with SMTP id k25mr3167384otf.281.1601391157431; Tue, 29 Sep 2020 07:52:37 -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: From: Daniel Vetter Date: Tue, 29 Sep 2020 16:52:26 +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" On Thu, Sep 17, 2020 at 3:15 PM Daniel Vetter wrote: > > Ben, did you have a chance to look at this? Ping -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 -- 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