* [PATCH] drm/amd/display: Reduce dmesg error to a debug print
@ 2022-03-01 6:04 Mario Limonciello
2022-03-01 6:04 ` Mario Limonciello
2022-03-05 11:19 ` Greg KH
0 siblings, 2 replies; 3+ messages in thread
From: Mario Limonciello @ 2022-03-01 6:04 UTC (permalink / raw)
To: stable; +Cc: Leo (Hanghong) Ma, Nicholas Kazlauskas, Alex Deucher
From: "Leo (Hanghong) Ma" <hanghong.ma@amd.com>
[Why & How]
Dmesg errors are found on dcn3.1 during reset test, but it's not
a really failure. So reduce it to a debug print.
Signed-off-by: Leo (Hanghong) Ma <hanghong.ma@amd.com>
Reviewed-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
(cherry picked from commit 1d925758ba1a5d2716a847903e2fd04efcbd9862)
---
Add explicit definition for macro not present in 5.15.y currently
Backport to 5.15.y only, different backport for newer kernel.
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 4 +++-
drivers/gpu/drm/amd/display/include/logger_types.h | 3 +++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
index 93c20844848c..605b96873d8c 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
@@ -3650,7 +3650,9 @@ bool dp_retrieve_lttpr_cap(struct dc_link *link)
lttpr_dpcd_data,
sizeof(lttpr_dpcd_data));
if (status != DC_OK) {
- dm_error("%s: Read LTTPR caps data failed.\n", __func__);
+#if defined(CONFIG_DRM_AMD_DC_DCN)
+ DC_LOG_DP2("%s: Read LTTPR caps data failed.\n", __func__);
+#endif
return false;
}
diff --git a/drivers/gpu/drm/amd/display/include/logger_types.h b/drivers/gpu/drm/amd/display/include/logger_types.h
index 571fcf23cea9..a3a9ea077f50 100644
--- a/drivers/gpu/drm/amd/display/include/logger_types.h
+++ b/drivers/gpu/drm/amd/display/include/logger_types.h
@@ -72,6 +72,9 @@
#define DC_LOG_DSC(...) DRM_DEBUG_KMS(__VA_ARGS__)
#define DC_LOG_SMU(...) pr_debug("[SMU_MSG]:"__VA_ARGS__)
#define DC_LOG_DWB(...) DRM_DEBUG_KMS(__VA_ARGS__)
+#if defined(CONFIG_DRM_AMD_DC_DCN)
+#define DC_LOG_DP2(...) DRM_DEBUG_KMS(__VA_ARGS__)
+#endif
struct dal_logger;
--
2.34.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH] drm/amd/display: Reduce dmesg error to a debug print
2022-03-01 6:04 [PATCH] drm/amd/display: Reduce dmesg error to a debug print Mario Limonciello
@ 2022-03-01 6:04 ` Mario Limonciello
2022-03-05 11:19 ` Greg KH
1 sibling, 0 replies; 3+ messages in thread
From: Mario Limonciello @ 2022-03-01 6:04 UTC (permalink / raw)
To: stable; +Cc: Leo (Hanghong) Ma, Nicholas Kazlauskas, Alex Deucher
From: "Leo (Hanghong) Ma" <hanghong.ma@amd.com>
[Why & How]
Dmesg errors are found on dcn3.1 during reset test, but it's not
a really failure. So reduce it to a debug print.
Signed-off-by: Leo (Hanghong) Ma <hanghong.ma@amd.com>
Reviewed-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
(cherry picked from commit 1d925758ba1a5d2716a847903e2fd04efcbd9862)
---
Add extra define guard for the backport to ensure debug messages only
come up when compiled with DCN on 5.16.
Backport to 5.16.y only, different backport for older kernel.
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
index 94e75199d942..135ea1c422f2 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
@@ -4454,7 +4454,9 @@ bool dp_retrieve_lttpr_cap(struct dc_link *link)
lttpr_dpcd_data,
sizeof(lttpr_dpcd_data));
if (status != DC_OK) {
- dm_error("%s: Read LTTPR caps data failed.\n", __func__);
+#if defined(CONFIG_DRM_AMD_DC_DCN)
+ DC_LOG_DP2("%s: Read LTTPR caps data failed.\n", __func__);
+#endif
return false;
}
--
2.34.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/amd/display: Reduce dmesg error to a debug print
2022-03-01 6:04 [PATCH] drm/amd/display: Reduce dmesg error to a debug print Mario Limonciello
2022-03-01 6:04 ` Mario Limonciello
@ 2022-03-05 11:19 ` Greg KH
1 sibling, 0 replies; 3+ messages in thread
From: Greg KH @ 2022-03-05 11:19 UTC (permalink / raw)
To: Mario Limonciello
Cc: stable, Leo (Hanghong) Ma, Nicholas Kazlauskas, Alex Deucher
On Tue, Mar 01, 2022 at 12:04:13AM -0600, Mario Limonciello wrote:
> From: "Leo (Hanghong) Ma" <hanghong.ma@amd.com>
>
> [Why & How]
> Dmesg errors are found on dcn3.1 during reset test, but it's not
> a really failure. So reduce it to a debug print.
>
> Signed-off-by: Leo (Hanghong) Ma <hanghong.ma@amd.com>
> Reviewed-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
> (cherry picked from commit 1d925758ba1a5d2716a847903e2fd04efcbd9862)
> ---
> Add explicit definition for macro not present in 5.15.y currently
>
> Backport to 5.15.y only, different backport for newer kernel.
You forgot your signed-off-by :(
Anyway, both now queued up.
greg k-h
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-03-05 11:19 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-01 6:04 [PATCH] drm/amd/display: Reduce dmesg error to a debug print Mario Limonciello
2022-03-01 6:04 ` Mario Limonciello
2022-03-05 11:19 ` Greg KH
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).