Skip to content

Commit

Permalink
drm/amd/display: Fix print format specifiers in DC_LOG_IPS
Browse files Browse the repository at this point in the history
[Why]
%d specifier is used for printing unsigned values.
It can result in negative values in logs for unsigned variables.

[How]
Replace %d with %u for unsigned.

Reviewed-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Signed-off-by: Roman Li <Roman.Li@amd.com>
Signed-off-by: Tom Chung <chiahsuan.chung@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
  • Loading branch information
Roman Li authored and Alex Deucher committed Aug 13, 2024
1 parent a1fc9f5 commit 3bb41f2
Showing 1 changed file with 13 additions and 13 deletions.
26 changes: 13 additions & 13 deletions drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c
Original file line number Diff line number Diff line change
Expand Up @@ -1285,7 +1285,7 @@ static void dc_dmub_srv_notify_idle(const struct dc *dc, bool allow_idle)
union dmub_shared_state_ips_driver_signals new_signals;

DC_LOG_IPS(
"%s wait idle (ips1_commit=%d ips2_commit=%d)",
"%s wait idle (ips1_commit=%u ips2_commit=%u)",
__func__,
ips_fw->signals.bits.ips1_commit,
ips_fw->signals.bits.ips2_commit);
Expand Down Expand Up @@ -1331,7 +1331,7 @@ static void dc_dmub_srv_notify_idle(const struct dc *dc, bool allow_idle)
}

DC_LOG_IPS(
"%s send allow_idle=%d (ips1_commit=%d ips2_commit=%d)",
"%s send allow_idle=%d (ips1_commit=%u ips2_commit=%u)",
__func__,
allow_idle,
ips_fw->signals.bits.ips1_commit,
Expand Down Expand Up @@ -1374,7 +1374,7 @@ static void dc_dmub_srv_exit_low_power_state(const struct dc *dc)
dc_dmub_srv->driver_signals = ips_driver->signals;

DC_LOG_IPS(
"%s (allow ips1=%d ips2=%d) (commit ips1=%d ips2=%d) (count rcg=%d ips1=%d ips2=%d)",
"%s (allow ips1=%u ips2=%u) (commit ips1=%u ips2=%u) (count rcg=%u ips1=%u ips2=%u)",
__func__,
ips_driver->signals.bits.allow_ips1,
ips_driver->signals.bits.allow_ips2,
Expand All @@ -1393,7 +1393,7 @@ static void dc_dmub_srv_exit_low_power_state(const struct dc *dc)
(!dc->debug.optimize_ips_handshake ||
ips_fw->signals.bits.ips2_commit || !ips_fw->signals.bits.in_idle)) {
DC_LOG_IPS(
"wait IPS2 eval (ips1_commit=%d ips2_commit=%d)",
"wait IPS2 eval (ips1_commit=%u ips2_commit=%u)",
ips_fw->signals.bits.ips1_commit,
ips_fw->signals.bits.ips2_commit);

Expand All @@ -1402,46 +1402,46 @@ static void dc_dmub_srv_exit_low_power_state(const struct dc *dc)

if (ips_fw->signals.bits.ips2_commit) {
DC_LOG_IPS(
"exit IPS2 #1 (ips1_commit=%d ips2_commit=%d)",
"exit IPS2 #1 (ips1_commit=%u ips2_commit=%u)",
ips_fw->signals.bits.ips1_commit,
ips_fw->signals.bits.ips2_commit);

// Tell PMFW to exit low power state
dc->clk_mgr->funcs->exit_low_power_state(dc->clk_mgr);

DC_LOG_IPS(
"wait IPS2 entry delay (ips1_commit=%d ips2_commit=%d)",
"wait IPS2 entry delay (ips1_commit=%u ips2_commit=%u)",
ips_fw->signals.bits.ips1_commit,
ips_fw->signals.bits.ips2_commit);

// Wait for IPS2 entry upper bound
udelay(dc->debug.ips2_entry_delay_us);

DC_LOG_IPS(
"exit IPS2 #2 (ips1_commit=%d ips2_commit=%d)",
"exit IPS2 #2 (ips1_commit=%u ips2_commit=%u)",
ips_fw->signals.bits.ips1_commit,
ips_fw->signals.bits.ips2_commit);

dc->clk_mgr->funcs->exit_low_power_state(dc->clk_mgr);

DC_LOG_IPS(
"wait IPS2 commit clear (ips1_commit=%d ips2_commit=%d)",
"wait IPS2 commit clear (ips1_commit=%u ips2_commit=%u)",
ips_fw->signals.bits.ips1_commit,
ips_fw->signals.bits.ips2_commit);

while (ips_fw->signals.bits.ips2_commit)
udelay(1);

DC_LOG_IPS(
"wait hw_pwr_up (ips1_commit=%d ips2_commit=%d)",
"wait hw_pwr_up (ips1_commit=%u ips2_commit=%u)",
ips_fw->signals.bits.ips1_commit,
ips_fw->signals.bits.ips2_commit);

if (!dc_dmub_srv_is_hw_pwr_up(dc->ctx->dmub_srv, true))
ASSERT(0);

DC_LOG_IPS(
"resync inbox1 (ips1_commit=%d ips2_commit=%d)",
"resync inbox1 (ips1_commit=%u ips2_commit=%u)",
ips_fw->signals.bits.ips1_commit,
ips_fw->signals.bits.ips2_commit);

Expand All @@ -1452,15 +1452,15 @@ static void dc_dmub_srv_exit_low_power_state(const struct dc *dc)
dc_dmub_srv_notify_idle(dc, false);
if (prev_driver_signals.bits.allow_ips1) {
DC_LOG_IPS(
"wait for IPS1 commit clear (ips1_commit=%d ips2_commit=%d)",
"wait for IPS1 commit clear (ips1_commit=%u ips2_commit=%u)",
ips_fw->signals.bits.ips1_commit,
ips_fw->signals.bits.ips2_commit);

while (ips_fw->signals.bits.ips1_commit)
udelay(1);

DC_LOG_IPS(
"wait for IPS1 commit clear done (ips1_commit=%d ips2_commit=%d)",
"wait for IPS1 commit clear done (ips1_commit=%u ips2_commit=%u)",
ips_fw->signals.bits.ips1_commit,
ips_fw->signals.bits.ips2_commit);
}
Expand All @@ -1469,7 +1469,7 @@ static void dc_dmub_srv_exit_low_power_state(const struct dc *dc)
if (!dc_dmub_srv_is_hw_pwr_up(dc->ctx->dmub_srv, true))
ASSERT(0);

DC_LOG_IPS("%s exit (count rcg=%d ips1=%d ips2=%d)",
DC_LOG_IPS("%s exit (count rcg=%u ips1=%u ips2=%u)",
__func__,
rcg_exit_count,
ips1_exit_count,
Expand Down

0 comments on commit 3bb41f2

Please sign in to comment.