From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Roman Li <Roman.Li@amd.com>,
Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>,
Alex Deucher <alexander.deucher@amd.com>,
Sasha Levin <sashal@kernel.org>,
harry.wentland@amd.com, sunpeng.li@amd.com,
Rodrigo.Siqueira@amd.com, christian.koenig@amd.com,
Xinhui.Pan@amd.com, airlied@linux.ie, daniel@ffwll.ch,
qingqing.zhuo@amd.com, shenshih@amd.com,
aurabindo.pillai@amd.com, nikola.cornij@amd.com,
Wayne.Lin@amd.com, Anson.Jacob@amd.com,
meenakshikumar.somasundaram@amd.com, michael.strauss@amd.com,
haonan.wang2@amd.com, aric.cyr@amd.com, anthony1.wang@amd.com,
Martin.Leung@amd.com, Jimmy.Kizito@amd.com, Eric.Yang2@amd.com,
lee.jones@linaro.org, Lewis.Huang@amd.com,
MarkAlbert.Morra@amd.com, Jerry.Zuo@amd.com,
amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org
Subject: [PATCH AUTOSEL 5.16 30/34] drm/amd/display: Cap pflip irqs per max otg number
Date: Tue, 15 Feb 2022 10:26:53 -0500 [thread overview]
Message-ID: <20220215152657.580200-30-sashal@kernel.org> (raw)
In-Reply-To: <20220215152657.580200-1-sashal@kernel.org>
From: Roman Li <Roman.Li@amd.com>
[ Upstream commit 328e34a5ad227399391891d454043e5d73e598d2 ]
[Why]
pflip interrupt order are mapped 1 to 1 to otg id.
e.g. if irq_src=26 corresponds to otg0 then 27->otg1, 28->otg2...
Linux DM registers pflip interrupts per number of crtcs.
In fused pipe case crtc numbers can be less than otg id.
e.g. if one pipe out of 3(otg#0-2) is fused adev->mode_info.num_crtc=2
so DM only registers irq_src 26,27.
This is a bug since if pipe#2 remains unfused DM never gets
otg2 pflip interrupt (irq_src=28)
That may results in gfx failure due to pflip timeout.
[How]
Register pflip interrupts per max num of otg instead of num_crtc
Signed-off-by: Roman Li <Roman.Li@amd.com>
Reviewed-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 | 2 +-
drivers/gpu/drm/amd/display/dc/core/dc.c | 2 ++
drivers/gpu/drm/amd/display/dc/dc.h | 1 +
3 files changed, 4 insertions(+), 1 deletion(-)
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 efcb25ef1809a..0117b00b4ed83 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -3629,7 +3629,7 @@ static int dcn10_register_irq_handlers(struct amdgpu_device *adev)
/* Use GRPH_PFLIP interrupt */
for (i = DCN_1_0__SRCID__HUBP0_FLIP_INTERRUPT;
- i <= DCN_1_0__SRCID__HUBP0_FLIP_INTERRUPT + adev->mode_info.num_crtc - 1;
+ i <= DCN_1_0__SRCID__HUBP0_FLIP_INTERRUPT + dc->caps.max_otg_num - 1;
i++) {
r = amdgpu_irq_add_id(adev, SOC15_IH_CLIENTID_DCE, i, &adev->pageflip_irq);
if (r) {
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c
index f0fbd8ad56229..e890e063cde31 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
@@ -1237,6 +1237,8 @@ struct dc *dc_create(const struct dc_init_data *init_params)
dc->caps.max_dp_protocol_version = DP_VERSION_1_4;
+ dc->caps.max_otg_num = dc->res_pool->res_cap->num_timing_generator;
+
if (dc->res_pool->dmcu != NULL)
dc->versions.dmcu_version = dc->res_pool->dmcu->dmcu_version;
}
diff --git a/drivers/gpu/drm/amd/display/dc/dc.h b/drivers/gpu/drm/amd/display/dc/dc.h
index 618e7989176fc..14864763a1881 100644
--- a/drivers/gpu/drm/amd/display/dc/dc.h
+++ b/drivers/gpu/drm/amd/display/dc/dc.h
@@ -190,6 +190,7 @@ struct dc_caps {
#endif
bool vbios_lttpr_aware;
bool vbios_lttpr_enable;
+ uint32_t max_otg_num;
};
struct dc_bug_wa {
--
2.34.1
next prev parent reply other threads:[~2022-02-15 15:29 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-15 15:26 [PATCH AUTOSEL 5.16 01/34] ARM: OMAP2+: hwmod: Add of_node_put() before break Sasha Levin
2022-02-15 15:26 ` [PATCH AUTOSEL 5.16 02/34] ARM: OMAP2+: adjust the location of put_device() call in omapdss_init_of Sasha Levin
2022-02-15 15:26 ` [PATCH AUTOSEL 5.16 03/34] phy: usb: Leave some clocks running during suspend Sasha Levin
2022-02-15 15:26 ` [PATCH AUTOSEL 5.16 04/34] staging: vc04_services: Fix RCU dereference check Sasha Levin
2022-02-15 15:26 ` [PATCH AUTOSEL 5.16 05/34] phy: phy-mtk-tphy: Fix duplicated argument in phy-mtk-tphy Sasha Levin
2022-02-15 15:26 ` [PATCH AUTOSEL 5.16 06/34] usb: usb251xb: add boost-up property support Sasha Levin
2022-02-15 16:21 ` Greg Kroah-Hartman
2022-02-15 15:26 ` [PATCH AUTOSEL 5.16 07/34] irqchip/sifive-plic: Add missing thead,c900-plic match string Sasha Levin
2022-02-15 15:26 ` [PATCH AUTOSEL 5.16 08/34] x86/bug: Merge annotate_reachable() into _BUG_FLAGS() asm Sasha Levin
2022-02-15 15:26 ` [PATCH AUTOSEL 5.16 09/34] netfilter: conntrack: don't refresh sctp entries in closed state Sasha Levin
2022-02-15 15:26 ` [PATCH AUTOSEL 5.16 10/34] ksmbd: fix same UniqueId for dot and dotdot entries Sasha Levin
2022-02-15 15:26 ` [PATCH AUTOSEL 5.16 11/34] ksmbd: don't align last entry offset in smb2 query directory Sasha Levin
2022-02-15 15:26 ` [PATCH AUTOSEL 5.16 12/34] arm64: dts: meson-gx: add ATF BL32 reserved-memory region Sasha Levin
2022-02-15 15:26 ` [PATCH AUTOSEL 5.16 13/34] arm64: dts: meson-g12: " Sasha Levin
2022-02-15 15:26 ` [PATCH AUTOSEL 5.16 14/34] arm64: dts: meson-g12: drop BL32 region from SEI510/SEI610 Sasha Levin
2022-02-15 15:26 ` [PATCH AUTOSEL 5.16 15/34] pidfd: fix test failure due to stack overflow on some arches Sasha Levin
2022-02-15 15:26 ` [PATCH AUTOSEL 5.16 16/34] selftests: fixup build warnings in pidfd / clone3 tests Sasha Levin
2022-02-15 15:26 ` [PATCH AUTOSEL 5.16 17/34] mm: io_uring: allow oom-killer from io_uring_setup Sasha Levin
2022-02-15 15:26 ` [PATCH AUTOSEL 5.16 18/34] ACPI: PM: Revert "Only mark EC GPE for wakeup on Intel systems" Sasha Levin
2022-02-15 15:26 ` [PATCH AUTOSEL 5.16 19/34] kconfig: let 'shell' return enough output for deep path names Sasha Levin
2022-02-15 15:26 ` [PATCH AUTOSEL 5.16 20/34] scsi: lpfc: Remove NVMe support if kernel has NVME_FC disabled Sasha Levin
2022-02-15 15:26 ` [PATCH AUTOSEL 5.16 21/34] scsi: lpfc: Reduce log messages seen after firmware download Sasha Levin
2022-02-15 15:26 ` [PATCH AUTOSEL 5.16 22/34] ata: libata-core: Disable TRIM on M88V29 Sasha Levin
2022-02-15 15:26 ` [PATCH AUTOSEL 5.16 23/34] soc: aspeed: lpc-ctrl: Block error printing on probe defer cases Sasha Levin
2022-02-15 15:26 ` [PATCH AUTOSEL 5.16 24/34] xprtrdma: fix pointer derefs in error cases of rpcrdma_ep_create Sasha Levin
2022-02-15 15:26 ` [PATCH AUTOSEL 5.16 25/34] drm/rockchip: dw_hdmi: Do not leave clock enabled in error case Sasha Levin
2022-02-15 15:26 ` [PATCH AUTOSEL 5.16 26/34] tracing: Fix tp_printk option related with tp_printk_stop_on_boot Sasha Levin
2022-02-15 15:26 ` [PATCH AUTOSEL 5.16 27/34] NFSD: Fix offset type in I/O trace points Sasha Levin
2022-02-15 15:26 ` [PATCH AUTOSEL 5.16 28/34] display/amd: decrease message verbosity about watermarks table failure Sasha Levin
2022-02-15 15:26 ` [PATCH AUTOSEL 5.16 29/34] drm/amdgpu: add utcl2_harvest to gc 10.3.1 Sasha Levin
2022-02-15 15:26 ` Sasha Levin [this message]
2022-02-15 15:26 ` [PATCH AUTOSEL 5.16 31/34] drm/amd/display: fix yellow carp wm clamping Sasha Levin
2022-02-15 15:26 ` [PATCH AUTOSEL 5.16 32/34] net: usb: qmi_wwan: Add support for Dell DW5829e Sasha Levin
2022-02-15 15:26 ` [PATCH AUTOSEL 5.16 33/34] net: macb: Align the dma and coherent dma masks Sasha Levin
2022-02-15 15:26 ` [PATCH AUTOSEL 5.16 34/34] kconfig: fix failing to generate auto.conf 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=20220215152657.580200-30-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=Anson.Jacob@amd.com \
--cc=Eric.Yang2@amd.com \
--cc=Jerry.Zuo@amd.com \
--cc=Jimmy.Kizito@amd.com \
--cc=Lewis.Huang@amd.com \
--cc=MarkAlbert.Morra@amd.com \
--cc=Martin.Leung@amd.com \
--cc=Rodrigo.Siqueira@amd.com \
--cc=Roman.Li@amd.com \
--cc=Wayne.Lin@amd.com \
--cc=Xinhui.Pan@amd.com \
--cc=airlied@linux.ie \
--cc=alexander.deucher@amd.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=anthony1.wang@amd.com \
--cc=aric.cyr@amd.com \
--cc=aurabindo.pillai@amd.com \
--cc=christian.koenig@amd.com \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=haonan.wang2@amd.com \
--cc=harry.wentland@amd.com \
--cc=lee.jones@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=meenakshikumar.somasundaram@amd.com \
--cc=michael.strauss@amd.com \
--cc=nicholas.kazlauskas@amd.com \
--cc=nikola.cornij@amd.com \
--cc=qingqing.zhuo@amd.com \
--cc=shenshih@amd.com \
--cc=stable@vger.kernel.org \
--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;
as well as URLs for NNTP newsgroup(s).