From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 34C2B3A6F05 for ; Mon, 27 Jul 2026 15:28:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.46 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785166111; cv=none; b=UPIsybWzmtIxiY5SAgE/LjxhMdcZWfyIjGeZPnwO1iylJ9qlxCYjhlcFSyXFbm8ilFI8fIi7bolGJnckxhrx3M2ZeK/GqABKYks1V5jqALtId/UMqV3ZMQrVZMTalxeVm8J+IoPW7cn3oXEDBNm2nVuNV/apk9GktUuNM8WFrGU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785166111; c=relaxed/simple; bh=LW3rykIObjoVbdM9XrZOZgOQ9QD2pcE7WUe9cWipH3w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gAiyXcRkVIzB9n2uAr2RE8Y2Sb3tzPwo6ZLfHyO2awAbbceSWwdFkGEVlgAiHdgUTb0pAmTYKUDVZunET1HL5DqPqdJMKKW5/Zse62EFJqgXseExZfMTsZmpqZrKZrZDiZFT5dvetaeUYFKfWQMi14zKXWT150kundAPBrhjac4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=r3PZ1QF8; arc=none smtp.client-ip=209.85.128.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="r3PZ1QF8" Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-49558ce01afso21491905e9.1 for ; Mon, 27 Jul 2026 08:28:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785166108; x=1785770908; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=bgMfUYC7ZpwL2pGUZegRGSOZuFsMOmvyJZY8xkpkpds=; b=r3PZ1QF8g18ikLLo/fIJ1ATZUGinUjutk6wLpVHOogqiBkH3WryVQJ1UA8AsKFdU5u Ckve/eMjfNwKqpBRnTGRgmdO7fj595IqM0ej4i+qblfyyrpsiRq+0UhSNzCj78Em8E5F 5XsNHu7AID7RpzQwYWr2Rj+4BJc3ug4bFpEo1LGx68wMbdV4Vdw23jmcAPCBMMZVJcZ8 /Cx7PH72vxNFr8NZPmp5ptW1Nk3hCY4AdbI7UxLd4RVY495RJiGMYLiux8DQ7wMa3sD7 RaJshmYY8fh+pZ+jaSLgzgNeccvVO+7orjs55vF5pYMD46KGTjQXEXl8vQ+2A5ikNRXZ an4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785166108; x=1785770908; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=bgMfUYC7ZpwL2pGUZegRGSOZuFsMOmvyJZY8xkpkpds=; b=VLaFaQKNja1V0WXqcj6VA9/bJIYA/ZQ+sciiDQ5oxKNxO1kKE0aNHaQWAma6BKaks8 J90iRClhkiSGll4WGWLHVmka/UTZEw4+l9o5zF2i/6ScfVuLMxkYKGc6eTwFThDk0p8j lkUAI/oeXRG+GcQnCmTnAeGjIhulullf6iJNv+qS+PZTqUVhMbyCURuTZuEjjXw1LwWS huzFUOD8yvuqPwwKTWknoqY+p+TQ33m8w+ZmjDlksWNw9u7VSeVqMy/AIT1dYafl+MeK MGqQfztHOmU8JN4hyAV9CHbDsNWZHwnQ2/+EIQAtRE7/DR32wjJTHX3dLSCJZAhRdAY2 a8Fw== X-Forwarded-Encrypted: i=1; AHgh+RppBRRHKYk0M3hEJZTcebTt1g29MSoYuQ2CfO4pzFIbLQqRJzwNGDoiApLtTNLiHoTS69MVDBQN+wNPiZE=@vger.kernel.org X-Gm-Message-State: AOJu0Yy2U8IzMvmfdheazs3zWgTHteThZP0Tr/YKoq2zEtSfGaYP77cG OYkgcS7FCnf+2cjAXWm0Rywnn+YxEzmkPLdu7U8Hxx6Vr6d9d/Me2Vh8 X-Gm-Gg: AR+sD12VjeI8UDQuYD0teKO0PoScrGfRvRAF9ScGyHZ+zdBnCH/hq7MInj4Abz+b22P Cz5D0L9MOPfKEaox249MMV67oH/2WyE8oGhfA9D2YvcT/qIkgwjSgrQUaHRvdGD0RkF6AHi/O+T jbD6qrNe0ZSetC4P7SWRsgThCSsSc8rg1z05aRMv55mRl+5pzYtzB2MrXZrR/bczRsGRLmueQ+c lNsXl0UBQeRgWLlCts9No5Ec7rx47HY+ZBzkI0M/yRJsBVst5s7vEFerKjZKhKmoKe9O6nZVbeC SVU7FboqgAxHxKVqAj8WLXc8JwdgKcsRBaUj0HrxIkYRh1vsmu9CP54g3cuBs7A+7W2bpY10jlK FPhfa49u8hqqCobW4tZUhQi80B4effUyndodyJeSpK+DSAQSPAsdNfPJld7s2HgDLEbWcvTW78V iggEAPe0k= X-Received: by 2002:a05:600c:3488:b0:495:7a23:1eee with SMTP id 5b1f17b1804b1-496c3a0cc27mr15603325e9.12.1785166108275; Mon, 27 Jul 2026 08:28:28 -0700 (PDT) Received: from fra-x8664.lan ([151.16.232.22]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4957b816ef8sm214838735e9.1.2026.07.27.08.28.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Jul 2026 08:28:27 -0700 (PDT) From: Francesco Magazzu To: Lyude Paul , Danilo Krummrich Cc: dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org, linux-kernel@vger.kernel.org, Karol Herbst Subject: [PATCH 2/2] drm/nouveau/clk: only update clk->pstate after hardware programming succeeds Date: Mon, 27 Jul 2026 17:28:21 +0200 Message-ID: <20260727152821.128432-3-postadelmaga@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260727152821.128432-1-postadelmaga@gmail.com> References: <20260727152821.128432-1-postadelmaga@gmail.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 nvkm_pstate_prog() wrote clk->pstate = pstatei before attempting the RAM and core clock reprogramming. If either step failed, the software state tracker had already committed to the new pstate even though the hardware transition never completed, and a later re-request for that same state could be skipped (pstate != clk->pstate would be false), leaving the hardware stuck out of sync with what the driver believes it's running. Move the assignment to after nvkm_cstate_prog() returns, and only commit it on success. Found by Sashiko AI review (https://sashiko.dev) while reviewing "[PATCH v2 2/4] drm/nouveau/clk: don't use the pstate cursor after the loop" (20260712123616.1180830-1-postadelmaga@gmail.com) as a pre-existing issue. Signed-off-by: Francesco Magazzu --- nvkm/subdev/clk/base.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/nvkm/subdev/clk/base.c b/nvkm/subdev/clk/base.c index 737bec8..91c51d4 100644 --- a/nvkm/subdev/clk/base.c +++ b/nvkm/subdev/clk/base.c @@ -285,7 +285,6 @@ nvkm_pstate_prog(struct nvkm_clk *clk, int pstatei) return -EINVAL; nvkm_debug(subdev, "setting performance state %d\n", pstatei); - clk->pstate = pstatei; nvkm_pcie_set_link(pci, pstate->pcie_speed, pstate->pcie_width); @@ -302,7 +301,11 @@ nvkm_pstate_prog(struct nvkm_clk *clk, int pstatei) return ret; } - return nvkm_cstate_prog(clk, pstate, NVKM_CLK_CSTATE_HIGHEST); + ret = nvkm_cstate_prog(clk, pstate, NVKM_CLK_CSTATE_HIGHEST); + if (ret == 0) + clk->pstate = pstatei; + + return ret; } static void -- 2.55.0