Skip to contentSkip to conversation

drm/amd/display: Guard some DCN-only code in dc_debug

PATCH In review Harry Wentland 2 participants 3 messages Jun 12, 2017 – Jun 13, 2017 2 messages not in the archive

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/amd/display: Guard some DCN-only code in dc_debug

Fixing a compile error when building without
CONFIG_DRM_AMD_DC_DCN1_0

---
 drivers/gpu/drm/amd/display/dc/core/dc_debug.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/gpu/drm/amd/display/dc/core/dc_debug.c +2 -0
index 263dab6337a6..58402051cc59 100644
@@ -329,6 +329,7 @@ void context_clock_trace(
 	struct core_dc *core_dc = DC_TO_CORE(dc);
 	struct dal_logger *logger =  core_dc->ctx->logger;
 
+#if defined(CONFIG_DRM_AMD_DC_DCN1_0)
 	CLOCK_TRACE("Current: dispclk_khz:%d  dppclk_div:%d  dcfclk_khz:%d\n"
 			"dcfclk_deep_sleep_khz:%d  fclk_khz:%d\n"
 			"dram_ccm_us:%d  min_active_dram_ccm_us:%d\n",
@@ -349,4 +350,5 @@ void context_clock_trace(
 			context->bw.dcn.calc_clk.fclk_khz,
 			context->bw.dcn.calc_clk.dram_ccm_us,
 			context->bw.dcn.calc_clk.min_active_dram_ccm_us);
+#endif
 }
Signature · 6 lines
2.11.0

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): 20170612190107.11041-1-harry.wentland-5C7GfCeVMHo@public.gmane.org

Acked-by
#2 lore raw

It fixes the compile error but since I'm out of time today to actually test that's about all I can say. :-)

Tom

Quoted 22 lines · Harry Wentland

Fixing a compile error when building without
CONFIG_DRM_AMD_DC_DCN1_0

---
  drivers/gpu/drm/amd/display/dc/core/dc_debug.c | 2 ++
  1 file changed, 2 insertions(+)
drivers/gpu/drm/amd/display/dc/core/dc_debug.c +1 -0
index 263dab6337a6..58402051cc59 100644
@@ -329,6 +329,7 @@ void context_clock_trace(
  	struct core_dc *core_dc = DC_TO_CORE(dc);
  	struct dal_logger *logger =  core_dc->ctx->logger;
 
+#if defined(CONFIG_DRM_AMD_DC_DCN1_0)
  	CLOCK_TRACE("Current: dispclk_khz:%d  dppclk_div:%d  dcfclk_khz:%d\n"
  			"dcfclk_deep_sleep_khz:%d  fclk_khz:%d\n"
  			"dram_ccm_us:%d  min_active_dram_ccm_us:%d\n",

drivers/gpu/drm/amd/display/dc/core/dc_debug.c void context_clock_trace( · line 354

Quoted 5 lines
drivers/gpu/drm/amd/display/dc/core/dc_debug.c +1 -0
@@ -349,4 +350,5 @@ void context_clock_trace(
  			context->bw.dcn.calc_clk.fclk_khz,
  			context->bw.dcn.calc_clk.dram_ccm_us,
  			context->bw.dcn.calc_clk.min_active_dram_ccm_us);
+#endif
  }

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): c7692f6a-ab21-56f3-da2a-ede2125de20b-5C7GfCeVMHo@public.gmane.org