From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Evan Quan <evan.quan@amd.com>,
Sandeep Raghuraman <sandy.8925@gmail.com>,
Alex Deucher <alexander.deucher@amd.com>,
Sasha Levin <sashal@kernel.org>,
amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org
Subject: [PATCH AUTOSEL 4.19 09/21] drm/amd/pm: do not use ixFEATURE_STATUS for checking smc running
Date: Mon, 9 Nov 2020 22:55:29 -0500 [thread overview]
Message-ID: <20201110035541.424648-9-sashal@kernel.org> (raw)
In-Reply-To: <20201110035541.424648-1-sashal@kernel.org>
From: Evan Quan <evan.quan@amd.com>
[ Upstream commit 786436b453001dafe81025389f96bf9dac1e9690 ]
This reverts commit f87812284172a9809820d10143b573d833cd3f75 ("drm/amdgpu:
Fix bug where DPM is not enabled after hibernate and resume").
It was intended to fix Hawaii S4(hibernation) issue but break S3. As
ixFEATURE_STATUS is filled with garbage data on resume which can be
only cleared by reloading smc firmware(but that will involve many
changes). So, we will revert this S4 fix and seek a new way.
Signed-off-by: Evan Quan <evan.quan@amd.com>
Tested-by: Sandeep Raghuraman <sandy.8925@gmail.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c
index 0d4dd607e85c8..c05bec5effb2e 100644
--- a/drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c
+++ b/drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c
@@ -2723,10 +2723,7 @@ static int ci_initialize_mc_reg_table(struct pp_hwmgr *hwmgr)
static bool ci_is_dpm_running(struct pp_hwmgr *hwmgr)
{
- return (1 == PHM_READ_INDIRECT_FIELD(hwmgr->device,
- CGS_IND_REG__SMC, FEATURE_STATUS,
- VOLTAGE_CONTROLLER_ON))
- ? true : false;
+ return ci_is_smc_ram_running(hwmgr);
}
static int ci_smu_init(struct pp_hwmgr *hwmgr)
--
2.27.0
next prev parent reply other threads:[~2020-11-10 4:00 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-10 3:55 [PATCH AUTOSEL 4.19 01/21] usb: gadget: goku_udc: fix potential crashes in probe Sasha Levin
2020-11-10 3:55 ` [PATCH AUTOSEL 4.19 02/21] ALSA: hda: Reinstate runtime_allow() for all hda controllers Sasha Levin
2020-11-10 3:55 ` [PATCH AUTOSEL 4.19 03/21] gfs2: Free rd_bits later in gfs2_clear_rgrpd to fix use-after-free Sasha Levin
2020-11-10 3:55 ` [PATCH AUTOSEL 4.19 04/21] gfs2: Add missing truncate_inode_pages_final for sd_aspace Sasha Levin
2020-11-10 3:55 ` [PATCH AUTOSEL 4.19 05/21] gfs2: check for live vs. read-only file system in gfs2_fitrim Sasha Levin
2020-11-10 3:55 ` [PATCH AUTOSEL 4.19 06/21] scsi: hpsa: Fix memory leak in hpsa_init_one() Sasha Levin
2020-11-10 3:55 ` [PATCH AUTOSEL 4.19 07/21] drm/amdgpu: perform srbm soft reset always on SDMA resume Sasha Levin
2020-11-10 3:55 ` [PATCH AUTOSEL 4.19 08/21] drm/amd/pm: perform SMC reset on suspend/hibernation Sasha Levin
2020-11-10 3:55 ` Sasha Levin [this message]
2020-11-10 3:55 ` [PATCH AUTOSEL 4.19 10/21] mac80211: fix use of skb payload instead of header Sasha Levin
2020-11-10 3:55 ` [PATCH AUTOSEL 4.19 11/21] mac80211: always wind down STA state Sasha Levin
2020-11-10 3:55 ` [PATCH AUTOSEL 4.19 12/21] cfg80211: regulatory: Fix inconsistent format argument Sasha Levin
2020-11-10 3:55 ` [PATCH AUTOSEL 4.19 13/21] scsi: scsi_dh_alua: Avoid crash during alua_bus_detach() Sasha Levin
2020-11-10 3:55 ` [PATCH AUTOSEL 4.19 14/21] iommu/amd: Increase interrupt remapping table limit to 512 entries Sasha Levin
2020-11-10 3:55 ` [PATCH AUTOSEL 4.19 15/21] s390/smp: move rcu_cpu_starting() earlier Sasha Levin
2020-11-10 3:55 ` [PATCH AUTOSEL 4.19 16/21] vfio: platform: fix reference leak in vfio_platform_open Sasha Levin
2020-11-10 3:55 ` [PATCH AUTOSEL 4.19 17/21] net: usb: qmi_wwan: add Telit LE910Cx 0x1230 composition Sasha Levin
2020-11-10 3:55 ` [PATCH AUTOSEL 4.19 18/21] kprobes: Tell lockdep about kprobe nesting Sasha Levin
2020-11-10 6:44 ` Masami Hiramatsu
2020-11-14 22:58 ` Sasha Levin
2020-11-10 3:55 ` [PATCH AUTOSEL 4.19 19/21] selftests: proc: fix warning: _GNU_SOURCE redefined Sasha Levin
2020-11-10 3:55 ` [PATCH AUTOSEL 4.19 20/21] tpm_tis: Disable interrupts on ThinkPad T490s Sasha Levin
2020-11-10 3:55 ` [PATCH AUTOSEL 4.19 21/21] vt: Disable KD_FONT_OP_COPY Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201110035541.424648-9-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=alexander.deucher@amd.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=evan.quan@amd.com \
--cc=linux-kernel@vger.kernel.org \
--cc=sandy.8925@gmail.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).