aboutsummaryrefslogtreecommitdiffstats
path: root/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0512-drm-amd-display-Guard-some-DCN-only-code-in-dc_debug.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0512-drm-amd-display-Guard-some-DCN-only-code-in-dc_debug.patch')
-rw-r--r--meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0512-drm-amd-display-Guard-some-DCN-only-code-in-dc_debug.patch38
1 files changed, 38 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0512-drm-amd-display-Guard-some-DCN-only-code-in-dc_debug.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0512-drm-amd-display-Guard-some-DCN-only-code-in-dc_debug.patch
new file mode 100644
index 00000000..6442e146
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0512-drm-amd-display-Guard-some-DCN-only-code-in-dc_debug.patch
@@ -0,0 +1,38 @@
+From 5f34ce55ddec30b3590442bad4154aae6bc3dfd7 Mon Sep 17 00:00:00 2001
+From: Harry Wentland <harry.wentland@amd.com>
+Date: Mon, 12 Jun 2017 14:57:08 -0400
+Subject: [PATCH 0512/4131] drm/amd/display: Guard some DCN-only code in
+ dc_debug
+
+Fixing a compile error when building without
+CONFIG_DRM_AMD_DC_DCN1_0
+
+Signed-off-by: Harry Wentland <harry.wentland@amd.com>
+Reviewed-By: Tom St Denis <tom.stdenis@amd.com>
+Acked-by: Alex Deucher <alexander.deucher@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+---
+ drivers/gpu/drm/amd/display/dc/core/dc_debug.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_debug.c b/drivers/gpu/drm/amd/display/dc/core/dc_debug.c
+index 263dab6..58402051 100644
+--- a/drivers/gpu/drm/amd/display/dc/core/dc_debug.c
++++ b/drivers/gpu/drm/amd/display/dc/core/dc_debug.c
+@@ -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
+ }
+--
+2.7.4
+