From patchwork Fri Nov 3 02:41:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danilo Krummrich X-Patchwork-Id: 161151 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:8f47:0:b0:403:3b70:6f57 with SMTP id j7csp769183vqu; Thu, 2 Nov 2023 19:43:05 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHe1gMdnAiTmrDI97/L1nX6z6cPFpd6MM2DsfjiYldeIRAIR552DcVyN+74bksN9XIW4VKC X-Received: by 2002:a92:d4c5:0:b0:359:445:8469 with SMTP id o5-20020a92d4c5000000b0035904458469mr17621177ilm.22.1698979385720; Thu, 02 Nov 2023 19:43:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698979385; cv=none; d=google.com; s=arc-20160816; b=ZucUuPTK5cMXV5DNhxaT1Rr/+ZbtMtuLRdUWGyhS9T70W95TRGLqihQI3Hfo4GLrbq wMdI2Y+AR2ruB9XlCskvkKmZSgKdpaiJKJlUxNe6obUdRbeQeCGuFHykB5CcT3Epdbzo /KOhR11YI9T5Xj/DARZfN2MaCByGnlo2M7z2NszMKfgy+UtNX/OUV2CN5kciTlk9Zb3F FM+zbVfNmwzAL5UUu7NwUYEah0cfa2K3ISLybJKanEDcKDII3Z6SRkZmTNR2mtIGJkPJ RfKS8i0KbeoTs4OWAsB1ZmLGcHD6JnkJVr7BopNQTukOd/jNMP0Sw4CvrGmosuNjgpSV kbfA== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=ny2ZFzxeENDJSTZ9wCuQplKwvwWNLKdmgqeowZjx4K4=; fh=VWo+ZD0FWTM1aSSLSx5QkUdNDac7jV2NzOVC3KuiPgY=; b=Tg+etaj7b/lPjWNPJRCoZiAxwBmxoIfWmTMqmytIpwQYzA12ZKbvkWzslZLAKl/0zg vktW6xQpDcveJAE5g64z5hwkDLoE4jcLzzpQoAGS3dmWpsgDuroPuORtTzf0Ln4i/ChQ j1y5O1qiUMCg2JHNKcpZdEwk5bph/EDpnmiCaejpXrjPv3Auju6ISPaEbvuvOOxbvLzf 9ijFK45XQDbq/faWNDF4hrSkYp0bStmWUCXQH1sa3AOTPYlofPTsPifCz2vxG8eU+Z3K z5fU2m3uIYKWuXbQC1qETvwPSVZJUbUdKasjgsSEWu+EpeA+rSYrrVR5Jy2zPaljHk8W cJ7w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=f715odRS; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 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. [23.128.96.38]) by mx.google.com with ESMTPS id r20-20020a6560d4000000b005b95fa863c6si638322pgv.661.2023.11.02.19.43.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Nov 2023 19:43:05 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=f715odRS; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 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 65B0182D8792; Thu, 2 Nov 2023 19:43:03 -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 S234598AbjKCCms (ORCPT + 37 others); Thu, 2 Nov 2023 22:42:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48400 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229570AbjKCCmq (ORCPT ); Thu, 2 Nov 2023 22:42:46 -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 154C8125 for ; Thu, 2 Nov 2023 19:41:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1698979316; 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; bh=ny2ZFzxeENDJSTZ9wCuQplKwvwWNLKdmgqeowZjx4K4=; b=f715odRS+4t7+GIVV0Go+ZC3+jSo4cBcSAIId+4h8kuS4it7zgw0iIW9a+PRFwUf1f4Ch/ 4FESHLoeqLeM6v3B/NNcu7KgytOzpl1r//xpVAtDLWO+apUAuVJSQtb0xrOQsKK7th9fff CozPD34hKVKgy7S+8vmKegCLVU70D1g= Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-595-kb0Gv_5xPZaJ1bsaMkudEg-1; Thu, 02 Nov 2023 22:41:54 -0400 X-MC-Unique: kb0Gv_5xPZaJ1bsaMkudEg-1 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-9be601277c2so112419066b.2 for ; Thu, 02 Nov 2023 19:41:54 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698979313; x=1699584113; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ny2ZFzxeENDJSTZ9wCuQplKwvwWNLKdmgqeowZjx4K4=; b=RNjWQ8iyrAD/YH8NfIJuE7JX2YvFppyZcHGY0CjZVXCJVI1Gap4UGr5zANyzzGuvBQ dF0WBipdrmbvwTotd56UrMRXMQGjCUcfLdFRmulFvO9u2VXEfoPpaI4hNcEunEU3T04C wh5tsBnE5o6M1y1/k8DMfevx2e/Uv0RAah+K1QDGCpP40DSHq7EHLKFpE8a5zk2Eb/Pm XVq/pfsvmGsF5aaWRjzThZXa1XqLNZ/9XhhSbckn6PH7m5oS7P7hLPvDYpVWaFXeqLAp YGyBiUVqlnmHJi9dkhQ8CoYjv7V5QLVlVbDq3Opg5xy5MtvjaMlGN05DDyr41m+5mcs1 hTtQ== X-Gm-Message-State: AOJu0YwHFyRolUC8Td36kk5+9VTHKG8zyAX+Tqqc+eseMsJFn5bYPnvG lta1uPtFiCaMCLf0FOy5pvIOvPF+XyEgYMi+FA8O+DzQTHBSSPD/zPpFaUBMJzEQxTTgjiYj91I 4AqaXCxLso/H0mbc6M7uayUec X-Received: by 2002:a17:907:2d28:b0:9bf:697b:8f44 with SMTP id gs40-20020a1709072d2800b009bf697b8f44mr6733369ejc.6.1698979313486; Thu, 02 Nov 2023 19:41:53 -0700 (PDT) X-Received: by 2002:a17:907:2d28:b0:9bf:697b:8f44 with SMTP id gs40-20020a1709072d2800b009bf697b8f44mr6733360ejc.6.1698979313220; Thu, 02 Nov 2023 19:41:53 -0700 (PDT) Received: from cassiopeiae.. ([2a02:810d:4b3f:de9c:642:1aff:fe31:a19f]) by smtp.gmail.com with ESMTPSA id o18-20020a1709061b1200b009b8a4f9f20esm366691ejg.102.2023.11.02.19.41.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Nov 2023 19:41:52 -0700 (PDT) From: Danilo Krummrich To: nouveau@lists.freedesktop.org, faith@gfxstrand.net Cc: lyude@redhat.com, kherbst@redhat.com, airlied@gmail.com, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Danilo Krummrich , stable@vger.kernel.org Subject: [PATCH] drm/nouveau/gr/gf100-: unlock mutex failing to create golden context Date: Fri, 3 Nov 2023 03:41:06 +0100 Message-ID: <20231103024119.15031-1-dakr@redhat.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Spam-Status: No, score=-1.3 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,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 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]); Thu, 02 Nov 2023 19:43:03 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781509008145666605 X-GMAIL-MSGID: 1781509008145666605 Do not return from gf100_gr_chan_new() with fecs mutex held when failing to create the golden context image. Cc: # v6.2+ Fixes: ca081fff6ecc ("drm/nouveau/gr/gf100-: generate golden context during first object alloc") Signed-off-by: Danilo Krummrich Reviewed-by: Dave Airlie --- drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c index c494a1ff2d57..f72d3aa33442 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c @@ -442,6 +442,7 @@ gf100_gr_chan_new(struct nvkm_gr *base, struct nvkm_chan *fifoch, if (gr->data == NULL) { ret = gf100_grctx_generate(gr, chan, fifoch->inst); if (ret) { + mutex_unlock(&gr->fecs.mutex); nvkm_error(&base->engine.subdev, "failed to construct context\n"); return ret; }