* [PATCH 1/2] drm/i915/dp_link_training: Add newlines to debug messages
@ 2021-03-10 21:47 Sean Paul
2021-03-10 21:47 ` [PATCH 2/2] drm/i915/dp_link_training: Convert DRM_DEBUG_KMS to drm_dbg_kms Sean Paul
2021-03-11 15:09 ` [Intel-gfx] [PATCH 1/2] drm/i915/dp_link_training: Add newlines to debug messages Ville Syrjälä
0 siblings, 2 replies; 5+ messages in thread
From: Sean Paul @ 2021-03-10 21:47 UTC (permalink / raw)
To: intel-gfx, dri-devel; +Cc: Sean Paul, Rodrigo Vivi
From: Sean Paul <seanpaul@chromium.org>
This patch adds some newlines which are missing from debug messages.
This will prevent logs from being stacked up in dmesg.
Signed-off-by: Sean Paul <seanpaul@chromium.org>
---
drivers/gpu/drm/i915/display/intel_dp_link_training.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_dp_link_training.c b/drivers/gpu/drm/i915/display/intel_dp_link_training.c
index 892d7db7d94f..ad02d493ec16 100644
--- a/drivers/gpu/drm/i915/display/intel_dp_link_training.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_link_training.c
@@ -29,7 +29,7 @@ static void
intel_dp_dump_link_status(const u8 link_status[DP_LINK_STATUS_SIZE])
{
- DRM_DEBUG_KMS("ln0_1:0x%x ln2_3:0x%x align:0x%x sink:0x%x adj_req0_1:0x%x adj_req2_3:0x%x",
+ DRM_DEBUG_KMS("ln0_1:0x%x ln2_3:0x%x align:0x%x sink:0x%x adj_req0_1:0x%x adj_req2_3:0x%x\n",
link_status[0], link_status[1], link_status[2],
link_status[3], link_status[4], link_status[5]);
}
@@ -731,7 +731,7 @@ intel_dp_link_train_phy(struct intel_dp *intel_dp,
out:
drm_dbg_kms(&dp_to_i915(intel_dp)->drm,
- "[CONNECTOR:%d:%s] Link Training %s at link rate = %d, lane count = %d, at %s",
+ "[CONNECTOR:%d:%s] Link Training %s at link rate = %d, lane count = %d, at %s\n",
intel_connector->base.base.id,
intel_connector->base.name,
ret ? "passed" : "failed",
--
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] drm/i915/dp_link_training: Convert DRM_DEBUG_KMS to drm_dbg_kms
2021-03-10 21:47 [PATCH 1/2] drm/i915/dp_link_training: Add newlines to debug messages Sean Paul
@ 2021-03-10 21:47 ` Sean Paul
2021-03-11 15:09 ` [Intel-gfx] " Ville Syrjälä
2021-03-11 15:09 ` [Intel-gfx] [PATCH 1/2] drm/i915/dp_link_training: Add newlines to debug messages Ville Syrjälä
1 sibling, 1 reply; 5+ messages in thread
From: Sean Paul @ 2021-03-10 21:47 UTC (permalink / raw)
To: intel-gfx, dri-devel; +Cc: Sean Paul, Rodrigo Vivi
From: Sean Paul <seanpaul@chromium.org>
One instance of DRM_DEBUG_KMS was leftover in dp_link_training, convert
it to the new shiny.
Signed-off-by: Sean Paul <seanpaul@chromium.org>
---
.../gpu/drm/i915/display/intel_dp_link_training.c | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_dp_link_training.c b/drivers/gpu/drm/i915/display/intel_dp_link_training.c
index ad02d493ec16..19ba7c7cbaab 100644
--- a/drivers/gpu/drm/i915/display/intel_dp_link_training.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_link_training.c
@@ -26,12 +26,13 @@
#include "intel_dp_link_training.h"
static void
-intel_dp_dump_link_status(const u8 link_status[DP_LINK_STATUS_SIZE])
+intel_dp_dump_link_status(struct drm_device *drm,
+ const u8 link_status[DP_LINK_STATUS_SIZE])
{
-
- DRM_DEBUG_KMS("ln0_1:0x%x ln2_3:0x%x align:0x%x sink:0x%x adj_req0_1:0x%x adj_req2_3:0x%x\n",
- link_status[0], link_status[1], link_status[2],
- link_status[3], link_status[4], link_status[5]);
+ drm_dbg_kms(drm,
+ "ln0_1:0x%x ln2_3:0x%x align:0x%x sink:0x%x adj_req0_1:0x%x adj_req2_3:0x%x\n",
+ link_status[0], link_status[1], link_status[2],
+ link_status[3], link_status[4], link_status[5]);
}
static void intel_dp_reset_lttpr_count(struct intel_dp *intel_dp)
@@ -642,7 +643,7 @@ intel_dp_link_training_channel_equalization(struct intel_dp *intel_dp,
/* Make sure clock is still ok */
if (!drm_dp_clock_recovery_ok(link_status,
crtc_state->lane_count)) {
- intel_dp_dump_link_status(link_status);
+ intel_dp_dump_link_status(&i915->drm, link_status);
drm_dbg_kms(&i915->drm,
"Clock recovery check failed, cannot "
"continue channel equalization\n");
@@ -669,7 +670,7 @@ intel_dp_link_training_channel_equalization(struct intel_dp *intel_dp,
/* Try 5 times, else fail and try at lower BW */
if (tries == 5) {
- intel_dp_dump_link_status(link_status);
+ intel_dp_dump_link_status(&i915->drm, link_status);
drm_dbg_kms(&i915->drm,
"Channel equalization failed 5 times\n");
}
--
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [Intel-gfx] [PATCH 1/2] drm/i915/dp_link_training: Add newlines to debug messages
2021-03-10 21:47 [PATCH 1/2] drm/i915/dp_link_training: Add newlines to debug messages Sean Paul
2021-03-10 21:47 ` [PATCH 2/2] drm/i915/dp_link_training: Convert DRM_DEBUG_KMS to drm_dbg_kms Sean Paul
@ 2021-03-11 15:09 ` Ville Syrjälä
2021-03-15 14:10 ` Jani Nikula
1 sibling, 1 reply; 5+ messages in thread
From: Ville Syrjälä @ 2021-03-11 15:09 UTC (permalink / raw)
To: Sean Paul; +Cc: intel-gfx, Sean Paul, dri-devel
On Wed, Mar 10, 2021 at 04:47:56PM -0500, Sean Paul wrote:
> From: Sean Paul <seanpaul@chromium.org>
>
> This patch adds some newlines which are missing from debug messages.
> This will prevent logs from being stacked up in dmesg.
>
> Signed-off-by: Sean Paul <seanpaul@chromium.org>
> ---
> drivers/gpu/drm/i915/display/intel_dp_link_training.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_dp_link_training.c b/drivers/gpu/drm/i915/display/intel_dp_link_training.c
> index 892d7db7d94f..ad02d493ec16 100644
> --- a/drivers/gpu/drm/i915/display/intel_dp_link_training.c
> +++ b/drivers/gpu/drm/i915/display/intel_dp_link_training.c
> @@ -29,7 +29,7 @@ static void
> intel_dp_dump_link_status(const u8 link_status[DP_LINK_STATUS_SIZE])
> {
>
> - DRM_DEBUG_KMS("ln0_1:0x%x ln2_3:0x%x align:0x%x sink:0x%x adj_req0_1:0x%x adj_req2_3:0x%x",
> + DRM_DEBUG_KMS("ln0_1:0x%x ln2_3:0x%x align:0x%x sink:0x%x adj_req0_1:0x%x adj_req2_3:0x%x\n",
> link_status[0], link_status[1], link_status[2],
> link_status[3], link_status[4], link_status[5]);
> }
> @@ -731,7 +731,7 @@ intel_dp_link_train_phy(struct intel_dp *intel_dp,
>
> out:
> drm_dbg_kms(&dp_to_i915(intel_dp)->drm,
> - "[CONNECTOR:%d:%s] Link Training %s at link rate = %d, lane count = %d, at %s",
> + "[CONNECTOR:%d:%s] Link Training %s at link rate = %d, lane count = %d, at %s\n",
Looking through some ci logs we do get the newline here somehow. A bit
weird.
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
--
Ville Syrjälä
Intel
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Intel-gfx] [PATCH 2/2] drm/i915/dp_link_training: Convert DRM_DEBUG_KMS to drm_dbg_kms
2021-03-10 21:47 ` [PATCH 2/2] drm/i915/dp_link_training: Convert DRM_DEBUG_KMS to drm_dbg_kms Sean Paul
@ 2021-03-11 15:09 ` Ville Syrjälä
0 siblings, 0 replies; 5+ messages in thread
From: Ville Syrjälä @ 2021-03-11 15:09 UTC (permalink / raw)
To: Sean Paul; +Cc: intel-gfx, Sean Paul, dri-devel
On Wed, Mar 10, 2021 at 04:47:57PM -0500, Sean Paul wrote:
> From: Sean Paul <seanpaul@chromium.org>
>
> One instance of DRM_DEBUG_KMS was leftover in dp_link_training, convert
> it to the new shiny.
>
> Signed-off-by: Sean Paul <seanpaul@chromium.org>
> ---
> .../gpu/drm/i915/display/intel_dp_link_training.c | 15 ++++++++-------
> 1 file changed, 8 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_dp_link_training.c b/drivers/gpu/drm/i915/display/intel_dp_link_training.c
> index ad02d493ec16..19ba7c7cbaab 100644
> --- a/drivers/gpu/drm/i915/display/intel_dp_link_training.c
> +++ b/drivers/gpu/drm/i915/display/intel_dp_link_training.c
> @@ -26,12 +26,13 @@
> #include "intel_dp_link_training.h"
>
> static void
> -intel_dp_dump_link_status(const u8 link_status[DP_LINK_STATUS_SIZE])
> +intel_dp_dump_link_status(struct drm_device *drm,
I'd generally pass 'i915' rather than the drm_device to
any i915 specific function. But doesn't really matter here since
we just pass is straight through anyway.
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> + const u8 link_status[DP_LINK_STATUS_SIZE])
> {
> -
> - DRM_DEBUG_KMS("ln0_1:0x%x ln2_3:0x%x align:0x%x sink:0x%x adj_req0_1:0x%x adj_req2_3:0x%x\n",
> - link_status[0], link_status[1], link_status[2],
> - link_status[3], link_status[4], link_status[5]);
> + drm_dbg_kms(drm,
> + "ln0_1:0x%x ln2_3:0x%x align:0x%x sink:0x%x adj_req0_1:0x%x adj_req2_3:0x%x\n",
> + link_status[0], link_status[1], link_status[2],
> + link_status[3], link_status[4], link_status[5]);
> }
>
> static void intel_dp_reset_lttpr_count(struct intel_dp *intel_dp)
> @@ -642,7 +643,7 @@ intel_dp_link_training_channel_equalization(struct intel_dp *intel_dp,
> /* Make sure clock is still ok */
> if (!drm_dp_clock_recovery_ok(link_status,
> crtc_state->lane_count)) {
> - intel_dp_dump_link_status(link_status);
> + intel_dp_dump_link_status(&i915->drm, link_status);
> drm_dbg_kms(&i915->drm,
> "Clock recovery check failed, cannot "
> "continue channel equalization\n");
> @@ -669,7 +670,7 @@ intel_dp_link_training_channel_equalization(struct intel_dp *intel_dp,
>
> /* Try 5 times, else fail and try at lower BW */
> if (tries == 5) {
> - intel_dp_dump_link_status(link_status);
> + intel_dp_dump_link_status(&i915->drm, link_status);
> drm_dbg_kms(&i915->drm,
> "Channel equalization failed 5 times\n");
> }
> --
> Sean Paul, Software Engineer, Google / Chromium OS
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Ville Syrjälä
Intel
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Intel-gfx] [PATCH 1/2] drm/i915/dp_link_training: Add newlines to debug messages
2021-03-11 15:09 ` [Intel-gfx] [PATCH 1/2] drm/i915/dp_link_training: Add newlines to debug messages Ville Syrjälä
@ 2021-03-15 14:10 ` Jani Nikula
0 siblings, 0 replies; 5+ messages in thread
From: Jani Nikula @ 2021-03-15 14:10 UTC (permalink / raw)
To: Ville Syrjälä, Sean Paul; +Cc: intel-gfx, Sean Paul, dri-devel
On Thu, 11 Mar 2021, Ville Syrjälä <ville.syrjala@linux.intel.com> wrote:
> On Wed, Mar 10, 2021 at 04:47:56PM -0500, Sean Paul wrote:
>> From: Sean Paul <seanpaul@chromium.org>
>>
>> This patch adds some newlines which are missing from debug messages.
>> This will prevent logs from being stacked up in dmesg.
>>
>> Signed-off-by: Sean Paul <seanpaul@chromium.org>
>> ---
>> drivers/gpu/drm/i915/display/intel_dp_link_training.c | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/display/intel_dp_link_training.c b/drivers/gpu/drm/i915/display/intel_dp_link_training.c
>> index 892d7db7d94f..ad02d493ec16 100644
>> --- a/drivers/gpu/drm/i915/display/intel_dp_link_training.c
>> +++ b/drivers/gpu/drm/i915/display/intel_dp_link_training.c
>> @@ -29,7 +29,7 @@ static void
>> intel_dp_dump_link_status(const u8 link_status[DP_LINK_STATUS_SIZE])
>> {
>>
>> - DRM_DEBUG_KMS("ln0_1:0x%x ln2_3:0x%x align:0x%x sink:0x%x adj_req0_1:0x%x adj_req2_3:0x%x",
>> + DRM_DEBUG_KMS("ln0_1:0x%x ln2_3:0x%x align:0x%x sink:0x%x adj_req0_1:0x%x adj_req2_3:0x%x\n",
>> link_status[0], link_status[1], link_status[2],
>> link_status[3], link_status[4], link_status[5]);
>> }
>> @@ -731,7 +731,7 @@ intel_dp_link_train_phy(struct intel_dp *intel_dp,
>>
>> out:
>> drm_dbg_kms(&dp_to_i915(intel_dp)->drm,
>> - "[CONNECTOR:%d:%s] Link Training %s at link rate = %d, lane count = %d, at %s",
>> + "[CONNECTOR:%d:%s] Link Training %s at link rate = %d, lane count = %d, at %s\n",
>
> Looking through some ci logs we do get the newline here somehow. A bit
> weird.
>
> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Thanks for the patches and review, pushed to din.
BR,
Jani.
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-03-15 14:11 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-10 21:47 [PATCH 1/2] drm/i915/dp_link_training: Add newlines to debug messages Sean Paul
2021-03-10 21:47 ` [PATCH 2/2] drm/i915/dp_link_training: Convert DRM_DEBUG_KMS to drm_dbg_kms Sean Paul
2021-03-11 15:09 ` [Intel-gfx] " Ville Syrjälä
2021-03-11 15:09 ` [Intel-gfx] [PATCH 1/2] drm/i915/dp_link_training: Add newlines to debug messages Ville Syrjälä
2021-03-15 14:10 ` Jani Nikula
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).