Skip to content

Commit 25dcf62

Browse files
charliu-AMDENGgregkh
authored andcommitted
drm/amd/display: Insert dccg log for easy debug
[ Upstream commit 35bcc91 ] [why] Log for sequence tracking Reviewed-by: Ovidiu (Ovi) Bunea <ovidiu.bunea@amd.com> Reviewed-by: Yihan Zhu <yihan.zhu@amd.com> Signed-off-by: Charlene Liu <Charlene.Liu@amd.com> Signed-off-by: Ivan Lipski <ivan.lipski@amd.com> Tested-by: Dan Wheeler <daniel.wheeler@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Stable-dep-of: cfa0904 ("drm/amd/display: Prevent Gating DTBCLK before It Is Properly Latched") Signed-off-by: Sasha Levin <sashal@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent b151530 commit 25dcf62

1 file changed

Lines changed: 21 additions & 3 deletions

File tree

drivers/gpu/drm/amd/display/dc/dccg/dcn35/dcn35_dccg.c

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939

4040
#define CTX \
4141
dccg_dcn->base.ctx
42+
#include "logger_types.h"
4243
#define DC_LOGGER \
4344
dccg->ctx->logger
4445

@@ -1132,7 +1133,7 @@ static void dcn35_set_dppclk_enable(struct dccg *dccg,
11321133
default:
11331134
break;
11341135
}
1135-
//DC_LOG_DEBUG("%s: dpp_inst(%d) DPPCLK_EN = %d\n", __func__, dpp_inst, enable);
1136+
DC_LOG_DEBUG("%s: dpp_inst(%d) DPPCLK_EN = %d\n", __func__, dpp_inst, enable);
11361137

11371138
}
11381139

@@ -1400,6 +1401,10 @@ static void dccg35_set_dtbclk_dto(
14001401
* PIPEx_DTO_SRC_SEL should not be programmed during DTBCLK update since OTG may still be on, and the
14011402
* programming is handled in program_pix_clk() regardless, so it can be removed from here.
14021403
*/
1404+
DC_LOG_DEBUG("%s: OTG%d DTBCLK DTO enabled: pixclk_khz=%d, ref_dtbclk_khz=%d, req_dtbclk_khz=%d, phase=%d, modulo=%d\n",
1405+
__func__, params->otg_inst, params->pixclk_khz,
1406+
params->ref_dtbclk_khz, req_dtbclk_khz, phase, modulo);
1407+
14031408
} else {
14041409
switch (params->otg_inst) {
14051410
case 0:
@@ -1425,6 +1430,8 @@ static void dccg35_set_dtbclk_dto(
14251430

14261431
REG_WRITE(DTBCLK_DTO_MODULO[params->otg_inst], 0);
14271432
REG_WRITE(DTBCLK_DTO_PHASE[params->otg_inst], 0);
1433+
1434+
DC_LOG_DEBUG("%s: OTG%d DTBCLK DTO disabled\n", __func__, params->otg_inst);
14281435
}
14291436
}
14301437

@@ -1469,6 +1476,8 @@ static void dccg35_set_dpstreamclk(
14691476
BREAK_TO_DEBUGGER();
14701477
return;
14711478
}
1479+
DC_LOG_DEBUG("%s: dp_hpo_inst(%d) DPSTREAMCLK_EN = %d, DPSTREAMCLK_SRC_SEL = %d\n",
1480+
__func__, dp_hpo_inst, (src == REFCLK) ? 0 : 1, otg_inst);
14721481
}
14731482

14741483

@@ -1508,6 +1517,8 @@ static void dccg35_set_dpstreamclk_root_clock_gating(
15081517
BREAK_TO_DEBUGGER();
15091518
return;
15101519
}
1520+
DC_LOG_DEBUG("%s: dp_hpo_inst(%d) DPSTREAMCLK_ROOT_GATE_DISABLE = %d\n",
1521+
__func__, dp_hpo_inst, enable ? 1 : 0);
15111522
}
15121523

15131524

@@ -1547,7 +1558,7 @@ static void dccg35_set_physymclk_root_clock_gating(
15471558
BREAK_TO_DEBUGGER();
15481559
return;
15491560
}
1550-
//DC_LOG_DEBUG("%s: dpp_inst(%d) PHYESYMCLK_ROOT_GATE_DISABLE:\n", __func__, phy_inst, enable ? 0 : 1);
1561+
DC_LOG_DEBUG("%s: dpp_inst(%d) PHYESYMCLK_ROOT_GATE_DISABLE: %d\n", __func__, phy_inst, enable ? 0 : 1);
15511562

15521563
}
15531564

@@ -1620,6 +1631,8 @@ static void dccg35_set_physymclk(
16201631
BREAK_TO_DEBUGGER();
16211632
return;
16221633
}
1634+
DC_LOG_DEBUG("%s: phy_inst(%d) PHYxSYMCLK_EN = %d, PHYxSYMCLK_SRC_SEL = %d\n",
1635+
__func__, phy_inst, force_enable ? 1 : 0, clk_src);
16231636
}
16241637

16251638
static void dccg35_set_valid_pixel_rate(
@@ -1667,6 +1680,7 @@ static void dccg35_dpp_root_clock_control(
16671680
}
16681681

16691682
dccg->dpp_clock_gated[dpp_inst] = !clock_on;
1683+
DC_LOG_DEBUG("%s: dpp_inst(%d) clock_on = %d\n", __func__, dpp_inst, clock_on);
16701684
}
16711685

16721686
static void dccg35_disable_symclk32_se(
@@ -1725,14 +1739,14 @@ static void dccg35_disable_symclk32_se(
17251739
BREAK_TO_DEBUGGER();
17261740
return;
17271741
}
1742+
17281743
}
17291744

17301745
static void dccg35_init_cb(struct dccg *dccg)
17311746
{
17321747
(void)dccg;
17331748
/* Any RCG should be done when driver enter low power mode*/
17341749
}
1735-
17361750
void dccg35_init(struct dccg *dccg)
17371751
{
17381752
int otg_inst;
@@ -1747,6 +1761,8 @@ void dccg35_init(struct dccg *dccg)
17471761
for (otg_inst = 0; otg_inst < 2; otg_inst++) {
17481762
dccg31_disable_symclk32_le(dccg, otg_inst);
17491763
dccg31_set_symclk32_le_root_clock_gating(dccg, otg_inst, false);
1764+
DC_LOG_DEBUG("%s: OTG%d SYMCLK32_LE disabled and root clock gating disabled\n",
1765+
__func__, otg_inst);
17501766
}
17511767

17521768
// if (dccg->ctx->dc->debug.root_clock_optimization.bits.symclk32_se)
@@ -1759,6 +1775,8 @@ void dccg35_init(struct dccg *dccg)
17591775
dccg35_set_dpstreamclk(dccg, REFCLK, otg_inst,
17601776
otg_inst);
17611777
dccg35_set_dpstreamclk_root_clock_gating(dccg, otg_inst, false);
1778+
DC_LOG_DEBUG("%s: OTG%d DPSTREAMCLK disabled and root clock gating disabled\n",
1779+
__func__, otg_inst);
17621780
}
17631781

17641782
/*

0 commit comments

Comments
 (0)