[PATCH] drm/amdgpu/display: fix build when DCN KCONFIG is not set

[PATCH] drm/amdgpu/display: fix build when DCN KCONFIG is not set

[Alex Deucher]

Leads to an undefined symbol otherwise.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
 drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 4 ++++
 1 file changed, 4 insertions(+)

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 4af3545fc414..f7a293902234 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
 }
 
 /**
-- 
2.20.1

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Re: [PATCH] drm/amdgpu/display: fix build when DCN KCONFIG is not set

[Kazlauskas, Nicholas]

On 3/20/19 5:22 PM, Alex Deucher wrote:
> Leads to an undefined symbol otherwise.
> 
> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

Reviewed-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>

> ---
>   drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 4 ++++
>   1 file changed, 4 insertions(+)
> 
> 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 4af3545fc414..f7a293902234 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
>   }
>   
>   /**
> 

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx