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 B0C068F58; Mon, 4 Mar 2024 21:39: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=1709588376; cv=none; b=Vd08Hr3CSnnDFVmTO7GHGZ9XQ+fbgFlLSBFuv/+YMu0SQELXglWw2Y+BPfqwbsgO5TCcaM6z4JUg0TQxK8L+SUbnhcD6lcG040twP3rlHyOhHZCVnXMCQDOZj5g0BKiNfgEEoOpp9aXbPO79twDBFlKCQ2X+0i9AatqhDYv2vIo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709588376; c=relaxed/simple; bh=rGqtfJ2guZZ4VjrPpb45W5gXtPZMPvNyaCbnJst5dH0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Uoss4Wog6FnKExJZziQIVgvxwlAt8bbn4jG5kz1oBeUAcbMG647nwusKCkzYW2tIlZBstLfHyjVuZjA82WsqnOchUkG53EsigaZl8rTtf1m1r2BFW7tuKjACrX4RGs0XdyHiKwuScgLOGXZyOqxbrFygjHoAX6vDdvzZ3hCjsQM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=EkrXFOjr; 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="EkrXFOjr" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 43FC3C433C7; Mon, 4 Mar 2024 21:39:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1709588376; bh=rGqtfJ2guZZ4VjrPpb45W5gXtPZMPvNyaCbnJst5dH0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EkrXFOjroDKrxL7UDCLX29W6pXhm63Vmz44Wcy25IxdQoX+Xi4fENmCIO57jXmTPe cFtdzXXi/DW8ArutXQn2BNK5dYAERTV5PPaatbfqqreqXh5/kNQEG2c2LP60RqWaYa hqrMxQ9rwvafsLb9+INx6KT4hXlk7bbXXAYFW8ns= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Yang Wang , Alex Deucher Subject: [PATCH 6.6 084/143] Revert "drm/amd/pm: resolve reboot exception for si oland" Date: Mon, 4 Mar 2024 21:23:24 +0000 Message-ID: <20240304211552.610882059@linuxfoundation.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240304211549.876981797@linuxfoundation.org> References: <20240304211549.876981797@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Alex Deucher commit 955558030954b9637b41c97b730f9b38c92ac488 upstream. This reverts commit e490d60a2f76bff636c68ce4fe34c1b6c34bbd86. This causes hangs on SI when DC is enabled and errors on driver reboot and power off cycles. Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/3216 Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/2755 Reviewed-by: Yang Wang Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) --- a/drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c +++ b/drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c @@ -6925,6 +6925,23 @@ static int si_dpm_enable(struct amdgpu_d return 0; } +static int si_set_temperature_range(struct amdgpu_device *adev) +{ + int ret; + + ret = si_thermal_enable_alert(adev, false); + if (ret) + return ret; + ret = si_thermal_set_temperature_range(adev, R600_TEMP_RANGE_MIN, R600_TEMP_RANGE_MAX); + if (ret) + return ret; + ret = si_thermal_enable_alert(adev, true); + if (ret) + return ret; + + return ret; +} + static void si_dpm_disable(struct amdgpu_device *adev) { struct rv7xx_power_info *pi = rv770_get_pi(adev); @@ -7608,6 +7625,18 @@ static int si_dpm_process_interrupt(stru static int si_dpm_late_init(void *handle) { + int ret; + struct amdgpu_device *adev = (struct amdgpu_device *)handle; + + if (!adev->pm.dpm_enabled) + return 0; + + ret = si_set_temperature_range(adev); + if (ret) + return ret; +#if 0 //TODO ? + si_dpm_powergate_uvd(adev, true); +#endif return 0; }