From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>,
Aurabindo Jayamohanan Pillai <Aurabindo.Pillai@amd.com>,
Pavle Kotarac <Pavle.Kotarac@amd.com>,
Daniel Wheeler <daniel.wheeler@amd.com>,
Alex Deucher <alexander.deucher@amd.com>,
Sasha Levin <sashal@kernel.org>,
harry.wentland@amd.com, sunpeng.li@amd.com,
christian.koenig@amd.com, Xinhui.Pan@amd.com, airlied@linux.ie,
daniel@ffwll.ch, Rodrigo.Siqueira@amd.com, qingqing.zhuo@amd.com,
Roman.Li@amd.com, aurabindo.pillai@amd.com,
nikola.cornij@amd.com, stylon.wang@amd.com,
amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org
Subject: [PATCH AUTOSEL 5.10 13/19] drm/amd/display: Reset DMCUB before HW init
Date: Mon, 20 Dec 2021 20:59:08 -0500 [thread overview]
Message-ID: <20211221015914.116767-13-sashal@kernel.org> (raw)
In-Reply-To: <20211221015914.116767-1-sashal@kernel.org>
From: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
[ Upstream commit 791255ca9fbe38042cfd55df5deb116dc11fef18 ]
[Why]
If the firmware wasn't reset by PSP or HW and is currently running
then the firmware will hang or perform underfined behavior when we
modify its firmware state underneath it.
[How]
Reset DMCUB before setting up cache windows and performing HW init.
Reviewed-by: Aurabindo Jayamohanan Pillai <Aurabindo.Pillai@amd.com>
Acked-by: Pavle Kotarac <Pavle.Kotarac@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index a5b6f36fe1d72..060d31db0c347 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -794,6 +794,11 @@ static int dm_dmub_hw_init(struct amdgpu_device *adev)
return 0;
}
+ /* Reset DMCUB if it was previously running - before we overwrite its memory. */
+ status = dmub_srv_hw_reset(dmub_srv);
+ if (status != DMUB_STATUS_OK)
+ DRM_WARN("Error resetting DMUB HW: %d\n", status);
+
hdr = (const struct dmcub_firmware_header_v1_0 *)dmub_fw->data;
fw_inst_const = dmub_fw->data +
--
2.34.1
next prev parent reply other threads:[~2021-12-21 2:00 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-21 1:58 [PATCH AUTOSEL 5.10 01/19] ARM: dts: ls1021a-tsn: update RGMII delays for sja1105 switch Sasha Levin
2021-12-21 1:58 ` [PATCH AUTOSEL 5.10 02/19] ARM: rockchip: Use memcpy_toio instead of memcpy on smp bring-up Sasha Levin
2021-12-21 1:58 ` [PATCH AUTOSEL 5.10 03/19] mac80211: set up the fwd_skb->dev for mesh forwarding Sasha Levin
2021-12-21 1:58 ` [PATCH AUTOSEL 5.10 04/19] mac80211: fix a memory leak where sta_info is not freed Sasha Levin
2021-12-21 1:59 ` [PATCH AUTOSEL 5.10 05/19] nl80211: reset regdom when reloading regdb Sasha Levin
2021-12-21 1:59 ` [PATCH AUTOSEL 5.10 06/19] iwlwifi: fix LED dependencies Sasha Levin
2021-12-21 1:59 ` [PATCH AUTOSEL 5.10 07/19] phonet: refcount leak in pep_sock_accep Sasha Levin
2021-12-21 1:59 ` [PATCH AUTOSEL 5.10 08/19] net: bcmgenet: Fix NULL vs IS_ERR() checking Sasha Levin
2021-12-21 1:59 ` [PATCH AUTOSEL 5.10 09/19] scsi: pm8001: Fix phys_to_virt() usage on dma_addr_t Sasha Levin
2021-12-21 1:59 ` [PATCH AUTOSEL 5.10 10/19] mac80211: Fix the size used for building probe request Sasha Levin
2021-12-21 1:59 ` [PATCH AUTOSEL 5.10 11/19] mac80211: update channel context before station state Sasha Levin
2021-12-21 1:59 ` [PATCH AUTOSEL 5.10 12/19] mac80211: do drv_reconfig_complete() before restarting all Sasha Levin
2021-12-21 1:59 ` Sasha Levin [this message]
2021-12-21 1:59 ` [PATCH AUTOSEL 5.10 14/19] drm/amdgpu: correct the wrong cached state for GMC on PICASSO Sasha Levin
2021-12-21 1:59 ` [PATCH AUTOSEL 5.10 15/19] block: reduce kblockd_mod_delayed_work_on() CPU consumption Sasha Levin
2021-12-21 1:59 ` [PATCH AUTOSEL 5.10 16/19] net: usb: lan78xx: add Allied Telesis AT29M2-AF Sasha Levin
2021-12-21 1:59 ` [PATCH AUTOSEL 5.10 17/19] virtio_net: fix rx_drops stat for small pkts Sasha Levin
2021-12-21 1:59 ` [PATCH AUTOSEL 5.10 18/19] bpf: Make 32->64 bounds propagation slightly more robust Sasha Levin
2021-12-21 1:59 ` [PATCH AUTOSEL 5.10 19/19] Revert "block: reduce kblockd_mod_delayed_work_on() CPU consumption" 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=20211221015914.116767-13-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=Aurabindo.Pillai@amd.com \
--cc=Pavle.Kotarac@amd.com \
--cc=Rodrigo.Siqueira@amd.com \
--cc=Roman.Li@amd.com \
--cc=Xinhui.Pan@amd.com \
--cc=airlied@linux.ie \
--cc=alexander.deucher@amd.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=christian.koenig@amd.com \
--cc=daniel.wheeler@amd.com \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=harry.wentland@amd.com \
--cc=linux-kernel@vger.kernel.org \
--cc=nicholas.kazlauskas@amd.com \
--cc=nikola.cornij@amd.com \
--cc=qingqing.zhuo@amd.com \
--cc=stable@vger.kernel.org \
--cc=stylon.wang@amd.com \
--cc=sunpeng.li@amd.com \
/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
all inboxes | Powered by JetHome®