]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
drm/amdgpu/display: fix build when DCN KCONFIG is not set
authorAlex Deucher <alexander.deucher@amd.com>
Wed, 20 Mar 2019 21:15:22 +0000 (16:15 -0500)
committerAlex Deucher <alexander.deucher@amd.com>
Thu, 21 Mar 2019 19:05:26 +0000 (14:05 -0500)
Leads to an undefined symbol otherwise.

Reviewed-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/display/dc/core/dc_stream.c

index 4af3545fc414bf858149b92ea285cbe434939fc1..f7a2939022347730877b272c87ed745999ed5c29 100644 (file)
@@ -29,7 +29,9 @@
 #include "resource.h"
 #include "ipp.h"
 #include "timing_generator.h"
+#if defined(CONFIG_DRM_AMD_DC_DCN1_0)
 #include "dcn10/dcn10_hw_sequencer.h"
+#endif
 
 #define DC_LOGGER dc->ctx->logger
 
@@ -199,6 +201,7 @@ struct dc_stream_status *dc_stream_get_status(
 
 static void delay_cursor_until_vupdate(struct pipe_ctx *pipe_ctx, struct dc *dc)
 {
+#if defined(CONFIG_DRM_AMD_DC_DCN1_0)
        unsigned int vupdate_line;
        unsigned int lines_to_vupdate, us_to_vupdate, vpos, nvpos;
        struct dc_stream_state *stream = pipe_ctx->stream;
@@ -221,6 +224,7 @@ static void delay_cursor_until_vupdate(struct pipe_ctx *pipe_ctx, struct dc *dc)
                if (us_to_vupdate < 70)
                        udelay(us_to_vupdate);
        }
+#endif
 }
 
 /**