]>
Commit | Line | Data |
---|---|---|
df64f132 SL |
1 | From f89378511ab34506071b6943d1e2bef2122d54fd Mon Sep 17 00:00:00 2001 |
2 | From: Sasha Levin <sashal@kernel.org> | |
3 | Date: Thu, 21 Mar 2024 13:49:43 -0400 | |
4 | Subject: drm/amd/display: Do not recursively call manual trigger programming | |
5 | ||
6 | From: Dillon Varone <dillon.varone@amd.com> | |
7 | ||
8 | [ Upstream commit 953927587f37b731abdeabe46ad44a3b3ec67a52 ] | |
9 | ||
10 | [WHY&HOW] | |
11 | We should not be recursively calling the manual trigger programming function when | |
12 | FAMS is not in use. | |
13 | ||
14 | Cc: stable@vger.kernel.org | |
15 | Reviewed-by: Alvin Lee <alvin.lee2@amd.com> | |
16 | Acked-by: Hamza Mahfooz <hamza.mahfooz@amd.com> | |
17 | Signed-off-by: Dillon Varone <dillon.varone@amd.com> | |
18 | Signed-off-by: Alex Deucher <alexander.deucher@amd.com> | |
19 | Signed-off-by: Sasha Levin <sashal@kernel.org> | |
20 | --- | |
21 | drivers/gpu/drm/amd/display/dc/dcn32/dcn32_optc.c | 3 --- | |
22 | 1 file changed, 3 deletions(-) | |
23 | ||
24 | diff --git a/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_optc.c b/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_optc.c | |
25 | index a974f86e718a8..37c645a882dd8 100644 | |
26 | --- a/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_optc.c | |
27 | +++ b/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_optc.c | |
28 | @@ -216,9 +216,6 @@ static void optc32_setup_manual_trigger(struct timing_generator *optc) | |
29 | OTG_V_TOTAL_MAX_SEL, 1, | |
30 | OTG_FORCE_LOCK_ON_EVENT, 0, | |
31 | OTG_SET_V_TOTAL_MIN_MASK, (1 << 1)); /* TRIGA */ | |
32 | - | |
33 | - // Setup manual flow control for EOF via TRIG_A | |
34 | - optc->funcs->setup_manual_trigger(optc); | |
35 | } | |
36 | } | |
37 | ||
38 | -- | |
39 | 2.43.0 | |
40 |