Skip to content

Commit b042004

Browse files
Lohita Mudimelaalexdeucher
authored andcommitted
drm/amd/display: Refactoring if and endif statements to enable DC_LOGGER
[Why] For Header related changes for core [How] Refactoring if and endif statements to enable DC_LOGGER Reviewed-by: Mounika Adhuri <mounika.adhuri@amd.com> Reviewed-by: Alvin Lee <alvin.lee2@amd.com> Signed-off-by: Lohita Mudimela <lohita.mudimela@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>
1 parent a88b19b commit b042004

File tree

4 files changed

+9
-6
lines changed

4 files changed

+9
-6
lines changed

drivers/gpu/drm/amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,13 @@
5050
#include "link.h"
5151

5252
#include "logger_types.h"
53+
54+
55+
#include "yellow_carp_offset.h"
5356
#undef DC_LOGGER
5457
#define DC_LOGGER \
5558
clk_mgr->base.base.ctx->logger
5659

57-
#include "yellow_carp_offset.h"
58-
5960
#define regCLK1_CLK_PLL_REQ 0x0237
6061
#define regCLK1_CLK_PLL_REQ_BASE_IDX 0
6162

drivers/gpu/drm/amd/display/dc/clk_mgr/dcn314/dcn314_clk_mgr.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,6 @@
5353

5454

5555
#include "logger_types.h"
56-
#undef DC_LOGGER
57-
#define DC_LOGGER \
58-
clk_mgr->base.base.ctx->logger
5956

6057

6158
#define MAX_INSTANCE 7
@@ -77,6 +74,9 @@ static const struct IP_BASE CLK_BASE = { { { { 0x00016C00, 0x02401800, 0, 0, 0,
7774
{ { 0x0001B200, 0x0242DC00, 0, 0, 0, 0, 0, 0 } },
7875
{ { 0x0001B400, 0x0242E000, 0, 0, 0, 0, 0, 0 } } } };
7976

77+
#undef DC_LOGGER
78+
#define DC_LOGGER \
79+
clk_mgr->base.base.ctx->logger
8080
#define regCLK1_CLK_PLL_REQ 0x0237
8181
#define regCLK1_CLK_PLL_REQ_BASE_IDX 0
8282

drivers/gpu/drm/amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
#define DC_LOGGER \
5656
clk_mgr->base.base.ctx->logger
5757

58+
5859
#define regCLK1_CLK_PLL_REQ 0x0237
5960
#define regCLK1_CLK_PLL_REQ_BASE_IDX 0
6061

drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_capability.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,10 @@
5151
#include "dc_dmub_srv.h"
5252
#include "gpio_service_interface.h"
5353

54+
#define DC_TRACE_LEVEL_MESSAGE(...) /* do nothing */
55+
5456
#define DC_LOGGER \
5557
link->ctx->logger
56-
#define DC_TRACE_LEVEL_MESSAGE(...) /* do nothing */
5758

5859
#ifndef MAX
5960
#define MAX(X, Y) ((X) > (Y) ? (X) : (Y))

0 commit comments

Comments
 (0)