From patchwork Tue Sep 19 21:56:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lyude Paul X-Patchwork-Id: 142137 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp3776996vqi; Tue, 19 Sep 2023 17:32:26 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGlKmB3eOA6TwoFbUn3dMd95r0VZD0FEPnlMZOqVQS6NUvpGE9PrOSEN3M+1o4rro8bdk7B X-Received: by 2002:a05:6a20:ce84:b0:155:2359:21a2 with SMTP id if4-20020a056a20ce8400b00155235921a2mr993947pzb.41.1695169946349; Tue, 19 Sep 2023 17:32:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695169946; cv=none; d=google.com; s=arc-20160816; b=BO/tPUgyI6EqExr3F42N67R7fd90mD/6knYISivWD7ZyHhZj1JbEvZK+C3v5TuXSAq kCHerOn8ylnjRVN8n/pHGAltyWVebW2/1dpdsxRrz9aJ+UQ8vHBH0wq5hCsmeJpgLqEU K64672DC6ZlAVtC9iTL5tTCDsQ2uRsoa/Q5hXzr/G5sSbl+DWGS+DuC2Kf5Ee2lLUZqK mTsm+FEASAK1ew3i+AJDt2mcM7u5d3ZKNakH3IUYZfYaf9MSq013c2erTIgtB+YCcZ8L RkMeWGbDCh9Wuty2gzIrmoJEjuHoiZcmoF4BFdgT4PJH3ZzXv/IJYKoQm3j8/F/Njlnd r/eA== 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=/7PaP71eH6VCgE4PDxsdmAcLxjFzbczIBit0VWWdGJc=; fh=LphdH2KZBF5dGhNB8OUz/iCnTrVRiTKOHYGPc7QmRQ8=; b=Mpk4dDeo+bXyukX+Ng2PZsmUjsp445BfXEVvRJndGKvuz7cMkL4IP8QOZ1je8Qv/I9 Ip63nAJvG87D/xABtqjr/paa+K2+PX0phiUO53bkShOJStWLKsdfYV9hznENAq27ME3v aGhb1PPc3rp5NOGWpzJO26HyXrtpUhngPpLVkBGQcwdL9J0Bc+uULNhQwN8Nvq+F+rjV VXDT9z0v+ADT5MpKM6O18fccTxJZ20ZCJHqYokEKO1uC3oeGov9OHNcNUjD9UmukGcq+ dIoA0mClokvkSmyA/z5WCuYmylNDjA48CaXfEOMzUpyC9Yr18Q8GwZkGZa9kf4Y2tnD7 8Rhw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Ncj11yVV; 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 s6-20020a170902ea0600b001bbb8a65e87si10861573plg.59.2023.09.19.17.32.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Sep 2023 17:32:26 -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=Ncj11yVV; 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 2F561829F1C8; Tue, 19 Sep 2023 15:10:04 -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 S233555AbjISWJt (ORCPT + 26 others); Tue, 19 Sep 2023 18:09:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54676 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233605AbjISWJh (ORCPT ); Tue, 19 Sep 2023 18:09:37 -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 8A9C51998 for ; Tue, 19 Sep 2023 15:07:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695161227; 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=/7PaP71eH6VCgE4PDxsdmAcLxjFzbczIBit0VWWdGJc=; b=Ncj11yVVheP+NQ39A2xf/xd0qjR0Khx867VVwxh61bD0PB+UPjg3YU4Vb1fN26cYRV0p/N 88dEr+FQ69KUOkEnqvTqiGXKyIbWqPpRI6Ab/gscVuxgL/u2VoVEaVVcTsHFmEXk5LAjxf hjmm+hlVJFOEmTxeZm4ELB3cVBlciLI= 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-290-1jZhupujPPycyZqrfQ7ZHQ-1; Tue, 19 Sep 2023 18:07:02 -0400 X-MC-Unique: 1jZhupujPPycyZqrfQ7ZHQ-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 084B1382256A; Tue, 19 Sep 2023 22:07:02 +0000 (UTC) Received: from emerald.lyude.net (unknown [10.22.18.67]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9B08840C2064; Tue, 19 Sep 2023 22:07:01 +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 30/44] drm/nouveau/kms/nv50-: flush mst disables together Date: Tue, 19 Sep 2023 17:56:25 -0400 Message-ID: <20230919220442.202488-31-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:04 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777514521555455307 X-GMAIL-MSGID: 1777514521555455307 From: Ben Skeggs - fixes some issues tearing down modes on tiled displays 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 | 11 +---------- drivers/gpu/drm/nouveau/dispnv50/disp.h | 1 - 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c index 48e099ed7d51c..1fcd1b36a2751 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/disp.c +++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c @@ -2084,13 +2084,6 @@ nv50_disp_atomic_commit_tail(struct drm_atomic_state *state) help->atomic_disable(encoder, state); outp->disabled = true; interlock[NV50_DISP_INTERLOCK_CORE] |= 1; - if (outp->flush_disable) { - nv50_disp_atomic_commit_wndw(state, interlock); - nv50_disp_atomic_commit_core(state, interlock); - memset(interlock, 0x00, sizeof(interlock)); - - flushed = true; - } } } @@ -2376,10 +2369,8 @@ nv50_disp_outp_atomic_check_clr(struct nv50_atom *atom, return PTR_ERR(outp); if (outp->encoder->encoder_type == DRM_MODE_ENCODER_DPMST || - nouveau_encoder(outp->encoder)->dcb->type == DCB_OUTPUT_DP) { - outp->flush_disable = true; + nouveau_encoder(outp->encoder)->dcb->type == DCB_OUTPUT_DP) atom->flush_disable = true; - } outp->clr.ctrl = true; atom->lock_core = true; } diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.h b/drivers/gpu/drm/nouveau/dispnv50/disp.h index 42209f5b06f91..1e5601223c753 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/disp.h +++ b/drivers/gpu/drm/nouveau/dispnv50/disp.h @@ -83,7 +83,6 @@ struct nv50_outp_atom { struct list_head head; struct drm_encoder *encoder; - bool flush_disable; bool disabled; bool enabled;