From patchwork Tue Sep 19 21:56:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lyude Paul X-Patchwork-Id: 142285 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp3972204vqi; Wed, 20 Sep 2023 01:34:37 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGe4frVxK28KRFxxSX7Dv8MD+nuIMnBHYohuIVw/eqj2I2fHGs+hYSoD0zJftTHLLS9KTj0 X-Received: by 2002:a05:6a21:9995:b0:14c:7021:b3f1 with SMTP id ve21-20020a056a21999500b0014c7021b3f1mr5692661pzb.21.1695198877523; Wed, 20 Sep 2023 01:34:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695198877; cv=none; d=google.com; s=arc-20160816; b=JOFB7sw8FS7wyeGgnEAwxZxu96v147w7EZdXvTEjk6O4EXj7bWLgPyJbiNo9uTABzl p2bNQPh84w/t8ooaHNoWBIIo67oV0ssOf6Z17ylMvNGhAjMHJvs++pF+u/CnlZf5WnpW a5Wz6hjqaLvcbvdgoCrSXLnUOtitqJ7LlrWiY86XhnfY/QVxuxXgztFKPYNVrD3ODJx2 dI8ChKRlAOhDo9WayD4pVKeo2FsTcKQVIr7a3ax2opqELg336xEZAbwuuzZj4JEldZY/ V5iddcrHxF5oJznIulwuYCf5nLX49WPW7cj+0yO3F1ZWyCGNlZqWl6V2yllldQdXAEYx fBfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=zfAJNzKAQORNbORDKRnmTTy1E4F7HpQah95KQD+kMa0=; fh=Jvk2GAthtEduWUuzeJ+pdnWULX/23bLTsBp9Bf4Yysw=; b=Vvl0LprGBZC1Rrkp+2vEuRyPnCDkSwDz18Ge3KEg6XnzjIrXZZfP9M5IfDbSvVzbsd uQM+mLDMdUZmqu7dFpPxUjpX6B/H0rxyvQEBwxYD5ILHyceVQAJeD/dzrBpUHl44TgZL 3ct4XPjf10JpXAcEbYViu9+CPs7lv+OpCDsUK/XnHnhG0xU0A548sYdGQct++lSOUkkk RPVHR1KM+XZTByelX4O4ruunctFiyiaytV6vwzukP3neRuURRJCpH8+WqJT6YG4jmjCz PZNxhTBPtYl7o0W6pbzEYYTYi1qdvolpHgROz96ovT9MqL+tgaKUIeXrBiVR46MMixar kcng== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=StlWM6+g; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id bm18-20020a656e92000000b0057751b4abe2si3194729pgb.111.2023.09.20.01.34.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Sep 2023 01:34:37 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=StlWM6+g; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 77F67802D52F; Tue, 19 Sep 2023 15:07:18 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233574AbjISWHJ (ORCPT + 26 others); Tue, 19 Sep 2023 18:07:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37034 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233519AbjISWGx (ORCPT ); Tue, 19 Sep 2023 18:06:53 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E200AC0 for ; Tue, 19 Sep 2023 15:05:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695161152; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zfAJNzKAQORNbORDKRnmTTy1E4F7HpQah95KQD+kMa0=; b=StlWM6+gmov6+yFLcTjmRbNyRjZ49I/60sR4VyAKtu4NQV41KiblRW1ewoPMy69lVgo1US 3GcLOAbSICZNWfDA74M1QsOX1drgL4JNDfisxwpKDPx8v0FXHWt6AfchyKnS8FD6JEjJoi aCYan54HejnGUJh7eJhMi3agCj5pwng= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-398-Dw-QuH5dMDq08jPjNtIj_g-1; Tue, 19 Sep 2023 18:05:50 -0400 X-MC-Unique: Dw-QuH5dMDq08jPjNtIj_g-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id AAC92101A529; Tue, 19 Sep 2023 22:05:49 +0000 (UTC) Received: from emerald.lyude.net (unknown [10.22.18.67]) by smtp.corp.redhat.com (Postfix) with ESMTP id 51A3040C2064; Tue, 19 Sep 2023 22:05:49 +0000 (UTC) From: Lyude Paul To: dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org Cc: Ben Skeggs , Danilo Krummrich , Karol Herbst , David Airlie , Daniel Vetter , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v3 14/44] drm/nouveau/disp: update SOR routing immediately on acquire() Date: Tue, 19 Sep 2023 17:56:09 -0400 Message-ID: <20230919220442.202488-15-lyude@redhat.com> In-Reply-To: <20230919220442.202488-1-lyude@redhat.com> References: <20230919220442.202488-1-lyude@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Tue, 19 Sep 2023 15:07:18 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777544858315016542 X-GMAIL-MSGID: 1777544858315016542 From: Ben Skeggs - was previously delayed until second supervisor interrupt Signed-off-by: Ben Skeggs Reviewed-by: Lyude Paul Acked-by: Danilo Krummrich Signed-off-by: Lyude Paul --- drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.c | 2 +- drivers/gpu/drm/nouveau/nvkm/engine/disp/uoutp.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.c index 5b55598e09c85..b288ea6658da6 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.c @@ -48,8 +48,8 @@ nvkm_outp_route(struct nvkm_disp *disp) list_for_each_entry(ior, &disp->iors, head) { if ((outp = ior->asy.outp)) { - OUTP_DBG(outp, "acquire %s", ior->name); if (ior->asy.outp != ior->arm.outp) { + OUTP_DBG(outp, "acquire %s", ior->name); if (ior->func->route.set) ior->func->route.set(outp, ior); ior->arm.outp = ior->asy.outp; diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/uoutp.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/uoutp.c index d71bc188047e3..042a43c22061e 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/uoutp.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/uoutp.c @@ -235,6 +235,8 @@ nvkm_uoutp_mthd_acquire(struct nvkm_outp *outp, void *argv, u32 argc) if (ret) return ret; + nvkm_outp_route(outp->disp); + args->v0.or = outp->ior->id; args->v0.link = outp->ior->asy.link; return 0;