From patchwork Tue Sep 19 21:56:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lyude Paul X-Patchwork-Id: 142133 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp3772331vqi; Tue, 19 Sep 2023 17:21:46 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH7TQtg1IpMMFE66ZUFFgsU4sfEcDGdMI2AXJg8aY9mN4BRWSA7qMhfNeTR+0xgZUnKAzqz X-Received: by 2002:a05:6a00:28c6:b0:68c:59cb:2dd9 with SMTP id ci6-20020a056a0028c600b0068c59cb2dd9mr4655004pfb.1.1695169306571; Tue, 19 Sep 2023 17:21:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695169306; cv=none; d=google.com; s=arc-20160816; b=Sno3I9tDkmdItdpUB9xHoOBRakGYd8RV7EdB7GE1g0nOOE6eK7lsF9Z/ESAjMOhXtR mm6HmVGMhlo9xf4Miw8VOGrJxNaI90FDzr1LqycSB2AFR64+PzfGz4ofFf0aoFUhSvQZ AUqmWn6Oi+bbwXr7bqMjeQbcrPLW+tjciybpjpcrMQ2+mCyKs5vsXuyPDqV8kbUdkcPI QW7OXMb11nTkLFaMLpHGJiM7iQXnYCzQnbn53DUgfRB62u/0o8tvcLOQX+FqLaELfPaB sPx0VqNuq3hiOPa9gAKLKvGqfwy4PBMsbHVm9NWD4t7WcZW2/N4Rg6GtgqnuQbHbwxIL uInQ== 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=/MlFYOq/NSmxR/1uKfeYpusgfIpU4R7fczdhyvWYPnY=; fh=av7DrflMeAv9lK/+5lgb+L7SNI0zTlMjjGhV1+L9Z48=; b=g0se4xAuezQC+ONPEAUFVSfXAlTeJkN1g09a6Qjtfk60RcwHPcHsd9+NKL6tezBwIz qqJuElh4j0BYyl/GZT4/GYpKrF2ZYlhpHEtYD8UF+Tafd/8VKQc5pDFeCW18SPbsef8M edrND/179tRV8y7r9ewDjgHEpTq/nkEZ7qq93UeHHGB5u+/m23VxnVH8BCwL7EZidF1U 96ujdZFz4xrzs9ALEZ0YYvmgFDjlWE7v2f5cFwGueToJXjjs07wVoAyVCloXZtuqki/P ZnCknEbaiQQFeIRojPCgSy7OM6rg6nEy7ZZF68L0MBv4+kn1LQ1i/bBhr69HUmhFZwqu xZSg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="QUcATbM/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 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 howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id 68-20020a630947000000b0057763d820d7si368817pgj.835.2023.09.19.17.21.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Sep 2023 17:21:46 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="QUcATbM/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 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 howler.vger.email (Postfix) with ESMTP id 80E268310D2F; Tue, 19 Sep 2023 15:08:09 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233421AbjISWHs (ORCPT + 26 others); Tue, 19 Sep 2023 18:07:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33976 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233482AbjISWHe (ORCPT ); Tue, 19 Sep 2023 18:07:34 -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 4594DCE6 for ; Tue, 19 Sep 2023 15:06:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695161179; 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=/MlFYOq/NSmxR/1uKfeYpusgfIpU4R7fczdhyvWYPnY=; b=QUcATbM/CTwCEWCJss3SMI52DfpMa3pgClAv+e17AXbaXu32UUmdSmBPLbr9/HaTorBOSC M2/zcXCGcS2+y9Gh3nX9jAexif201OMJJHFpqVqo+Rl6HJgEkggyJGxPtRdz5SGnjSwruw hLmagirv0Bau/Z+nsQP8qhaORjBODhI= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-390-Lg_ndyiHNuukkxvrUTeaew-1; Tue, 19 Sep 2023 18:06:14 -0400 X-MC-Unique: Lg_ndyiHNuukkxvrUTeaew-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 F29093822565; Tue, 19 Sep 2023 22:06:13 +0000 (UTC) Received: from emerald.lyude.net (unknown [10.22.18.67]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9158E40C2064; Tue, 19 Sep 2023 22:06:13 +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 , ruanjinjie , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v3 22/44] drm/nouveau/disp: remove SOR routing updates from supervisor Date: Tue, 19 Sep 2023 17:56:17 -0400 Message-ID: <20230919220442.202488-23-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=1.2 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,RCVD_IN_SBL_CSS,SPF_HELO_NONE, SPF_NONE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Level: * 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 (howler.vger.email [0.0.0.0]); Tue, 19 Sep 2023 15:08:09 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777513850620833071 X-GMAIL-MSGID: 1777513850620833071 From: Ben Skeggs - these shouldn't be necessary now, and are done in acquire()/release() - preparation for GSP-RM, where we don't control the supervisor 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/gf119.c | 1 - drivers/gpu/drm/nouveau/nvkm/engine/disp/gv100.c | 1 - drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c | 1 - 3 files changed, 3 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/gf119.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/gf119.c index a48e9bdf4cd07..937baae6a3ebb 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/gf119.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/gf119.c @@ -1038,7 +1038,6 @@ gf119_disp_super(struct work_struct *work) continue; nv50_disp_super_2_0(disp, head); } - nvkm_outp_route(disp); list_for_each_entry(head, &disp->heads, head) { if (!(mask[head->id] & 0x00010000)) continue; diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/gv100.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/gv100.c index 4ebc030e40d12..7ac59bab6309f 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/gv100.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/gv100.c @@ -863,7 +863,6 @@ gv100_disp_super(struct work_struct *work) continue; nv50_disp_super_2_0(disp, head); } - nvkm_outp_route(disp); list_for_each_entry(head, &disp->heads, head) { if (!(mask[head->id] & 0x00010000)) continue; diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c index be81168029604..a4ce605177895 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c @@ -1371,7 +1371,6 @@ nv50_disp_super(struct work_struct *work) continue; nv50_disp_super_2_0(disp, head); } - nvkm_outp_route(disp); list_for_each_entry(head, &disp->heads, head) { if (!(super & (0x00000200 << head->id))) continue;