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 CDC3B30C340; Tue, 2 Sep 2025 13:25:17 +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=1756819518; cv=none; b=W5LGW26TaVj093FhLO/oDE/gwdf+CnXQSXBdKIXakgMTg4TqP24GF4yXxYAhLcBBicyibRjTLVj+pvWfrMwNqE7G3UWADrMA1u+haRLAq5ScugHYX0gKL/5SF83vWE7x6iA5akEz+cSOkUCmt4hTvnpcwjg6o/Cvy/Ip/Xc1lfc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756819518; c=relaxed/simple; bh=XQ3fMf40KU+Q3em2Up6BwL78p44HeiySe0p4Ulewer4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QH8A7CkyJYCHZ2ubpWakHOYlTouCsOEND1Kzn7xfeFB18NDXakGxON9USBxrCrnxTwMnvn5R4g1QIa6Vuk1Y0cP59i0jEQwR/WAER/+h9yKgbZuJlnr4j6dQqHwdTeRkYgk5tuP5/qy7DTIkHYDwvXyLtWr+EAylm5EYsfpt3zU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Y+y2MO73; 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="Y+y2MO73" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 683AAC4CEF4; Tue, 2 Sep 2025 13:25:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1756819517; bh=XQ3fMf40KU+Q3em2Up6BwL78p44HeiySe0p4Ulewer4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Y+y2MO73dxLEvLIoqLtf+NvzWwFtfZZ1sVaPuP0TMHPI0XL8S771AkITSUHzdCVVQ JsJGVB3MR4PoSZX8bPscENODgOWqOQ+alwwukTCN9p4pD2r99+6KkDPU8If0F84eOb Ytx4x68TaRhz5VgWpPPtE/9gvlJWIoisJfI3U+8c= 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.16 056/142] drm/nouveau: remove unused memory target test Date: Tue, 2 Sep 2025 15:19:18 +0200 Message-ID: <20250902131950.398491838@linuxfoundation.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250902131948.154194162@linuxfoundation.org> References: <20250902131948.154194162@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.16-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