From patchwork Tue Sep 19 21:56:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lyude Paul X-Patchwork-Id: 142180 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp3830103vqi; Tue, 19 Sep 2023 19:42:55 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEHJqs37JK5WVYTMtlua0TYJs1/LhGz41y5fON7cRWNg+BVmDUSOzmwuwbozEO+to86oaUs X-Received: by 2002:a05:6a00:13a9:b0:690:b8b1:7b9e with SMTP id t41-20020a056a0013a900b00690b8b17b9emr1619274pfg.0.1695177775085; Tue, 19 Sep 2023 19:42:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695177775; cv=none; d=google.com; s=arc-20160816; b=IVxnU5LZGOWMolMYnFy3jaijWKVNLYzqCuBbnKD+ydDKKNm+ddzjv/qGT9iowahzlk nr+v9SxX4uVshB3zvk3M95wBPuOhQWnv+SDAFtvYYb6LY3+Qu0sk6mD13XhtmD36gFRq 0ZvAPsVVBXLl+LwFxmjjpx+m56f936KMUnON897pG4pvZ5W4OQkR++GReFdLNiwINnkd rV2ro4hvZJHufWwu0ytoyE0Ooqwvjn6/WekAq4d2642ge/Y1yqnf5zD/V/vGIjZ9+O52 GMkG9T0DgWbLYixIkIrIGQAQKS/QUDXA/YV1R+1U7z1KGSOh+VXFgnaPeLo/NZ+5s1Ms cFKA== 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=f4EupPm67ieQqJ6BGjiZVVQO57DUBAXgI6kdFWcxX4U=; fh=LphdH2KZBF5dGhNB8OUz/iCnTrVRiTKOHYGPc7QmRQ8=; b=jabg/49KuuktLcHYjBcDl9HIyu9SxE0IOB5c3Plas+BFIUtDcdV1SP0Vxs/IWpK6xE U584uHafX9xHjUIdmZ0i+T8gWMZMfB/aKaNP8mspzb7xRURglTPqZj6vEmillAEe/XDF 3U+jl7GsH2SJKwNmPVnGLOIO0w5a8EJKU7G4V9oEpAjGC8mvfD/juUOyz4dwgEL5A/yc Hc70eA34HDBrcKA0mkTarlioVeg9DSgWpjjqvgaXEZeyBaxmE9vfH5PsybV3o4Wo9UL4 ed/RjgLgx44VVD9zFMGTrk0w4QL2qAnRgmGyHz0+M/UnUPd3KAVDlCD071rZAO9hHAma G+FA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Pgo7I8se; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 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 fry.vger.email (fry.vger.email. [2620:137:e000::3:8]) by mx.google.com with ESMTPS id e15-20020a6558cf000000b00565ecd01394si10891629pgu.10.2023.09.19.19.42.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Sep 2023 19:42:55 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Pgo7I8se; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 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 fry.vger.email (Postfix) with ESMTP id DAD1D829F1D6; Tue, 19 Sep 2023 15:10:24 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233556AbjISWKR (ORCPT + 26 others); Tue, 19 Sep 2023 18:10:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53854 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233601AbjISWKL (ORCPT ); Tue, 19 Sep 2023 18:10:11 -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 978451728 for ; Tue, 19 Sep 2023 15:07:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695161224; 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=f4EupPm67ieQqJ6BGjiZVVQO57DUBAXgI6kdFWcxX4U=; b=Pgo7I8seV/F6j/HGyFiGGfkvyArzjO/Gn1hNgbpUTlaW/Ru10GjWoqY2i1CIBVECintoUd 4pJYQe52f2Jt5P1+przh3GVs9u0Q8O/TM0s8sXZq9LuIh6nTg+jQB2t9ZF4Wgo/kMck1JU gB9e8dNAdTRqUNZ84HlWlZqbM6CBtpM= 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-580-htkACPzPNNG7xAhSc6VRRw-1; Tue, 19 Sep 2023 18:07:00 -0400 X-MC-Unique: htkACPzPNNG7xAhSc6VRRw-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 203A23C02539; Tue, 19 Sep 2023 22:07:00 +0000 (UTC) Received: from emerald.lyude.net (unknown [10.22.18.67]) by smtp.corp.redhat.com (Postfix) with ESMTP id B337740C2064; Tue, 19 Sep 2023 22:06:59 +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 , Wayne Lin , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v3 29/44] drm/nouveau/kms/nv50-: split DP disable+enable into two modesets Date: Tue, 19 Sep 2023 17:56:24 -0400 Message-ID: <20230919220442.202488-30-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.7 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Level: ** X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email 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 (fry.vger.email [0.0.0.0]); Tue, 19 Sep 2023 15:10:24 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777522730265379141 X-GMAIL-MSGID: 1777522730265379141 From: Ben Skeggs Link training can finally be moved out of the supervisor sequence, but first we need to split DP modesets into separate disable and enable sequences to be able to perform link training between them instead. - preparation for GSP-RM Signed-off-by: Ben Skeggs Reviewed-by: Lyude Paul Acked-by: Danilo Krummrich Signed-off-by: Lyude Paul --- drivers/gpu/drm/nouveau/dispnv50/disp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c index ee53bc5d10042..48e099ed7d51c 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/disp.c +++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c @@ -2375,7 +2375,8 @@ nv50_disp_outp_atomic_check_clr(struct nv50_atom *atom, if (IS_ERR(outp)) return PTR_ERR(outp); - if (outp->encoder->encoder_type == DRM_MODE_ENCODER_DPMST) { + if (outp->encoder->encoder_type == DRM_MODE_ENCODER_DPMST || + nouveau_encoder(outp->encoder)->dcb->type == DCB_OUTPUT_DP) { outp->flush_disable = true; atom->flush_disable = true; }