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 9DA9F23B612; Mon, 23 Mar 2026 14:47:01 +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=1774277221; cv=none; b=LUrUWso7lcPYCC7uXfqK9JijpnCQIaFurGudFcf3+aqI0r2wNBhWnXWf7qSxkFqOIaaIdBDGibogRCKq5Xw5BthUg11Q0iBOCoJScxv2t8lLqbT5O4axCdR2DdeJg5rqVTCNidovslvpagSHfUwhL4o9xo83uqmlF+TjJavbSm4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774277221; c=relaxed/simple; bh=Q4sz64RWZExZEm41/V4y2AYflZrCF/+2eBWxF6QDx1k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=n37s2nN8NxJcP58RrgDoqC8o+wlKzE1KpLdU+YXSkwT3S7m9Pr6Te3+U+6JqphYTZakGmmdk5365co/dqhuqglliSXwqaog72GBDRItwANsaQRhO5fxGLqfACm0/sfAWhr5RDc59LBPed+d5Y/Id4EWL7GIUXOWfKB2IU1JrtAE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=AOZH3TAz; 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="AOZH3TAz" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3271FC4CEF7; Mon, 23 Mar 2026 14:47:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1774277221; bh=Q4sz64RWZExZEm41/V4y2AYflZrCF/+2eBWxF6QDx1k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AOZH3TAzYkRNZRLDc9v4ZvJiF4mCPIof8AVmeyz2ANIOe+Ywl4F/YDrFRKXiB+4b0 uNuV4uetS/8oXg0UZDJ5NKp9bfU68Kq4H6pMvhdY5kT2mTQ4g7/SBicEjeu0uEdIKr yqxZZLyxoadCovZyfWTilp1ltWXZt0i5+EDPWvI0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Alex Deucher Subject: [PATCH 6.12 360/460] drm/amdgpu: apply state adjust rules to some additional HAINAN vairants Date: Mon, 23 Mar 2026 14:45:56 +0100 Message-ID: <20260323134535.403477117@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260323134526.647552166@linuxfoundation.org> References: <20260323134526.647552166@linuxfoundation.org> User-Agent: quilt/0.69 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: Alex Deucher commit 9787f7da186ee8143b7b6d914cfa0b6e7fee2648 upstream. They need a similar workaround. Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/1839 Signed-off-by: Alex Deucher (cherry picked from commit 0de31d92a173d3d94f28051b0b80a6c98913aed4) Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- a/drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c +++ b/drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c @@ -3440,9 +3440,11 @@ static void si_apply_state_adjust_rules( if (adev->asic_type == CHIP_HAINAN) { if ((adev->pdev->revision == 0x81) || (adev->pdev->revision == 0xC3) || + (adev->pdev->device == 0x6660) || (adev->pdev->device == 0x6664) || (adev->pdev->device == 0x6665) || - (adev->pdev->device == 0x6667)) { + (adev->pdev->device == 0x6667) || + (adev->pdev->device == 0x666F)) { max_sclk = 75000; } if ((adev->pdev->revision == 0xC3) ||