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.133.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 C0D203346BE for ; Thu, 28 May 2026 19:29:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779996572; cv=none; b=X+sGM+mPBYMdn8KzVsPGOW5viGHlOBKVjGGhn/HwuKg2FIckPZ5XgBkIZlZ+BqFU0ZlLP90WLLJ0WM/69+l7CieFVj/z9EtwouXbCndXd2L7+yB4gRSgkykKcfxVefqLkdC+vgOR51hYfrls9J3faDkTh9SObL3q+jJH1F7ZO8g= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779996572; c=relaxed/simple; bh=i2UHGI1oJPVCo/B7bh0Y1Xmtqc/JmeqnWqjc/pzbBps=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Rw9MOlRtgL+GmaTiqWlx0QZue1YWvubiywO0o0QQa9WW2p6GS9Nb7hRgI94oTIebNhCmDSe/Zj4Qd4YRQjolQfM5KAhgPlSPQ/xuPZ6YPqm6X9R0P5uauO7MXOi0oqXzFmeUE4Kg9JFzugMFcJ1FaD0IKpX2TR671uelUkPyk1M= 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=FNDXaQPS; arc=none smtp.client-ip=170.10.133.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="FNDXaQPS" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779996570; 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=gGfaGZgQK2EIkOvWGdoTrr3vJzngofE2sFgYRG2RXHY=; b=FNDXaQPSfw3uCXWbDxXtLsRPgdkjY4rveIEnrMKT5w11zLZrpgSY7Vnt36S40BqdY+Gqhx 2EmqTc4IUZa2pjwmpXr9X08PYsHqwTzRSHC8leFH4Ci8LpMh9ZYvYc4HLaMJ88lmi6gBT9 LmLY5XsH5BF2psSuzsXc3Q4kiiAcMQ4= Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-284-6qb3SPAJPx-mzyPXeG3-Iw-1; Thu, 28 May 2026 15:29:25 -0400 X-MC-Unique: 6qb3SPAJPx-mzyPXeG3-Iw-1 X-Mimecast-MFC-AGG-ID: 6qb3SPAJPx-mzyPXeG3-Iw_1779996563 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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id E4AC219560B2; Thu, 28 May 2026 19:29:19 +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 997DA19560B2; Thu, 28 May 2026 19:29:17 +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 4/5] Revert "nouveau/gsp: cleanup IS_ERR_OR_NULL in rpc_rd" Date: Thu, 28 May 2026 15:27:18 -0400 Message-ID: <20260528192847.4077458-5-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 much too risky. See the discussion here: https://lists.freedesktop.org/archives/dri-devel/2026-May/570353.html This reverts commit 47f15f6cf068c14d1a5054066c445bee23f6047e. Signed-off-by: Lyude Paul --- drivers/gpu/drm/nouveau/include/nvkm/subdev/gsp.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/gsp.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/gsp.h index d771134fa4107..ab2bd88eebce5 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/gsp.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/gsp.h @@ -293,7 +293,7 @@ nvkm_gsp_rpc_rd(struct nvkm_gsp *gsp, u32 fn, u32 argc) { void *argv = nvkm_gsp_rpc_get(gsp, fn, argc); - if (IS_ERR(argv)) + if (IS_ERR_OR_NULL(argv)) return argv; return nvkm_gsp_rpc_push(gsp, argv, NVKM_GSP_RPC_REPLY_RECV, argc); -- 2.54.0