From: Alex Deucher Date: Wed, 20 Mar 2019 21:15:22 +0000 (-0500) Subject: drm/amdgpu/display: fix build when DCN KCONFIG is not set X-Git-Tag: v5.2-rc1~118^2~31^2~36 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4e8738a206d28d681c1c5195e4d085d5ffcb00fc;p=thirdparty%2Flinux.git drm/amdgpu/display: fix build when DCN KCONFIG is not set Leads to an undefined symbol otherwise. Reviewed-by: Nicholas Kazlauskas Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_stream.c b/drivers/gpu/drm/amd/display/dc/core/dc_stream.c index 4af3545fc414b..f7a2939022347 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_stream.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_stream.c @@ -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 } /**