From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 AA7873128DE; Tue, 2 Sep 2025 13:33:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756820016; cv=none; b=fqOhY3r4vx7VzJFSfGJyIPV25GGqWHnYR7lKf+s4eZtDPuDcQq7sVIiv3zLTpx9VdlArBBLVpMhnUxXhgK5ZiEuDmr7git8Nis/KDS52MjCinU5cWdhsO/ZxGURP/QvVY/a3KN7MbCZHQkVP2DSU9XBN2k+oNa+PGGP0vvmpyqM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756820016; c=relaxed/simple; bh=X+loccP2JWH6HJRg06fnTiijWuNPjOgxCFIdz5jIMfI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TfOvTydtsrho3FrU5KBhkOfN3X2CZiCP6hCAR6D8WddJIhHQVq+qLqiA4Isk2EY+0hInCz0g5KY3Iq/UsJiA4rN6BSqRQXK5xu8wLM+jhoPaGiEkGm638X7r0NddJjWhT72Ms4Nt4Ap7LwtvOwrarcyszqQOEAPR/vaLH1HZJjQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=G+IeWHbb; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="G+IeWHbb" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 35214C4CEF4; Tue, 2 Sep 2025 13:33:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1756820016; bh=X+loccP2JWH6HJRg06fnTiijWuNPjOgxCFIdz5jIMfI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=G+IeWHbbT+LlMYZHn4EfPHBwzRnumP2vzBvc+vvi+OAyM2DWNdbz6bN9FvGeEBqb3 tU0p6n4nnPbAKaIlTRFPzrVhV5EgkEdZbVZddr5G5J0x6ggz1DPz2VqAbjQatreNhA ceQ4PgwJPb6pz2QrpHh5XqfvWNGGS3Wov6F6rn9o= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Timur Tabi , Danilo Krummrich , Sasha Levin Subject: [PATCH 6.12 35/95] drm/nouveau: remove unused memory target test Date: Tue, 2 Sep 2025 15:20:11 +0200 Message-ID: <20250902131940.957561787@linuxfoundation.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250902131939.601201881@linuxfoundation.org> References: <20250902131939.601201881@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Timur Tabi [ Upstream commit 64c722b5e7f6b909b0e448e580f64628a0d76208 ] The memory target check is a hold-over from a refactor. It's harmless but distracting, so just remove it. Fixes: 2541626cfb79 ("drm/nouveau/acr: use common falcon HS FW code for ACR FWs") Signed-off-by: Timur Tabi Link: https://lore.kernel.org/r/20250813001004.2986092-3-ttabi@nvidia.com Signed-off-by: Danilo Krummrich Signed-off-by: Sasha Levin --- drivers/gpu/drm/nouveau/nvkm/falcon/gm200.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nvkm/falcon/gm200.c b/drivers/gpu/drm/nouveau/nvkm/falcon/gm200.c index 6a004c6e67425..7c43397c19e61 100644 --- a/drivers/gpu/drm/nouveau/nvkm/falcon/gm200.c +++ b/drivers/gpu/drm/nouveau/nvkm/falcon/gm200.c @@ -249,9 +249,11 @@ int gm200_flcn_fw_load(struct nvkm_falcon_fw *fw) { struct nvkm_falcon *falcon = fw->falcon; - int target, ret; + int ret; if (fw->inst) { + int target; + nvkm_falcon_mask(falcon, 0x048, 0x00000001, 0x00000001); switch (nvkm_memory_target(fw->inst)) { @@ -285,15 +287,6 @@ gm200_flcn_fw_load(struct nvkm_falcon_fw *fw) } if (fw->boot) { - switch (nvkm_memory_target(&fw->fw.mem.memory)) { - case NVKM_MEM_TARGET_VRAM: target = 4; break; - case NVKM_MEM_TARGET_HOST: target = 5; break; - case NVKM_MEM_TARGET_NCOH: target = 6; break; - default: - WARN_ON(1); - return -EINVAL; - } - ret = nvkm_falcon_pio_wr(falcon, fw->boot, 0, 0, IMEM, falcon->code.limit - fw->boot_size, fw->boot_size, fw->boot_addr >> 8, false); -- 2.50.1