From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CB10814ABE for ; Thu, 28 May 2026 19:29:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779996563; cv=none; b=kVQRX75ZYT/lTk2wZjp4Q8AIwA+ccWNYOFm4xgTbtkVpQu1asfG4RwwzcT4mFchpL01kL9bp6rycyz72FS/vQXYPTXl21qGo4Tk7H1FSym1YtujoY6p/rvUTbeDq61zcHwP5aQhg9krtdivq6RWn7BeRXzf+EUPuIDaJmqgzFlE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779996563; c=relaxed/simple; bh=wNW4MAanDg3OcNUimZTMBjrVWJ7BE3HnP02o+GOUfQU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BXl6WYt4yneODhFaroWPFj7fETiHZWuY63K2CjT7OrvqMjnOCIB6ITqZ+6/cv0BomP/XRNlI9DNyv3EbMc79JAxPrpIWGy+Uy0IdwDyqr5l8i6qZRUwMqjBMQ3M4T8/NGkjVV20ca4O4dbCE4tJPTMQzae6Z/CJCyh0wNN2UgHo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=WKot0dLX; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="WKot0dLX" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779996561; 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=Oh4yR/ss5c41je5jv3EajM1W8lREAand3plKjqUGg54=; b=WKot0dLXj+0cBgQMbMLeKRtnfgM56RJgm4H60rMrnGfR4d+UKMXOnsSca/++vckxaeRW73 KqP6kLGumi3ZsY9RzzSCAe5yAiWoT69bcKMJk9tQ2BTFHbt61kVDvWuuYKGDcMSS6XZ9Ot vWaBYmC8AtlUsPBk4mnBiFykFMHlcBU= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-77-FtSbXF8VNDudUhug7YkZRw-1; Thu, 28 May 2026 15:29:16 -0400 X-MC-Unique: FtSbXF8VNDudUhug7YkZRw-1 X-Mimecast-MFC-AGG-ID: FtSbXF8VNDudUhug7YkZRw_1779996553 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 66EAE1800622; Thu, 28 May 2026 19:29:13 +0000 (UTC) Received: from GoldenWind.lan (unknown [10.22.89.248]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 5F50A19560A3; Thu, 28 May 2026 19:29:11 +0000 (UTC) From: Lyude Paul To: dri-devel@lists.freedesktop.org, Timur Tabi , nouveau@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: "Dave Airlie" , "Qianfeng Rong" , "Maarten Lankhorst" , "Kees Cook" , "Simona Vetter" , "David Airlie" , "Thomas Zimmermann" , "Maxime Ripard" , "Hongling Zeng" , "Danilo Krummrich" , "Zhi Wang" , "Lyude Paul" Subject: [PATCH 3/5] Revert "nouveau/gsp/rm: cleanup WARN_ON(IS_ERR_OR_NULL)" Date: Thu, 28 May 2026 15:27:17 -0400 Message-ID: <20260528192847.4077458-4-lyude@redhat.com> In-Reply-To: <20260528192847.4077458-1-lyude@redhat.com> References: <20260528192847.4077458-1-lyude@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 This is probably too risky, see the discussion here: https://lists.freedesktop.org/archives/dri-devel/2026-May/570353.html This reverts commit 6198977a78af8769d3f3108e830901325b97cf03. Signed-off-by: Lyude Paul --- drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/bar.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/bar.c b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/bar.c index 9cd68f8622d36..fae08ac3b18c7 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/bar.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/bar.c @@ -55,7 +55,7 @@ r535_bar_bar2_update_pde(struct nvkm_gsp *gsp, u8 page_shift, u64 pdbe) rpc_update_bar_pde_v15_00 *rpc; rpc = nvkm_gsp_rpc_get(gsp, NV_VGPU_MSG_FUNCTION_UPDATE_BAR_PDE, sizeof(*rpc)); - if (WARN_ON(IS_ERR(rpc))) + if (WARN_ON(IS_ERR_OR_NULL(rpc))) return -EIO; rpc->info.barType = NV_RPC_UPDATE_PDE_BAR_2; -- 2.54.0