From patchwork Tue Sep 19 21:56:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lyude Paul X-Patchwork-Id: 142237 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp3908342vqi; Tue, 19 Sep 2023 23:09:40 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFogGYNUwRYobiCs2TDeJWIsjLhL1jq+zQ5SMBQCUujXm6WbUAPUW+MP/943bJPH5tWwbDr X-Received: by 2002:a05:6808:17a8:b0:3a7:8725:f38b with SMTP id bg40-20020a05680817a800b003a78725f38bmr1820275oib.15.1695190179887; Tue, 19 Sep 2023 23:09:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695190179; cv=none; d=google.com; s=arc-20160816; b=D/V6a1VX/KtklQ0qTeLpQ8ZT1pwhwt2Ak4yr5qLJobzq5fAMGF/jTw8V2R1t+0uUxt vsQnQUV6dUg/NMhBXlnPWSWs30LGhuvy+O6dC1Y1PmC2hhProlF54E5ZBDoU6fAZR0de wV+VR6MJP9sjKAxeg3XUQzbpdVcVv+FH7nOpv6zNVQAMvdAvpr9b9chu0W/YZZgilMKp WLq65th4wSvRtlMduby7VQtfJYpBtS3jVisv0fEXFm+RA6ZF9onE+d0pVwhhF2VTtdNW ek2Lwwvflc1ymiSyjlXdsCxVdZgYJjnb7eM0hewpzbGXLiNDB2MjPM9yHmDl5U8xi+iX J1zw== 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=9Z+JX2xHxTv9H7TUJJN8OQN9V/8TOrxjOsWgkpZUiLU=; fh=LphdH2KZBF5dGhNB8OUz/iCnTrVRiTKOHYGPc7QmRQ8=; b=m4LW+k2z+WwaAriQ6cKMWmhTWbuJ86hW3Ge2gtx6XTFHUXpA3aMQ6HjchAGfC47Y5n O7w0YFNBr0UQEkL27T8bC0cDcf8B1K/lHd3nJn8Eg1F4djNAxpOgxYo53j+wZxmOlidg i1OZl73CW6447YGwl6dsB0pqyr6taGE7WxEYGGvJGJVsmSCL02Tluj1FWQFMvzGbeSSE kKWvvoOCLuReHDSzrr//AI6OjfOE9zpfWUmdg8a/Ek7bGqAayfjzbAuFKJ2YfAo74V4p 8Vc9Sjme08XIqPY2RQq+t2S9I2znJQQgyEXeHl6+6UCn0pdcMWNPk4BiV/jfpmIgKdC0 wFlQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=aVND403T; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 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 agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id z39-20020a056a001da700b0068be710ee8esi10928043pfw.36.2023.09.19.23.09.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Sep 2023 23:09:39 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=aVND403T; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 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 agentk.vger.email (Postfix) with ESMTP id ECA2C8028FB2; Tue, 19 Sep 2023 15:06:17 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229748AbjISWGG (ORCPT + 26 others); Tue, 19 Sep 2023 18:06:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43600 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229728AbjISWGA (ORCPT ); Tue, 19 Sep 2023 18:06:00 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7E9AFC6 for ; Tue, 19 Sep 2023 15:05:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695161113; 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=9Z+JX2xHxTv9H7TUJJN8OQN9V/8TOrxjOsWgkpZUiLU=; b=aVND403TD3NuP1jcGsHHvdz8qbdxlX7DWxNkQCK+RHbw3Bdp4BSvyNjXusNOyzuVS9B1ne u1ycg/Iic0LKoUeqF44RKQbLVLOf+Extmf9OwZ6NlsDWAuiRfTFWC+YtK/LRBogpknSLJC vnY8mdlUaAzpx3pFhmG/KlMKTS5mASA= 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-43-MDLoMPhwOv6y2pJ47KUNZQ-1; Tue, 19 Sep 2023 18:05:12 -0400 X-MC-Unique: MDLoMPhwOv6y2pJ47KUNZQ-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 D1910801779; Tue, 19 Sep 2023 22:05:11 +0000 (UTC) Received: from emerald.lyude.net (unknown [10.22.18.67]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6F7A040C2064; Tue, 19 Sep 2023 22:05:11 +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 05/44] drm/nouveau/kms/nv50-: fix mst payload alloc fail crashing evo Date: Tue, 19 Sep 2023 17:56:00 -0400 Message-ID: <20230919220442.202488-6-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=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.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 (agentk.vger.email [0.0.0.0]); Tue, 19 Sep 2023 15:06:18 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777535738465786500 X-GMAIL-MSGID: 1777535738465786500 From: Ben Skeggs Programming -1 (vc_start_slot, if alloc fails) into HW probably isn't the best idea. 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 | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c index 39e9ba4139c7d..889ff667d0293 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/disp.c +++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c @@ -916,23 +916,27 @@ nv50_msto_prepare(struct drm_atomic_state *state, struct nv50_mstc *mstc = msto->mstc; struct nv50_mstm *mstm = mstc->mstm; struct drm_dp_mst_atomic_payload *payload; + int ret = 0; NV_ATOMIC(drm, "%s: msto prepare\n", msto->encoder.name); payload = drm_atomic_get_mst_payload_state(mst_state, mstc->port); - // TODO: Figure out if we want to do a better job of handling VCPI allocation failures here? if (msto->disabled) { drm_dp_remove_payload_part1(mgr, mst_state, payload); - nvif_outp_dp_mst_vcpi(&mstm->outp->outp, msto->head->base.index, 0, 0, 0, 0); + ret = 1; } else { if (msto->enabled) - drm_dp_add_payload_part1(mgr, mst_state, payload); + ret = drm_dp_add_payload_part1(mgr, mst_state, payload); + } + if (ret == 0) { nvif_outp_dp_mst_vcpi(&mstm->outp->outp, msto->head->base.index, payload->vc_start_slot, payload->time_slots, payload->pbn, payload->time_slots * mst_state->pbn_div); + } else { + nvif_outp_dp_mst_vcpi(&mstm->outp->outp, msto->head->base.index, 0, 0, 0, 0); } }